@rpgjs/client 3.0.0-beta.4 → 3.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/KeyboardControls.d.ts +6 -2
- package/lib/KeyboardControls.js +87 -40
- package/lib/KeyboardControls.js.map +1 -1
- package/lib/Renderer.d.ts +2 -1
- package/lib/Renderer.js +13 -2
- package/lib/Renderer.js.map +1 -1
- package/lib/RpgClientEngine.d.ts +38 -2
- package/lib/RpgClientEngine.js +117 -78
- package/lib/RpgClientEngine.js.map +1 -1
- package/lib/RpgGui.d.ts +11 -9
- package/lib/RpgGui.js +46 -5
- package/lib/RpgGui.js.map +1 -1
- package/lib/Scene/Map.js.map +1 -1
- package/lib/Scene/Scene.js +2 -0
- package/lib/Scene/Scene.js.map +1 -1
- package/lib/Sprite/Character.d.ts +5 -1
- package/lib/Sprite/Character.js +17 -13
- package/lib/Sprite/Character.js.map +1 -1
- package/lib/Tilemap/TileSet.js +4 -0
- package/lib/Tilemap/TileSet.js.map +1 -1
- package/package.json +6 -5
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { Input } from '@rpgjs/common';
|
|
1
2
|
import { RpgClientEngine } from './RpgClientEngine';
|
|
2
3
|
export interface ControlOptions {
|
|
3
4
|
repeat?: boolean;
|
|
4
|
-
bind: string | string[];
|
|
5
|
+
bind: string | string[] | Input | Input[];
|
|
5
6
|
method?: Function;
|
|
6
7
|
}
|
|
7
8
|
export interface Controls {
|
|
@@ -20,6 +21,8 @@ export declare class KeyboardControls {
|
|
|
20
21
|
private lastKeyPressed;
|
|
21
22
|
private _controlsOptions;
|
|
22
23
|
constructor(clientEngine: RpgClientEngine);
|
|
24
|
+
preStep(): void;
|
|
25
|
+
private directionToAngle;
|
|
23
26
|
private setupListeners;
|
|
24
27
|
private bindKey;
|
|
25
28
|
private applyKeyDown;
|
|
@@ -67,9 +70,10 @@ export declare class KeyboardControls {
|
|
|
67
70
|
* @method applyControl(controlName,isDown)
|
|
68
71
|
* @param {string} controlName
|
|
69
72
|
* @param {boolean} [isDown]
|
|
73
|
+
* @returns {Promise<void>}
|
|
70
74
|
* @memberof KeyboardControls
|
|
71
75
|
*/
|
|
72
|
-
applyControl(controlName: string, isDown?: boolean | undefined): void
|
|
76
|
+
applyControl(controlName: string | number, isDown?: boolean | undefined): Promise<void>;
|
|
73
77
|
/**
|
|
74
78
|
* Stop listening to the inputs. Pressing a key won't do anything
|
|
75
79
|
*
|
package/lib/KeyboardControls.js
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.KeyboardControls = void 0;
|
|
4
13
|
const common_1 = require("@rpgjs/common");
|
|
@@ -22,10 +31,10 @@ const keyCodeTable = {
|
|
|
22
31
|
34: 'page down',
|
|
23
32
|
35: 'end',
|
|
24
33
|
36: 'home',
|
|
25
|
-
37:
|
|
26
|
-
38:
|
|
27
|
-
39:
|
|
28
|
-
40:
|
|
34
|
+
37: common_1.Direction.Left,
|
|
35
|
+
38: common_1.Direction.Up,
|
|
36
|
+
39: common_1.Direction.Right,
|
|
37
|
+
40: common_1.Direction.Down,
|
|
29
38
|
41: 'select',
|
|
30
39
|
42: 'print',
|
|
31
40
|
43: 'execute',
|
|
@@ -167,6 +176,12 @@ const keyCodeTable = {
|
|
|
167
176
|
244: 'kanji',
|
|
168
177
|
255: 'toggle touchpad'
|
|
169
178
|
};
|
|
179
|
+
const directionCode = {
|
|
180
|
+
[common_1.Direction.Up]: 1,
|
|
181
|
+
[common_1.Direction.Right]: 2,
|
|
182
|
+
[common_1.Direction.Down]: 3,
|
|
183
|
+
[common_1.Direction.Left]: 4
|
|
184
|
+
};
|
|
170
185
|
const { isArray } = common_1.Utils;
|
|
171
186
|
const inverse = (obj) => {
|
|
172
187
|
const newObj = {};
|
|
@@ -189,28 +204,54 @@ class KeyboardControls {
|
|
|
189
204
|
this.setupListeners();
|
|
190
205
|
if (globalConfig.inputs)
|
|
191
206
|
this.setInputs(globalConfig.inputs);
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
if (method) {
|
|
204
|
-
method(this.boundKeys[keyName]);
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
this.clientEngine.sendInput(this.boundKeys[keyName].actionName);
|
|
208
|
-
}
|
|
209
|
-
this.keyState[keyName].count++;
|
|
207
|
+
}
|
|
208
|
+
preStep() {
|
|
209
|
+
//this.directionToAngle()
|
|
210
|
+
const boundKeys = Object.keys(this.boundKeys);
|
|
211
|
+
const applyInput = (keyName) => {
|
|
212
|
+
if (this.keyState[keyName] && this.keyState[keyName].isDown) {
|
|
213
|
+
const { repeat, method } = this.boundKeys[keyName].options;
|
|
214
|
+
if (repeat || this.keyState[keyName].count == 0) {
|
|
215
|
+
let parameters = this.boundKeys[keyName].parameters;
|
|
216
|
+
if (typeof parameters === "function") {
|
|
217
|
+
parameters = parameters();
|
|
210
218
|
}
|
|
219
|
+
if (method) {
|
|
220
|
+
method(this.boundKeys[keyName]);
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
this.clientEngine.sendInput(this.boundKeys[keyName].actionName);
|
|
224
|
+
}
|
|
225
|
+
this.keyState[keyName].count++;
|
|
211
226
|
}
|
|
212
227
|
}
|
|
213
|
-
}
|
|
228
|
+
};
|
|
229
|
+
for (let keyName of boundKeys) {
|
|
230
|
+
applyInput(keyName);
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
// TODO, merge direction
|
|
234
|
+
directionToAngle() {
|
|
235
|
+
let directionVal = 0;
|
|
236
|
+
let nbFound = 0;
|
|
237
|
+
for (let keyName of Object.keys(this.boundKeys)) {
|
|
238
|
+
if (this.keyState[keyName] && this.keyState[keyName].isDown) {
|
|
239
|
+
if (directionCode[keyName]) {
|
|
240
|
+
this.keyState[keyName] = null;
|
|
241
|
+
directionVal += directionCode[keyName];
|
|
242
|
+
nbFound++;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
if (!nbFound)
|
|
247
|
+
return;
|
|
248
|
+
const index = directionVal / nbFound;
|
|
249
|
+
if (!this.keyState[index]) {
|
|
250
|
+
this.keyState[index] = {
|
|
251
|
+
count: 0
|
|
252
|
+
};
|
|
253
|
+
}
|
|
254
|
+
this.keyState[index].isDown = true;
|
|
214
255
|
}
|
|
215
256
|
setupListeners() {
|
|
216
257
|
document.addEventListener('keydown', (e) => { this.onKeyChange(e, true); });
|
|
@@ -239,14 +280,17 @@ class KeyboardControls {
|
|
|
239
280
|
this.onKeyChange(e, false);
|
|
240
281
|
}
|
|
241
282
|
applyKeyPress(name) {
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
283
|
+
return new Promise((resolve) => {
|
|
284
|
+
this.applyKeyDown(name);
|
|
285
|
+
setTimeout(() => {
|
|
286
|
+
this.applyKeyUp(name);
|
|
287
|
+
resolve();
|
|
288
|
+
}, 200);
|
|
289
|
+
});
|
|
246
290
|
}
|
|
247
291
|
onKeyChange(e, isDown) {
|
|
248
292
|
e = e || window.event;
|
|
249
|
-
|
|
293
|
+
const keyName = keyCodeTable[e.keyCode];
|
|
250
294
|
const isStopped = this.stop;
|
|
251
295
|
if (isDown)
|
|
252
296
|
this.clientEngine.keyChange.next(keyName);
|
|
@@ -311,22 +355,25 @@ class KeyboardControls {
|
|
|
311
355
|
* @method applyControl(controlName,isDown)
|
|
312
356
|
* @param {string} controlName
|
|
313
357
|
* @param {boolean} [isDown]
|
|
358
|
+
* @returns {Promise<void>}
|
|
314
359
|
* @memberof KeyboardControls
|
|
315
360
|
*/
|
|
316
361
|
applyControl(controlName, isDown) {
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
362
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
363
|
+
const control = this._controlsOptions[controlName];
|
|
364
|
+
if (control) {
|
|
365
|
+
const input = isArray(control.bind) ? control.bind[0] : control.bind;
|
|
366
|
+
if (isDown === undefined) {
|
|
367
|
+
yield this.applyKeyPress(input);
|
|
368
|
+
}
|
|
369
|
+
else if (isDown) {
|
|
370
|
+
this.applyKeyDown(input);
|
|
371
|
+
}
|
|
372
|
+
else {
|
|
373
|
+
this.applyKeyUp(input);
|
|
374
|
+
}
|
|
328
375
|
}
|
|
329
|
-
}
|
|
376
|
+
});
|
|
330
377
|
}
|
|
331
378
|
/**
|
|
332
379
|
* Stop listening to the inputs. Pressing a key won't do anything
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyboardControls.js","sourceRoot":"","sources":["../src/KeyboardControls.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"KeyboardControls.js","sourceRoot":"","sources":["../src/KeyboardControls.ts"],"names":[],"mappings":"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"}
|
package/lib/Renderer.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Scene } from './Presets/Scene';
|
|
2
|
+
import { RpgClientEngine } from './RpgClientEngine';
|
|
2
3
|
export default class RpgRenderer {
|
|
3
4
|
private clientEngine;
|
|
4
5
|
vm: any;
|
|
@@ -15,7 +16,7 @@ export default class RpgRenderer {
|
|
|
15
16
|
client: any;
|
|
16
17
|
gameEngine: any;
|
|
17
18
|
doReset: boolean;
|
|
18
|
-
constructor(clientEngine:
|
|
19
|
+
constructor(clientEngine: RpgClientEngine);
|
|
19
20
|
init(): Promise<void>;
|
|
20
21
|
_resize(w: any, h: any): void;
|
|
21
22
|
get height(): number;
|
package/lib/Renderer.js
CHANGED
|
@@ -14,7 +14,6 @@ const common_1 = require("@rpgjs/common");
|
|
|
14
14
|
const Map_1 = require("./Scene/Map");
|
|
15
15
|
const Scene_1 = require("./Presets/Scene");
|
|
16
16
|
const RpgGui_1 = require("./RpgGui");
|
|
17
|
-
const TIME_RESET_THRESHOLD = 100;
|
|
18
17
|
class RpgRenderer {
|
|
19
18
|
constructor(clientEngine) {
|
|
20
19
|
this.clientEngine = clientEngine;
|
|
@@ -25,6 +24,9 @@ class RpgRenderer {
|
|
|
25
24
|
this._height = 400;
|
|
26
25
|
this.doReset = false;
|
|
27
26
|
this.gameEngine = clientEngine.gameEngine;
|
|
27
|
+
this.clientEngine.tick.subscribe(({ timestamp, deltaTime, frame }) => {
|
|
28
|
+
this.draw(timestamp, deltaTime, frame);
|
|
29
|
+
});
|
|
28
30
|
}
|
|
29
31
|
init() {
|
|
30
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -94,17 +96,26 @@ class RpgRenderer {
|
|
|
94
96
|
return this.scene;
|
|
95
97
|
}
|
|
96
98
|
draw(t, dt, frame) {
|
|
99
|
+
if (!this.renderer)
|
|
100
|
+
return;
|
|
97
101
|
if (this.scene)
|
|
98
102
|
this.scene.draw(t, dt, frame);
|
|
99
103
|
this.renderer.render(this.stage);
|
|
100
104
|
}
|
|
101
105
|
loadScene(name, obj) {
|
|
102
106
|
return __awaiter(this, void 0, void 0, function* () {
|
|
107
|
+
const currentPlayerId = this.gameEngine.playerId;
|
|
103
108
|
common_1.RpgPlugin.emit(common_1.HookClient.BeforeSceneLoading, {
|
|
104
109
|
name,
|
|
105
110
|
obj
|
|
106
111
|
});
|
|
107
|
-
this.gameEngine.world.removeObject(
|
|
112
|
+
this.gameEngine.world.removeObject(currentPlayerId);
|
|
113
|
+
// If a scene exists, remove the current player and viewport
|
|
114
|
+
if (this.scene) {
|
|
115
|
+
this.scene.removeObject(currentPlayerId);
|
|
116
|
+
if (this.scene.viewport)
|
|
117
|
+
this.scene.viewport.plugins.remove('follow');
|
|
118
|
+
}
|
|
108
119
|
this.stage.removeChildren();
|
|
109
120
|
const scenes = this.options.scenes || {};
|
|
110
121
|
if (this.scene) {
|
package/lib/Renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../src/Renderer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAEhC,0CAAqD;AACrD,qCAAsC;AACtC,2CAAuC;AACvC,qCAAiC;
|
|
1
|
+
{"version":3,"file":"Renderer.js","sourceRoot":"","sources":["../src/Renderer.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAEhC,0CAAqD;AACrD,qCAAsC;AACtC,2CAAuC;AACvC,qCAAiC;AAGjC,MAAqB,WAAW;IAiB5B,YAAoB,YAA6B;QAA7B,iBAAY,GAAZ,YAAY,CAAiB;QAdzC,UAAK,GAAQ,IAAI,CAAA;QACjB,UAAK,GAAmB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QAE7C,YAAO,GAAQ,EAAE,CAAA;QAChB,WAAM,GAAW,GAAG,CAAA;QACpB,YAAO,GAAW,GAAG,CAAA;QAO7B,YAAO,GAAG,KAAK,CAAA;QAGX,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAA;QACzC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YACjE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;IACN,CAAC;IAEK,IAAI;;YACN,IAAI,CAAC,WAAW,EAAE,CAAA;QACtB,CAAC;KAAA;IAED,OAAO,CAAC,CAAC,EAAE,CAAC;QACR,IAAI,CAAC,CAAC;YAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA;QACrC,IAAI,CAAC,CAAC;YAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAA;QACtC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAA;YACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAA;SACvC;QACD,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAA;SACnD;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;QACf,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,IAAI,MAAM,CAAC,GAAG;QACX,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,IAAI,KAAK,CAAC,GAAG;QACT,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,WAAW;QACP,IAAI,OAAO,mBACP,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,MAAM,CAAC,gBAAgB,IAAI,CAAC,IACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CACzB,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAChD,0CAA0C;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAClE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAClE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAExE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;YACxE,MAAM,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAA;YACvE,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAA;SACrC;aACI;YACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SAChD;QAED,eAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9B,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IAED,MAAM;QACF,MAAM,IAAI,GAAG,GAAG,EAAE;YACd,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAA;YACpE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;YACvC,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,YAAY,CAAC,CAAA;QAC3C,CAAC,CAAA;QACD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,EAAE,CAAA;IACV,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,EAAU,EAAE,KAAa;QACrC,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAM;QAC1B,IAAI,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;QAC7C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAEK,SAAS,CAAC,IAAI,EAAE,GAAG;;YACrB,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAA;YAChD,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,kBAAkB,EAAE;gBAC1C,IAAI;gBACJ,GAAG;aACN,CAAC,CAAA;YACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;YACnD,4DAA4D;YAC5D,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;gBACxC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ;oBAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;aACxE;YACD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAA;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;YACxC,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,GAAG,EAAE,CAAA;aACrC;YACD,QAAQ,IAAI,EAAE;gBACV,KAAK,aAAK,CAAC,GAAG;oBACV,MAAM,UAAU,GAAG,MAAM,CAAC,aAAK,CAAC,GAAG,CAAC,IAAI,cAAQ,CAAA;oBAChD,IAAI,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE;wBACzC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK;wBACvC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM;qBAC5C,CAAC,CAAA;oBACF,MAAM;aACb;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YAC9B,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC5D,CAAC;KAAA;CAEJ;AA/ID,8BA+IC"}
|
package/lib/RpgClientEngine.d.ts
CHANGED
|
@@ -4,6 +4,11 @@ declare type ObjectFixture = {
|
|
|
4
4
|
object: any;
|
|
5
5
|
paramsChanged: any;
|
|
6
6
|
};
|
|
7
|
+
declare type Tick = {
|
|
8
|
+
timestamp: number;
|
|
9
|
+
deltaTime: number;
|
|
10
|
+
frame: number;
|
|
11
|
+
};
|
|
7
12
|
export declare class RpgClientEngine {
|
|
8
13
|
gameEngine: any;
|
|
9
14
|
private options;
|
|
@@ -41,17 +46,36 @@ export declare class RpgClientEngine {
|
|
|
41
46
|
controls: KeyboardControls;
|
|
42
47
|
_options: any;
|
|
43
48
|
private _objects;
|
|
49
|
+
private _tick;
|
|
44
50
|
keyChange: Subject<string>;
|
|
45
51
|
private hasBeenDisconnected;
|
|
46
52
|
private playerVault;
|
|
47
53
|
private isTeleported;
|
|
48
54
|
io: any;
|
|
49
55
|
private lastTimestamp;
|
|
50
|
-
private
|
|
56
|
+
private frame;
|
|
51
57
|
private subscriptionWorld;
|
|
58
|
+
private clientFrames;
|
|
59
|
+
private serverFrames;
|
|
52
60
|
constructor(gameEngine: any, options: any);
|
|
53
61
|
private _init;
|
|
54
62
|
private addResource;
|
|
63
|
+
/**
|
|
64
|
+
* Listen to each frame
|
|
65
|
+
*
|
|
66
|
+
* @prop {Observable<{ timestamp: number, deltaTime: number, frame: number }>} tick
|
|
67
|
+
* @readonly
|
|
68
|
+
* @since 3.0.0-beta.5
|
|
69
|
+
* @memberof RpgClientEngine
|
|
70
|
+
* @example
|
|
71
|
+
*
|
|
72
|
+
* ```ts
|
|
73
|
+
* client.tick.subscribe(({ timestamp, deltaTime, frame }) => {
|
|
74
|
+
*
|
|
75
|
+
* })
|
|
76
|
+
* ```
|
|
77
|
+
* */
|
|
78
|
+
get tick(): Observable<Tick>;
|
|
55
79
|
/**
|
|
56
80
|
* Adds Spritesheet classes
|
|
57
81
|
*
|
|
@@ -80,7 +104,19 @@ export declare class RpgClientEngine {
|
|
|
80
104
|
* @returns {Promise< void >}
|
|
81
105
|
* @memberof RpgClientEngine
|
|
82
106
|
*/
|
|
83
|
-
start(
|
|
107
|
+
start(options?: {
|
|
108
|
+
renderLoop: boolean;
|
|
109
|
+
}): Promise<void>;
|
|
110
|
+
/**
|
|
111
|
+
* Display the next frame. Useful for unit tests
|
|
112
|
+
*
|
|
113
|
+
* @title Next Frame
|
|
114
|
+
* @since 3.0.0-beta.5
|
|
115
|
+
* @param {number} timestamp Indicate the timestamp of the frame
|
|
116
|
+
* @method nextFrame()
|
|
117
|
+
* @memberof RpgClientEngine
|
|
118
|
+
*/
|
|
119
|
+
nextFrame(timestamp: number): void;
|
|
84
120
|
/**
|
|
85
121
|
* Read objects synchronized with the server
|
|
86
122
|
*
|
package/lib/RpgClientEngine.js
CHANGED
|
@@ -25,7 +25,7 @@ const common_1 = require("@rpgjs/common");
|
|
|
25
25
|
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
26
26
|
const snapshot_interpolation_1 = require("@geckos.io/snapshot-interpolation");
|
|
27
27
|
const RpgSound_1 = require("./Sound/RpgSound");
|
|
28
|
-
const SI = new snapshot_interpolation_1.SnapshotInterpolation(
|
|
28
|
+
const SI = new snapshot_interpolation_1.SnapshotInterpolation(15);
|
|
29
29
|
class RpgClientEngine {
|
|
30
30
|
constructor(gameEngine, options) {
|
|
31
31
|
this.gameEngine = gameEngine;
|
|
@@ -39,12 +39,23 @@ class RpgClientEngine {
|
|
|
39
39
|
* */
|
|
40
40
|
this.globalConfig = {};
|
|
41
41
|
this._objects = new rxjs_1.BehaviorSubject({});
|
|
42
|
+
this._tick = new rxjs_1.BehaviorSubject({
|
|
43
|
+
timestamp: -1,
|
|
44
|
+
deltaTime: 0,
|
|
45
|
+
frame: 0
|
|
46
|
+
});
|
|
42
47
|
this.keyChange = new rxjs_1.Subject();
|
|
43
48
|
this.hasBeenDisconnected = false;
|
|
44
49
|
this.playerVault = new snapshot_interpolation_1.Vault();
|
|
45
50
|
this.isTeleported = false;
|
|
46
51
|
this.lastTimestamp = 0;
|
|
47
|
-
this.
|
|
52
|
+
this.frame = 0;
|
|
53
|
+
this.clientFrames = new Map();
|
|
54
|
+
this.serverFrames = new Map();
|
|
55
|
+
this.tick.subscribe(({ timestamp, deltaTime }) => {
|
|
56
|
+
if (timestamp != -1)
|
|
57
|
+
this.step(timestamp, deltaTime);
|
|
58
|
+
});
|
|
48
59
|
}
|
|
49
60
|
_init() {
|
|
50
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -86,6 +97,24 @@ class RpgClientEngine {
|
|
|
86
97
|
}
|
|
87
98
|
cb(array, this);
|
|
88
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* Listen to each frame
|
|
102
|
+
*
|
|
103
|
+
* @prop {Observable<{ timestamp: number, deltaTime: number, frame: number }>} tick
|
|
104
|
+
* @readonly
|
|
105
|
+
* @since 3.0.0-beta.5
|
|
106
|
+
* @memberof RpgClientEngine
|
|
107
|
+
* @example
|
|
108
|
+
*
|
|
109
|
+
* ```ts
|
|
110
|
+
* client.tick.subscribe(({ timestamp, deltaTime, frame }) => {
|
|
111
|
+
*
|
|
112
|
+
* })
|
|
113
|
+
* ```
|
|
114
|
+
* */
|
|
115
|
+
get tick() {
|
|
116
|
+
return this._tick.asObservable();
|
|
117
|
+
}
|
|
89
118
|
/**
|
|
90
119
|
* Adds Spritesheet classes
|
|
91
120
|
*
|
|
@@ -118,19 +147,12 @@ class RpgClientEngine {
|
|
|
118
147
|
* @returns {Promise< void >}
|
|
119
148
|
* @memberof RpgClientEngine
|
|
120
149
|
*/
|
|
121
|
-
start(
|
|
150
|
+
start(options = {
|
|
151
|
+
renderLoop: true
|
|
152
|
+
}) {
|
|
122
153
|
return __awaiter(this, void 0, void 0, function* () {
|
|
123
154
|
PIXI.utils.skipHello();
|
|
124
155
|
yield this._init();
|
|
125
|
-
let frame = 0;
|
|
126
|
-
let renderLoop = (timestamp) => {
|
|
127
|
-
this.lastTimestamp = this.lastTimestamp || timestamp;
|
|
128
|
-
this.renderer.draw(timestamp, timestamp - this.lastTimestamp, frame);
|
|
129
|
-
this.lastTimestamp = timestamp;
|
|
130
|
-
this.step(timestamp, 0);
|
|
131
|
-
frame++;
|
|
132
|
-
window.requestAnimationFrame(renderLoop);
|
|
133
|
-
};
|
|
134
156
|
yield this.renderer.init();
|
|
135
157
|
this.gameEngine.start({
|
|
136
158
|
getObjects: this.getObjects.bind(this),
|
|
@@ -142,10 +164,16 @@ class RpgClientEngine {
|
|
|
142
164
|
},
|
|
143
165
|
removeObject: this.removeObject.bind(this),
|
|
144
166
|
getObjectsOfGroup: () => {
|
|
145
|
-
return Object.
|
|
167
|
+
return Object.assign(Object.assign({}, this.getObjects()), this.gameEngine.events);
|
|
146
168
|
}
|
|
147
169
|
});
|
|
148
|
-
|
|
170
|
+
if (options.renderLoop) {
|
|
171
|
+
const loop = (timestamp) => {
|
|
172
|
+
this.nextFrame(timestamp);
|
|
173
|
+
window.requestAnimationFrame(loop);
|
|
174
|
+
};
|
|
175
|
+
window.requestAnimationFrame(loop);
|
|
176
|
+
}
|
|
149
177
|
common_1.RpgPlugin.emit(common_1.HookClient.Start, this)
|
|
150
178
|
.then((ret) => {
|
|
151
179
|
const hasFalseValue = ret.findIndex(el => el === false) != -1;
|
|
@@ -154,6 +182,25 @@ class RpgClientEngine {
|
|
|
154
182
|
});
|
|
155
183
|
});
|
|
156
184
|
}
|
|
185
|
+
/**
|
|
186
|
+
* Display the next frame. Useful for unit tests
|
|
187
|
+
*
|
|
188
|
+
* @title Next Frame
|
|
189
|
+
* @since 3.0.0-beta.5
|
|
190
|
+
* @param {number} timestamp Indicate the timestamp of the frame
|
|
191
|
+
* @method nextFrame()
|
|
192
|
+
* @memberof RpgClientEngine
|
|
193
|
+
*/
|
|
194
|
+
nextFrame(timestamp) {
|
|
195
|
+
this.lastTimestamp = this.lastTimestamp || timestamp;
|
|
196
|
+
this._tick.next({
|
|
197
|
+
timestamp,
|
|
198
|
+
deltaTime: timestamp - this.lastTimestamp,
|
|
199
|
+
frame: this.frame
|
|
200
|
+
});
|
|
201
|
+
this.lastTimestamp = timestamp;
|
|
202
|
+
this.frame++;
|
|
203
|
+
}
|
|
157
204
|
/**
|
|
158
205
|
* Read objects synchronized with the server
|
|
159
206
|
*
|
|
@@ -220,7 +267,7 @@ class RpgClientEngine {
|
|
|
220
267
|
if (!localEvent &&
|
|
221
268
|
(key == 'position' ||
|
|
222
269
|
(key == 'direction' && paramsChanged && paramsChanged.position))) {
|
|
223
|
-
if (
|
|
270
|
+
if (isMe())
|
|
224
271
|
continue;
|
|
225
272
|
}
|
|
226
273
|
logic[key] = params[key];
|
|
@@ -247,62 +294,43 @@ class RpgClientEngine {
|
|
|
247
294
|
return logic;
|
|
248
295
|
}
|
|
249
296
|
sendInput(actionName) {
|
|
250
|
-
this.pressInput = true;
|
|
251
297
|
const inputEvent = { input: actionName, playerId: this.gameEngine.playerId };
|
|
252
|
-
this.gameEngine.
|
|
298
|
+
const player = this.gameEngine.world.getObject(this.gameEngine.playerId);
|
|
299
|
+
player.pendingMove.push(inputEvent);
|
|
300
|
+
this.gameEngine.processInput(this.gameEngine.playerId);
|
|
301
|
+
this.clientFrames.set(this.frame, {
|
|
302
|
+
data: player.position,
|
|
303
|
+
time: Date.now()
|
|
304
|
+
});
|
|
253
305
|
common_1.RpgPlugin.emit(common_1.HookClient.SendInput, [this, inputEvent], true);
|
|
254
|
-
if (this.socket)
|
|
255
|
-
this.socket.emit('move', { input: actionName });
|
|
306
|
+
if (this.socket) {
|
|
307
|
+
this.socket.emit('move', { input: actionName, frame: this.frame });
|
|
308
|
+
}
|
|
256
309
|
}
|
|
257
310
|
serverReconciliation() {
|
|
258
311
|
const { playerId } = this.gameEngine;
|
|
259
312
|
const player = this.gameEngine.world.getObject(playerId);
|
|
260
313
|
if (player) {
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
const playerState = playerSnapshot.state[0];
|
|
268
|
-
if (playerState) {
|
|
269
|
-
const offsetX = playerState.x - serverPos.x;
|
|
270
|
-
const offsetY = playerState.y - serverPos.y;
|
|
271
|
-
const correction = 60;
|
|
272
|
-
player.position.x -= offsetX / correction;
|
|
273
|
-
player.position.y -= offsetY / correction;
|
|
314
|
+
this.serverFrames.forEach((serverData, frame) => {
|
|
315
|
+
const { data: serverPos, time: serverTime } = serverData;
|
|
316
|
+
const client = this.clientFrames.get(frame);
|
|
317
|
+
if (!client || (client && client.data.x != serverPos.x || client.data.y != serverPos.y)) {
|
|
318
|
+
player.position.x = serverPos.x;
|
|
319
|
+
player.position.y = serverPos.y;
|
|
274
320
|
}
|
|
275
|
-
|
|
321
|
+
// if (client) {
|
|
322
|
+
// const { time: clientTime } = client
|
|
323
|
+
// console.log(serverTime - clientTime)
|
|
324
|
+
// }
|
|
325
|
+
this.serverFrames.delete(frame);
|
|
326
|
+
this.clientFrames.delete(frame);
|
|
327
|
+
});
|
|
276
328
|
}
|
|
277
329
|
}
|
|
278
330
|
step(t, dt) {
|
|
279
|
-
this.
|
|
331
|
+
this.controls.preStep();
|
|
280
332
|
common_1.RpgPlugin.emit(common_1.HookClient.Step, [this, t, dt], true);
|
|
281
|
-
|
|
282
|
-
const player = this.gameEngine.world.getObject(playerId);
|
|
283
|
-
if (player && this.isTeleported && this.pressInput) {
|
|
284
|
-
const { x, y } = player.position;
|
|
285
|
-
this.playerVault.add(SI.snapshot.create([{ id: playerId, x, y }]));
|
|
286
|
-
this.serverReconciliation();
|
|
287
|
-
}
|
|
288
|
-
const snapshot = SI.calcInterpolation('x y');
|
|
289
|
-
if (snapshot) {
|
|
290
|
-
const { state } = snapshot;
|
|
291
|
-
state.forEach(s => {
|
|
292
|
-
const { id, x, y, direction } = s;
|
|
293
|
-
const player = this.gameEngine.world.getObject(id);
|
|
294
|
-
if (player) {
|
|
295
|
-
if (id === this.gameEngine.playerId)
|
|
296
|
-
return;
|
|
297
|
-
player.position.x = Math.round(x);
|
|
298
|
-
player.position.y = Math.round(y);
|
|
299
|
-
player.direction = direction;
|
|
300
|
-
}
|
|
301
|
-
});
|
|
302
|
-
}
|
|
303
|
-
else {
|
|
304
|
-
this.pressInput = false;
|
|
305
|
-
}
|
|
333
|
+
this.serverReconciliation();
|
|
306
334
|
}
|
|
307
335
|
/**
|
|
308
336
|
*Connect to the server
|
|
@@ -368,16 +396,17 @@ class RpgClientEngine {
|
|
|
368
396
|
if (!val.data) {
|
|
369
397
|
return;
|
|
370
398
|
}
|
|
399
|
+
const partialRoom = val.partial;
|
|
371
400
|
if (val.roomId != lastRoomId) {
|
|
372
401
|
this.resetObjects();
|
|
373
402
|
lastRoomId = val.roomId;
|
|
374
403
|
this.isTeleported = false;
|
|
375
404
|
}
|
|
376
|
-
const snapshot = {
|
|
377
|
-
id:
|
|
405
|
+
/*const snapshot: any = {
|
|
406
|
+
id: Utils.generateUID(),
|
|
378
407
|
time: val.time,
|
|
379
408
|
state: []
|
|
380
|
-
}
|
|
409
|
+
}*/
|
|
381
410
|
const change = (prop, root = val, localEvent = false) => {
|
|
382
411
|
const list = root.data[prop];
|
|
383
412
|
const partial = val.partial[prop];
|
|
@@ -390,22 +419,29 @@ class RpgClientEngine {
|
|
|
390
419
|
if (!obj)
|
|
391
420
|
continue;
|
|
392
421
|
obj.type = prop == 'users' ? common_1.PlayerType.Player : common_1.PlayerType.Event;
|
|
393
|
-
if (prop == 'users' && this.gameEngine.playerId == key
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
422
|
+
if (prop == 'users' && this.gameEngine.playerId == key) {
|
|
423
|
+
if (obj.events) {
|
|
424
|
+
change('events', {
|
|
425
|
+
data: obj,
|
|
426
|
+
partial: paramsChanged,
|
|
427
|
+
time: val.time,
|
|
428
|
+
roomId: val.roomId
|
|
429
|
+
}, true);
|
|
430
|
+
}
|
|
431
|
+
if ((paramsChanged === null || paramsChanged === void 0 ? void 0 : paramsChanged.position) && (partialRoom === null || partialRoom === void 0 ? void 0 : partialRoom.frame)) {
|
|
432
|
+
this.serverFrames.set(partialRoom.frame, {
|
|
433
|
+
data: paramsChanged.position,
|
|
434
|
+
time: Date.now()
|
|
435
|
+
});
|
|
436
|
+
}
|
|
400
437
|
}
|
|
401
|
-
if (!localEvent)
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
});
|
|
438
|
+
// if (!localEvent) snapshot.state.push({
|
|
439
|
+
// id: key,
|
|
440
|
+
// x: obj.position.x,
|
|
441
|
+
// y: obj.position.y,
|
|
442
|
+
// z: obj.position.z,
|
|
443
|
+
// direction: obj.direction
|
|
444
|
+
// })
|
|
409
445
|
this.updateObject({
|
|
410
446
|
playerId: key,
|
|
411
447
|
params: obj,
|
|
@@ -420,7 +456,7 @@ class RpgClientEngine {
|
|
|
420
456
|
if (scene) {
|
|
421
457
|
scene.update(val);
|
|
422
458
|
}
|
|
423
|
-
SI.snapshot.add(snapshot)
|
|
459
|
+
//SI.snapshot.add(snapshot)
|
|
424
460
|
});
|
|
425
461
|
this.socket.on('disconnect', (reason) => {
|
|
426
462
|
if (RpgGui_1.RpgGui.exists(common_1.PrebuiltGui.Disconnect))
|
|
@@ -474,6 +510,9 @@ class RpgClientEngine {
|
|
|
474
510
|
reset() {
|
|
475
511
|
this.subscriptionWorld.unsubscribe();
|
|
476
512
|
this.world.reset();
|
|
513
|
+
Spritesheets_1.spritesheets.clear();
|
|
514
|
+
Sounds_1.sounds.clear();
|
|
515
|
+
PIXI.Loader.shared.reset();
|
|
477
516
|
}
|
|
478
517
|
}
|
|
479
518
|
exports.RpgClientEngine = RpgClientEngine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpgClientEngine.js","sourceRoot":"","sources":["../src/RpgClientEngine.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RpgClientEngine.js","sourceRoot":"","sources":["../src/RpgClientEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAqD;AACrD,0DAAiC;AACjC,wDAAsE;AACtE,2CAAmD;AACnD,4CAA2C;AAC3C,oDAA0C;AAC1C,+BAAyE;AACzE,qCAAiC;AACjC,0CAOsB;AACtB,gEAAgC;AAChC,8EAAgF;AAChF,+CAA2C;AAG3C,MAAM,EAAE,GAAG,IAAI,8CAAqB,CAAC,EAAE,CAAC,CAAA;AAoBxC,MAAa,eAAe;IA4DxB,YAAmB,UAAU,EAAU,OAAO;QAA3B,eAAU,GAAV,UAAU,CAAA;QAAU,YAAO,GAAP,OAAO,CAAA;QAxC7C;;;;;;YAMI;QACE,iBAAY,GAAQ,EAAE,CAAA;QAYrB,aAAQ,GAEX,IAAI,sBAAe,CAAC,EAAE,CAAC,CAAA;QACpB,UAAK,GAA0B,IAAI,sBAAe,CAAC;YACvD,SAAS,EAAE,CAAC,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,KAAK,EAAE,CAAC;SACX,CAAC,CAAA;QACK,cAAS,GAAoB,IAAI,cAAO,EAAE,CAAA;QACzC,wBAAmB,GAAY,KAAK,CAAA;QACpC,gBAAW,GAAG,IAAI,8BAAK,EAAE,CAAA;QACzB,iBAAY,GAAY,KAAK,CAAA;QAG7B,kBAAa,GAAW,CAAC,CAAA;QACzB,UAAK,GAAW,CAAC,CAAA;QAGjB,iBAAY,GAA2B,IAAI,GAAG,EAAE,CAAA;QAChD,iBAAY,GAA2B,IAAI,GAAG,EAAE,CAAA;QAGpD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE;YAC7C,IAAI,SAAS,IAAI,CAAC,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;IACN,CAAC;IAEa,KAAK;;YACf,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,CAAC,IAAI,CAAC,CAAA;YAClC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAA;YAE3B,MAAM,mBAAmB,GAAG,CAAO,QAAgB,EAAE,IAAY,EAAE,EAAE;gBACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;gBACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;oBACjB,GAAG,cAAK,CAAC,SAAS,CAAC,MAAM,kBAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE;oBAClE,GAAG,QAAQ;iBACd,CAAA;YACL,CAAC,CAAA,CAAA;YAED,MAAM,mBAAmB,CAAC,mBAAU,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;YACpE,MAAM,mBAAmB,CAAC,mBAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YACnD,MAAM,mBAAmB,CAAC,mBAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAExD,IAAI,CAAC,QAAQ,CAAC,OAAO,mBACjB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,SAAS,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,EAAE,EACP,YAAY,EAAE,EAAE,EAChB,MAAM,EAAE,EAAE,IACP,IAAI,CAAC,OAAO,CAClB,CAAA;YAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;YACzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;YAE7C,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,IAAI,kBAAS,CAAA;YAC7E,IAAI,CAAC,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;YACvD,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAA;YAEnC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;YACvD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAE3C,IAAI,OAAO,oBAAoB,IAAI,WAAW,IAAI,oBAAoB,EAAE;gBACpE,IAAI,eAAe,IAAI,SAAS,EAAE;oBAC9B,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;wBACjC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;oBAC1D,CAAC,CAAC,CAAA;iBACL;aACJ;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,CAAA;QAC9C,CAAC;KAAA;IAEO,WAAW,CAAC,aAAa,EAAE,EAAE;QACjC,IAAI,KAAK,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,cAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC/B,KAAK,GAAG,CAAC,aAAa,CAAC,CAAA;SAC1B;QACD,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACnB,CAAC;IAED;;;;;;;;;;;;;;SAcK;IACL,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAA;IACpC,CAAC;IAED;;;;;;;;OAQG;IACH,cAAc,CAAC,gBAAgB;QAC3B,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,+BAAgB,CAAC,CAAA;IACxD,CAAC;IAED;;;;;;;;OAQG;IACH,QAAQ,CAAC,UAAU;QACf,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,mBAAU,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;;;OAOG;IACG,KAAK,CAAC,UAAmC;QAC3C,UAAU,EAAE,IAAI;KACnB;;YACG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;YACtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;YAC1B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBAClB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;gBACtC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE;oBACd,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;oBAC9B,IAAI,CAAC,GAAG;wBAAE,OAAO,IAAI,CAAA;oBACrB,OAAO,GAAG,CAAC,MAAM,CAAA;gBACrB,CAAC;gBACD,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC1C,iBAAiB,EAAE,GAAG,EAAE;oBACpB,uCACO,IAAI,CAAC,UAAU,EAAE,GACjB,IAAI,CAAC,UAAU,CAAC,MAAM,EAC5B;gBACL,CAAC;aACJ,CAAC,CAAA;YACF,IAAI,OAAO,CAAC,UAAU,EAAE;gBACpB,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,EAAE;oBACvB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;oBACzB,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBACtC,CAAC,CAAA;gBACD,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;aACrC;YACD,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,KAAK,EAAE,IAAI,CAAC;iBACjC,IAAI,CAAC,CAAC,GAAc,EAAE,EAAE;gBACrB,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,IAAI,CAAE,CAAC,CAAA;gBAC9D,IAAI,CAAC,aAAa;oBAAE,IAAI,CAAC,UAAU,EAAE,CAAA;YACzC,CAAC,CAAC,CAAA;QACV,CAAC;KAAA;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAiB;QACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAA;QACpD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACZ,SAAS;YACT,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC,aAAa;YACzC,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAA;QAC9B,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAA;IACvC,CAAC;IAEO,UAAU;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;IAC9B,CAAC;IAEO,SAAS,CAAC,EAAE;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;QACnC,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;QACvB,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,OAAO,GAAG,CAAA;IACd,CAAC;IAEO,YAAY;QAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAEO,YAAY,CAAC,EAAO;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAChC,IAAI,KAAK,EAAE;YACP,MAAM,OAAO,qBAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAE,CAAA,CAAC,QAAQ;YACnD,OAAO,OAAO,CAAC,EAAE,CAAC,CAAA;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC3B,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,YAAY,CAAC,GAAG;QACpB,MAAM,EACF,QAAQ,EAAE,EAAE,EACZ,MAAM,EACN,UAAU,EACV,aAAa,EAChB,GAAG,GAAG,CAAA;QACP,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAA;QACjD,IAAI,KAAK,CAAA;QACT,IAAI,UAAU,GAAG,KAAK,CAAA;QACtB,IAAI,UAAU,EAAE;YACZ,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAClC,IAAI,CAAC,KAAK,EAAE;gBACR,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,wBAAe,EAAE,KAAK,CAAC,CAAA;gBACxD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;oBACzB,MAAM,EAAE,KAAK;iBAChB,CAAA;aACJ;iBACI;gBACD,KAAK,GAAG,KAAK,CAAC,MAAM,CAAA;aACvB;SACJ;aACI;YACD,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SAC9C;QACD,IAAI,CAAC,KAAK,EAAE;YACR,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,wBAAe,EAAE,EAAE,CAAC,CAAA;SACzD;QACD,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAClD,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;YACpB,IAAI,CAAC,UAAU;gBACX,CAAC,GAAG,IAAI,UAAU;oBAClB,CAAC,GAAG,IAAI,WAAW,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAClE,IAAI,IAAI,EAAE;oBAAE,SAAQ;aACvB;YACD,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;SAC3B;QACD,IAAI,aAAa,EAAE;YACf,IAAI,aAAa,CAAC,UAAU,EAAE;gBAC1B,UAAU,GAAG,IAAI,CAAA;gBACjB,KAAK,CAAC,QAAQ,qBAAQ,MAAM,CAAC,QAAQ,CAAE,CAAA,CAAC,QAAQ;aACnD;YACD,IAAI,CAAC,KAAK,CAAC,aAAa;gBAAE,KAAK,CAAC,aAAa,GAAG,EAAE,CAAA;YAClD,KAAK,CAAC,aAAa,GAAG,sBAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;SAClE;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,iCACX,IAAI,CAAC,QAAQ,CAAC,KAAK,GACnB;YACC,CAAC,EAAE,CAAC,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,aAAa;aAChB;SACJ,EACH,CAAA;QACF,IAAI,UAAU,IAAI,IAAI,EAAE,EAAE;YACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACxB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;SAClC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,SAAS,CAAC,UAAkB;QACxB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA;QAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QACxE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QACtD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE;YAC9B,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACnB,CAAC,CAAA;QACF,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAA;QAE9D,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;SACrE;IACL,CAAC;IAEO,oBAAoB;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAA;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxD,IAAI,MAAM,EAAE;YACR,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;gBAC5C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAA;gBACxD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC3C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;oBACrF,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAA;oBAC/B,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAA;iBAClC;gBACD,gBAAgB;gBAChB,0CAA0C;gBAC1C,2CAA2C;gBAC3C,IAAI;gBACJ,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAC/B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACnC,CAAC,CAAC,CAAA;SACL;IACH,CAAC;IAEK,IAAI,CAAC,CAAS,EAAE,EAAU;QAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAA;QACvB,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QACpD,IAAI,CAAC,oBAAoB,EAAE,CAAA;IAC/B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU;QACN,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,CAAA;QAEtC,IAAI,CAAC,UAAU,EAAE;YACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;SAC1B;aACI;YACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;SACxB;QAED,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC3B,IAAI,eAAM,CAAC,MAAM,CAAC,oBAAW,CAAC,UAAU,CAAC;gBAAE,eAAM,CAAC,IAAI,CAAC,oBAAW,CAAC,UAAU,CAAC,CAAA;YAC9E,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;YAC/D,IAAI,IAAI,CAAC,mBAAmB,EAAE;gBAC1B,OAAO;gBACP,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAA;gBACxB,cAAc;aACjB;YACD,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAA;QACpC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;YAC3C,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACnD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,GAAQ,EAAE,EAAE;YACzC,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE;YAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAc,CAAA;YAClD,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAA;YACtC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YACxC,QAAQ,IAAI,EAAE;gBACV,KAAK,eAAe;oBAChB,KAAK,CAAC,aAAa,CAAC;wBAChB,QAAQ,EAAE,MAAM;wBAChB,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;wBAClB,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;wBACxB,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;qBAC5B,CAAC,CAAA;oBACN,MAAK;gBACL,KAAK,WAAW;oBACZ,mBAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;oBAClC,MAAK;aACR;QACL,CAAC,CAAC,CAAA;QAEF,IAAI,UAAU,GAAG,EAAE,CAAA;QAEnB,IAAI,CAAC,iBAAiB,GAAG,mBAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;aAC7C,KAAK;aACL,SAAS,CAAC,CAAC,GAA8D,EAAE,EAAE;YAE9E,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACX,OAAM;aACT;YAED,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAA;YAE/B,IAAI,GAAG,CAAC,MAAM,IAAI,UAAU,EAAE;gBAC1B,IAAI,CAAC,YAAY,EAAE,CAAA;gBACnB,UAAU,GAAG,GAAG,CAAC,MAAM,CAAA;gBACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;aAC5B;YAED;;;;eAIG;YAEH,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,EAAE,UAAU,GAAG,KAAK,EAAE,EAAE;gBACpD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC5B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACjC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;oBAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;oBACrB,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBACxD,IAAI,GAAG,IAAI,IAAI,EAAE;wBACb,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;qBACzB;oBACD,IAAI,CAAC,GAAG;wBAAE,SAAQ;oBAClB,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,mBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAU,CAAC,KAAK,CAAA;oBACjE,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,GAAG,EAAE;wBACpD,IAAI,GAAG,CAAC,MAAM,EAAE;4BACZ,MAAM,CAAC,QAAQ,EAAE;gCACb,IAAI,EAAE,GAAG;gCACT,OAAO,EAAE,aAAa;gCACtB,IAAI,EAAE,GAAG,CAAC,IAAI;gCACd,MAAM,EAAE,GAAG,CAAC,MAAM;6BACrB,EAAE,IAAI,CAAC,CAAA;yBACX;wBACD,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,MAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAA,EAAE;4BAC/C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE;gCACrC,IAAI,EAAE,aAAa,CAAC,QAAQ;gCAC5B,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;6BACnB,CAAC,CAAA;yBACL;qBACJ;oBAED,0CAA0C;oBAC1C,eAAe;oBACf,yBAAyB;oBACzB,yBAAyB;oBACzB,yBAAyB;oBACzB,+BAA+B;oBAC/B,KAAK;oBACL,IAAI,CAAC,YAAY,CAAC;wBACd,QAAQ,EAAE,GAAG;wBACb,MAAM,EAAE,GAAG;wBACX,UAAU;wBACV,aAAa;qBAChB,CAAC,CAAA;iBACL;YACL,CAAC,CAAA;YAED,MAAM,CAAC,OAAO,CAAC,CAAA;YACf,MAAM,CAAC,QAAQ,CAAC,CAAA;YAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAEtC,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;aACpB;YAED,2BAA2B;QAC/B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAc,EAAE,EAAE;YAC5C,IAAI,eAAM,CAAC,MAAM,CAAC,oBAAW,CAAC,UAAU,CAAC;gBAAE,eAAM,CAAC,OAAO,CAAC,oBAAW,CAAC,UAAU,CAAC,CAAA;YACjF,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;YACxE,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAA;QACnC,CAAC,CAAC,CAAA;QAEF,eAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9B,IAAI,UAAU,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;SAC3B;IACL,CAAC;IAED,IAAI,KAAK;QACL,OAAO,mBAAK,CAAA;IAChB,CAAC;IAEA,YAAY;IAEZ;;;;;;;;QAQI;IACL,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAA;IAC5B,CAAC;IAED;;;;;;;;SAQK;IACL,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAA;IAC3B,CAAC;IAED;;;;;;SAMK;IACL,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACnC,CAAC;IAED,KAAK;QACD,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAA;QACpC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAClB,2BAAY,CAAC,KAAK,EAAE,CAAA;QACpB,eAAM,CAAC,KAAK,EAAE,CAAA;QACd,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;CACJ;AAxkBD,0CAwkBC"}
|
package/lib/RpgGui.d.ts
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
import { RpgClientEngine } from './index';
|
|
2
|
+
interface GuiOptions {
|
|
3
|
+
data: any;
|
|
4
|
+
attachToSprite: boolean;
|
|
5
|
+
display: boolean;
|
|
6
|
+
name: string;
|
|
7
|
+
}
|
|
1
8
|
declare class Gui {
|
|
2
9
|
private renderer;
|
|
3
10
|
private gameEngine;
|
|
@@ -6,7 +13,8 @@ declare class Gui {
|
|
|
6
13
|
private vm;
|
|
7
14
|
private socket;
|
|
8
15
|
private gui;
|
|
9
|
-
_initalize(clientEngine:
|
|
16
|
+
_initalize(clientEngine: RpgClientEngine): void;
|
|
17
|
+
update(logicObjects: any): void;
|
|
10
18
|
_setSocket(socket: any): void;
|
|
11
19
|
_setGui(id: any, obj: any): void;
|
|
12
20
|
/**
|
|
@@ -25,10 +33,7 @@ declare class Gui {
|
|
|
25
33
|
* @returns { { data: any, display: boolean } }
|
|
26
34
|
* @memberof RpgGui
|
|
27
35
|
*/
|
|
28
|
-
get(id: any):
|
|
29
|
-
data: any;
|
|
30
|
-
display: boolean;
|
|
31
|
-
};
|
|
36
|
+
get(id: any): GuiOptions;
|
|
32
37
|
/**
|
|
33
38
|
* Get all GUI. You retrieve GUI data and information whether it is displayed or not
|
|
34
39
|
*
|
|
@@ -45,10 +50,7 @@ declare class Gui {
|
|
|
45
50
|
* @memberof RpgGui
|
|
46
51
|
*/
|
|
47
52
|
getAll(): {
|
|
48
|
-
[guiName: string]:
|
|
49
|
-
data: any;
|
|
50
|
-
display: boolean;
|
|
51
|
-
};
|
|
53
|
+
[guiName: string]: GuiOptions;
|
|
52
54
|
};
|
|
53
55
|
/**
|
|
54
56
|
* Checks if the GUI exists RpgClient's gui array
|
package/lib/RpgGui.js
CHANGED
|
@@ -26,14 +26,24 @@ class Gui {
|
|
|
26
26
|
@pointercancel="propagate('pointercancel', $event)"
|
|
27
27
|
@pointerup="propagate('pointerup', $event)"
|
|
28
28
|
>
|
|
29
|
-
<template v-for="
|
|
30
|
-
<component :is="name" v-bind="ui.data" v-if="ui.display"></component>
|
|
31
|
-
</template>
|
|
29
|
+
<template v-for="ui in fixedGui">
|
|
30
|
+
<component :is="ui.name" v-bind="ui.data" v-if="ui.display"></component>
|
|
31
|
+
</template>
|
|
32
|
+
<div id="tooltips" style="position: absolute; top: 0; left: 0;">
|
|
33
|
+
<template v-for="ui in attachedGui">
|
|
34
|
+
<template v-if="ui.display">
|
|
35
|
+
<div v-for="tooltip of tooltipFilter(tooltips, ui)" :style="tooltipPosition(tooltip.position)">
|
|
36
|
+
<component :is="ui.name" v-bind="{ ...ui.data, spriteData: tooltip }" :ref="ui.name"></component>
|
|
37
|
+
</div>
|
|
38
|
+
</template>
|
|
39
|
+
</template>
|
|
40
|
+
</div>
|
|
32
41
|
</div>
|
|
33
42
|
`,
|
|
34
43
|
data() {
|
|
35
44
|
return {
|
|
36
|
-
gui
|
|
45
|
+
gui,
|
|
46
|
+
tooltips: []
|
|
37
47
|
};
|
|
38
48
|
},
|
|
39
49
|
provide: () => {
|
|
@@ -305,9 +315,29 @@ class Gui {
|
|
|
305
315
|
rpgEngine: this.clientEngine
|
|
306
316
|
};
|
|
307
317
|
},
|
|
318
|
+
computed: {
|
|
319
|
+
fixedGui() {
|
|
320
|
+
return Object.values(this.gui).filter((gui) => !gui.attachToSprite);
|
|
321
|
+
},
|
|
322
|
+
attachedGui() {
|
|
323
|
+
return Object.values(this.gui).filter((gui) => gui.attachToSprite);
|
|
324
|
+
}
|
|
325
|
+
},
|
|
308
326
|
methods: {
|
|
309
327
|
propagate: (type, event) => {
|
|
310
328
|
this.renderer.renderer.view.dispatchEvent(new MouseEvent(type, event));
|
|
329
|
+
},
|
|
330
|
+
tooltipPosition: (position) => {
|
|
331
|
+
const scene = this.renderer.getScene();
|
|
332
|
+
const viewport = scene.viewport;
|
|
333
|
+
const left = position.x - viewport.left;
|
|
334
|
+
const top = position.y - viewport.top;
|
|
335
|
+
return {
|
|
336
|
+
transform: `translate(${left}px,${top}px)`
|
|
337
|
+
};
|
|
338
|
+
},
|
|
339
|
+
tooltipFilter(sprites, ui) {
|
|
340
|
+
return sprites.filter(tooltip => tooltip.guiDisplay);
|
|
311
341
|
}
|
|
312
342
|
}
|
|
313
343
|
});
|
|
@@ -315,7 +345,9 @@ class Gui {
|
|
|
315
345
|
this.app.component(ui.name, ui);
|
|
316
346
|
this.gui[ui.name] = {
|
|
317
347
|
data: ui.data,
|
|
318
|
-
|
|
348
|
+
attachToSprite: ui.rpgAttachToSprite,
|
|
349
|
+
display: false,
|
|
350
|
+
name: ui.name
|
|
319
351
|
};
|
|
320
352
|
}
|
|
321
353
|
this.vm = this.app.mount(selectorGui);
|
|
@@ -323,11 +355,20 @@ class Gui {
|
|
|
323
355
|
this.renderer.app = this.app;
|
|
324
356
|
this.renderer.vm = this.vm;
|
|
325
357
|
}
|
|
358
|
+
update(logicObjects) {
|
|
359
|
+
this.vm.tooltips = Object.values(logicObjects).map((object) => object.object);
|
|
360
|
+
}
|
|
326
361
|
_setSocket(socket) {
|
|
327
362
|
this.socket = socket;
|
|
328
363
|
this.socket.on('gui.open', ({ guiId, data }) => {
|
|
329
364
|
this.display(guiId, data);
|
|
330
365
|
});
|
|
366
|
+
this.socket.on('gui.tooltip', ({ players, display }) => {
|
|
367
|
+
for (let playerId of players) {
|
|
368
|
+
const sprite = this.renderer.getScene().getSprite(playerId);
|
|
369
|
+
sprite.guiDisplay = display;
|
|
370
|
+
}
|
|
371
|
+
});
|
|
331
372
|
this.socket.on('gui.exit', (guiId) => {
|
|
332
373
|
this.hide(guiId);
|
|
333
374
|
});
|
package/lib/RpgGui.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpgGui.js","sourceRoot":"","sources":["../src/RpgGui.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;
|
|
1
|
+
{"version":3,"file":"RpgGui.js","sourceRoot":"","sources":["../src/RpgGui.ts"],"names":[],"mappings":"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"}
|
package/lib/Scene/Map.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Map.js","sourceRoot":"","sources":["../../src/Scene/Map.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6E;AAC7E,yDAAgC;AAChC,iDAAwC;AAExC,mCAA+B;AAC/B,yDAAqD;AAErD,gDAA4C;
|
|
1
|
+
{"version":3,"file":"Map.js","sourceRoot":"","sources":["../../src/Scene/Map.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6E;AAC7E,yDAAgC;AAChC,iDAAwC;AAExC,mCAA+B;AAC/B,yDAAqD;AAErD,gDAA4C;AAG5C,MAAa,QAAS,SAAQ,aAAK;IA4B/B,YACkB,IAAS,EACX,UAA2D,EAAE;QACzE,KAAK,CAAC,IAAI,CAAC,CAAA;QAFG,SAAI,GAAJ,IAAI,CAAK;QACX,YAAO,GAAP,OAAO,CAAsD;QATrE,YAAO,GAAW,EAAE,CAAA;QACpB,aAAQ,GAAY,KAAK,CAAA;QAIjC,WAAM,GAAG,EAAE,CAAA;QAMP,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IAEO,gBAAgB;QACpB;YACI,cAAc;YACd,gBAAgB;YAChB,uBAAuB;YACvB,mBAAmB;YACnB,WAAW;YACX,UAAU;YACV,gBAAgB;SACnB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5E;YACI,UAAU;YACV,SAAS;YACT,aAAa;YACb,YAAY;YACZ,WAAW;YACX,MAAM;YACN,QAAQ;SACX,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IAEtD,CAAC;IAED,IAAI,CAAC,GAAG;QACJ,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAY,EAAE,CAAA;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,qBAAY,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAExE,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QACjC,IAAI,MAAM,GAAG,CAAC,CAAA;QAEd,MAAM,CAAC,KAAK,EAAE,CAAA;QAEd,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACvC,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ;gBAAE,SAAQ;YAC1C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;YACnD,MAAM,EAAE,CAAA;SACX;QAED,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;YAC7B,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACxC,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAClD,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;oBAAE,WAAW,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;aAC9E;QACL,CAAC,CAAC,CAAA;QAEF,mBAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAEtB,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;QAElD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,GAAG,EAAE;gBAClB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;gBACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,wBAAQ,CAAC;oBACzB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;oBACrC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;oBACvC,UAAU,EAAE,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,SAAS;oBACrC,WAAW,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU;iBAC3C,CAAC,CAAA;gBACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;gBAC1C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;gBACzC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;gBACpB,IAAI,GAAG,CAAC,MAAM,EAAE;oBACZ,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,mBAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;iBAC9D;gBACD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBACtB,IAAK,IAAI,CAAC,MAAM;oBAAE,IAAI,CAAC,MAAM,EAAE,CAAA;YACnC,CAAC,CAAA;YACD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;gBACpB,MAAM,EAAE,CAAA;YACZ,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAC/B,IAAI,MAAM,IAAI,CAAC,EAAE;gBACb,QAAQ,EAAE,CAAA;aACb;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,UAAU,CAAC,CAAS,EAAE,CAAS,EAAE,MAEhC;QACG,KAAK,IAAI,SAAS,IAAI,MAAM,EAAE;YAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;YACnC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;YAChD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;SAC3C;IACL,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,EAAU,EAAE,KAAa;QACrC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,OAAM;SACT;QACD,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;QACxB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAED,cAAc,CAAC,KAAK,EAAE,MAAiB,EAAE,MAAe;QACpD,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;QAC/B,IAAI,MAAM,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE;YAC5E,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;YAC9C,MAAM,EAAE,YAAY,EAAE,GAAQ,MAAM,CAAA;YACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;YAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG,SAAS,CAAA;YAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,UAAU,CAAA;YACjE,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAA;YACnB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAA;YAEnB,MAAM,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;gBAC3D,IAAI,KAAK,CAAC,MAAM;oBAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAA;YACrD,CAAC,CAAA;YAED,YAAY,CAAC,cAAc,EAAE,CAAA;YAE7B,KAAK,IAAI,CAAC,GAAG,EAAE,EAAG,CAAC,IAAI,EAAE,GAAG,KAAK,EAAG,CAAC,IAAI,SAAS,EAAE;gBAChD,KAAK,IAAI,CAAC,GAAG,EAAE,EAAG,CAAC,IAAI,EAAE,GAAG,MAAM,EAAG,CAAC,IAAI,UAAU,EAAE;oBAClD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;iBAChB;aACJ;SACJ;QACD,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,iBAAiB,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,EAA4B;QAC5D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAC,GAAgC;QACxC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAA;QACjC,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAA;QAErC,MAAM,oBAAoB,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;YAClD,aAAa,CAAC,eAAe,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;YACpD,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE;gBACxB,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACpC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC3C,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;gBAClD,QAAQ,CAAC,OAAO,EAAE,CAAA;gBAClB,aAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;aACnD;YACD,aAAa,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;YACzC,aAAa,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;YACzC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;YAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,eAAe,CAAA;QAC3D,CAAC,CAAA;QAED,IAAI,MAAM,EAAE;YACR,KAAK,IAAI,CAAC,IAAI,MAAM,EAAE;gBAClB,IAAI,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;gBAC5B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;gBACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC5C,IAAI,KAAK,IAAI,IAAI,EAAE;oBACf,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;oBAC9B,SAAQ;iBACX;gBACD,KAAK,mCACE,KAAK,KACR,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EACrB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EACrB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EACtB,UAAU,EAAE,KAAK,CAAC,UAAU,GAC/B,CAAA;gBACD,IAAI,QAAQ,EAAE;oBACV,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;wBAC3B,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;qBACxC;oBACD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;iBACtB;gBACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;oBACpB,MAAM,aAAa,GAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;oBACtD,oBAAoB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;iBAC7C;aACJ;SACJ;IACL,CAAC;IAED,SAAS,CAAC,GAAG,EAAE,EAAU;;QACrB,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QACpC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QAClC,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QACzC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAEpD,MAAM,CAAC,YAAY,GAAG,YAAY,CAAA;QAClC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;QAErC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QAC5B,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE9C,IAAI,MAAM,CAAC,eAAe;YAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,CAAC,MAAM,CAAC,CAAA;QACzD,MAAM,CAAC,MAAM,EAAE,CAAA;QAEf,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;QAC/D,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC5C,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,YAAY,CAAC,EAAU;QACnB,IAAI,MAAM,GAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,MAAM,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvB,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;YAClE,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YAC/C,MAAM,CAAC,OAAO,EAAE,CAAA;SACnB;IACL,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,EAAE,CAAC,SAAiB,EAAE,EAA4E;QAC9F,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QACzB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAA;QAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,UAAS,EAAE;YAC7C,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACjD,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAzRD,4BAyRC"}
|
package/lib/Scene/Scene.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.Scene = void 0;
|
|
|
4
4
|
const common_1 = require("@rpgjs/common");
|
|
5
5
|
const Animation_1 = require("../Effects/Animation");
|
|
6
6
|
const rxjs_1 = require("rxjs");
|
|
7
|
+
const RpgGui_1 = require("../RpgGui");
|
|
7
8
|
class Scene {
|
|
8
9
|
constructor(game) {
|
|
9
10
|
this.game = game;
|
|
@@ -96,6 +97,7 @@ class Scene {
|
|
|
96
97
|
animation.update();
|
|
97
98
|
}
|
|
98
99
|
this.onDraw(t);
|
|
100
|
+
RpgGui_1.RpgGui.update(logicObjects);
|
|
99
101
|
common_1.RpgPlugin.emit(common_1.HookClient.SceneDraw, this);
|
|
100
102
|
}
|
|
101
103
|
onUpdateObject(logic, sprite, moving) { }
|
package/lib/Scene/Scene.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scene.js","sourceRoot":"","sources":["../../src/Scene/Scene.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AAGrD,oDAAgD;AAChD,+BAAkD;
|
|
1
|
+
{"version":3,"file":"Scene.js","sourceRoot":"","sources":["../../src/Scene/Scene.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AAGrD,oDAAgD;AAChD,+BAAkD;AAClD,sCAAkC;AAIlC,MAAa,KAAK;IAcd,YAAsB,IAAS;QAAT,SAAI,GAAJ,IAAI,CAAK;QAZrB,YAAO,GAAqB,IAAI,GAAG,EAAE,CAAA;QACrC,WAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAC3B,mBAAc,GAAmB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QAGvD,eAAU,GAAgB,EAAE,CAAA;QAE5B,UAAK,GAAyC,IAAI,sBAAe,CAAC;YACtE,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,EAAE;SACd,CAAC,CAAA;QAGE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAA;QAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAA;QAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAA;IACpC,CAAC;IAEO,oBAAoB,CAAC,KAAK,EAAE,MAAiB,EAAE,MAAe;QAClE,IAAI,IAAI,CAAC,cAAc;YAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QACnE,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAA;QAC9D,IAAI,KAAK,CAAC,aAAa,EAAE;YACrB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAC9D,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,CAAA;YACtG,KAAK,CAAC,aAAa,GAAG,IAAI,CAAA;SAC7B;IACL,CAAC;IAED,MAAM,CAAC,GAAwB;QAC3B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACrB,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QAC5D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,EAAU,EAAE,KAAa;QACrC,MAAM,YAAY,mCAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,GAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAE,CAAA;QAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAA;QAClC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAA;QACpD,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE;YAC1B,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;YACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACzB,MAAM,MAAM,GAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBAC5C,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;aAC/C;iBACI;gBACD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBACrC,IAAI,CAAC,MAAM,CAAC,MAAM;oBAAE,OAAM;gBAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;gBACjC,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;aACrD;SACJ;QACD,IAAI,SAAS,GAAG,aAAa,CAAC,IAAI,EAAE;YAChC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC/B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;oBACpB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;iBACzB;YACL,CAAC,CAAC,CAAA;SACL;QACD,KAAK,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACnC,SAAS,CAAC,MAAM,EAAE,CAAA;SACrB;QACD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QACd,eAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3B,kBAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,cAAc,CAAC,KAAK,EAAE,MAAiB,EAAE,MAAe,IAAQ,CAAC;IAEjE,SAAS,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IAChC,CAAC;IAED,YAAY,CAAC,EAAE;QACX,MAAM,MAAM,GAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvB,MAAM,CAAC,OAAO,EAAE,CAAA;SACnB;IACL,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiDG;IACH,aAAa,CAAC,EACV,OAAO,EACP,aAAa,EACb,QAAQ,EACR,CAAC,GAAG,CAAC,EACL,CAAC,GAAG,CAAC,EACL,IAAI,GAAG,KAAK,EACZ,cAAc,GAAG,KAAK,EASzB;QACG,IAAI,cAAc,IAAI,QAAQ,EAAE;YAC5B,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;SACxD;QACD,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACvC,IAAI,CAAC,IAAI,EAAE;YACP,SAAS,CAAC,QAAQ,GAAG,GAAG,EAAE;gBACtB,SAAS,CAAC,IAAI,EAAE,CAAA;YACpB,CAAC,CAAA;SACJ;QACD,IAAI,QAAQ,EAAE;YACV,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;SAChC;aACI;YACD,SAAS,CAAC,CAAC,GAAG,CAAC,CAAA;YACf,SAAS,CAAC,CAAC,GAAG,CAAC,CAAA;SAClB;QACD,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,OAAO,SAAS,CAAA;IACpB,CAAC;IAEA;;;;;;;;MAQE;IACH,SAAS,CAAC,EAAU,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC;IACnD,SAAS,CAAC,EAAU;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAEA;;;;;;;MAOE;IACH,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC;IAED,QAAQ;IACR,MAAM,KAAI,CAAC;IACX,MAAM,KAAI,CAAC;IACX,SAAS,CAAC,GAAG,IAAG,CAAC;IACjB,MAAM,CAAC,CAAS,IAAG,CAAC;IACpB,WAAW,CAAC,MAAiB,IAAG,CAAC;IACjC,cAAc,CAAC,MAAiB,IAAG,CAAC;CACvC;AA/OD,sBA+OC"}
|
|
@@ -17,11 +17,13 @@ export default class Character extends PIXI.Sprite {
|
|
|
17
17
|
private playStandardAnimation;
|
|
18
18
|
animation: Animation;
|
|
19
19
|
private objSaved;
|
|
20
|
+
private teleported;
|
|
21
|
+
private map;
|
|
20
22
|
anim: any;
|
|
21
23
|
/**
|
|
22
24
|
* the direction of the sprite
|
|
23
25
|
*
|
|
24
|
-
* @prop {Direction} dir
|
|
26
|
+
* @prop {Direction} dir
|
|
25
27
|
* @readonly
|
|
26
28
|
* @memberof RpgSprite
|
|
27
29
|
* */
|
|
@@ -59,6 +61,8 @@ export default class Character extends PIXI.Sprite {
|
|
|
59
61
|
* @memberof RpgSprite
|
|
60
62
|
* */
|
|
61
63
|
get logic(): RpgCommonPlayer;
|
|
64
|
+
get guiDisplay(): boolean;
|
|
65
|
+
set guiDisplay(val: boolean);
|
|
62
66
|
constructor(data: any, scene: any);
|
|
63
67
|
addEffect(str: any): void;
|
|
64
68
|
/**
|
package/lib/Sprite/Character.js
CHANGED
|
@@ -22,6 +22,8 @@ class Character extends PIXI.Sprite {
|
|
|
22
22
|
this.fixed = false;
|
|
23
23
|
this.playStandardAnimation = true;
|
|
24
24
|
this.objSaved = {};
|
|
25
|
+
this.teleported = 0;
|
|
26
|
+
this.map = '';
|
|
25
27
|
this.x = data.position.x;
|
|
26
28
|
this.y = data.position.y;
|
|
27
29
|
this.fixed = data.fixed;
|
|
@@ -29,17 +31,12 @@ class Character extends PIXI.Sprite {
|
|
|
29
31
|
/**
|
|
30
32
|
* the direction of the sprite
|
|
31
33
|
*
|
|
32
|
-
* @prop {Direction} dir
|
|
34
|
+
* @prop {Direction} dir
|
|
33
35
|
* @readonly
|
|
34
36
|
* @memberof RpgSprite
|
|
35
37
|
* */
|
|
36
38
|
get dir() {
|
|
37
|
-
return
|
|
38
|
-
common_1.Direction.Down,
|
|
39
|
-
common_1.Direction.Left,
|
|
40
|
-
common_1.Direction.Right,
|
|
41
|
-
common_1.Direction.Up
|
|
42
|
-
][this.direction];
|
|
39
|
+
return this.direction;
|
|
43
40
|
}
|
|
44
41
|
/**
|
|
45
42
|
* To know if the sprite is a player
|
|
@@ -82,6 +79,12 @@ class Character extends PIXI.Sprite {
|
|
|
82
79
|
get logic() {
|
|
83
80
|
return this.scene.game.world.getObject(this.data.playerId);
|
|
84
81
|
}
|
|
82
|
+
get guiDisplay() {
|
|
83
|
+
return this.logic.guiDisplay;
|
|
84
|
+
}
|
|
85
|
+
set guiDisplay(val) {
|
|
86
|
+
this.logic.guiDisplay = val;
|
|
87
|
+
}
|
|
85
88
|
// Todo
|
|
86
89
|
addEffect(str) {
|
|
87
90
|
const id = Math.random();
|
|
@@ -167,7 +170,7 @@ class Character extends PIXI.Sprite {
|
|
|
167
170
|
};
|
|
168
171
|
}
|
|
169
172
|
update(obj) {
|
|
170
|
-
const { graphic, speed } = obj;
|
|
173
|
+
const { graphic, speed, teleported, map } = obj;
|
|
171
174
|
if (graphic != this.graphic) {
|
|
172
175
|
this.setGraphic(graphic);
|
|
173
176
|
}
|
|
@@ -178,15 +181,16 @@ class Character extends PIXI.Sprite {
|
|
|
178
181
|
this.z = Math.floor(obj.position.z);
|
|
179
182
|
this._x = Math.floor(obj.position.x);
|
|
180
183
|
this._y = Math.floor(obj.position.y) - this.z;
|
|
184
|
+
if (teleported != this.teleported || map != this.map) {
|
|
185
|
+
this.x = this._x;
|
|
186
|
+
this.y = this._y;
|
|
187
|
+
this.teleported = teleported;
|
|
188
|
+
this.map = map;
|
|
189
|
+
}
|
|
181
190
|
this.parent.parent.zIndex = this._y;
|
|
182
191
|
obj.posX = obj.position.x;
|
|
183
192
|
obj.posY = obj.position.y;
|
|
184
193
|
this.direction = obj.direction;
|
|
185
|
-
// If the positions coming from the server are too different from the client, we reposition the player.
|
|
186
|
-
if (Math.abs(this._x - this.x) > speed * 15)
|
|
187
|
-
this.x = this._x;
|
|
188
|
-
if (Math.abs(this._y - this.y) > speed * 15)
|
|
189
|
-
this.y = this._y;
|
|
190
194
|
if (this._x > this.x) {
|
|
191
195
|
this.x += Math.min(speed, this._x - this.x);
|
|
192
196
|
moving = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Character.js","sourceRoot":"","sources":["../../src/Sprite/Character.ts"],"names":[],"mappings":";;AAAA,0CAAwF;AACxF,iDAA6C;AAC7C,0DAAsD;AACtD,oDAAgD;AAChD,sEAA2E;AAE3E,MAAM,EAAE,UAAU,EAAE,GAAG,cAAK,CAAA;AAE5B,MAAqB,SAAU,SAAQ,IAAI,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"Character.js","sourceRoot":"","sources":["../../src/Sprite/Character.ts"],"names":[],"mappings":"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"}
|
package/lib/Tilemap/TileSet.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const Spritesheets_1 = require("../Sprite/Spritesheets");
|
|
4
|
+
const Logger_1 = require("../Logger");
|
|
4
5
|
class TileSet {
|
|
5
6
|
constructor(tileSet) {
|
|
6
7
|
this.firstGid = 0;
|
|
@@ -13,6 +14,9 @@ class TileSet {
|
|
|
13
14
|
this.textures = [];
|
|
14
15
|
Object.assign(this, tileSet);
|
|
15
16
|
const spritesheet = Spritesheets_1.spritesheets.get(this.name);
|
|
17
|
+
if (!spritesheet) {
|
|
18
|
+
throw Logger_1.log(`There are no tilesets for ${this.name}`);
|
|
19
|
+
}
|
|
16
20
|
this.spritesheet = spritesheet;
|
|
17
21
|
}
|
|
18
22
|
load() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileSet.js","sourceRoot":"","sources":["../../src/Tilemap/TileSet.ts"],"names":[],"mappings":";;AAAA,yDAAqD;
|
|
1
|
+
{"version":3,"file":"TileSet.js","sourceRoot":"","sources":["../../src/Tilemap/TileSet.ts"],"names":[],"mappings":";;AAAA,yDAAqD;AACrD,sCAA+B;AAE/B,MAAqB,OAAO;IAcxB,YAAY,OAAO;QAZnB,aAAQ,GAAW,CAAC,CAAA;QACpB,WAAM,GAAW,CAAC,CAAA;QAClB,YAAO,GAAU,CAAC,CAAA;QAClB,eAAU,GAAW,CAAC,CAAA;QACtB,cAAS,GAAU,CAAC,CAAA;QAEpB,eAAU,GAAQ,EAAE,CAAA;QACpB,SAAI,GAAW,EAAE,CAAA;QAGjB,aAAQ,GAAU,EAAE,CAAA;QAGhB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC5B,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,YAAG,CAAC,6BAA6B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;SACtD;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAClC,CAAC;IAED,IAAI;QACA,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAA;QAC7C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QACtC,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EACrB,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,EACrC;YACE,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EACpB,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,EACpC;gBACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,IAAI,CAAC,OAAO,CACZ,IAAI,CAAC,WAAW,EAChB,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAChE,CACJ,CAAA;aACJ;SACJ;IACL,CAAC;CACJ;AA7CD,0BA6CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rpgjs/client",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -19,10 +19,11 @@
|
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@geckos.io/snapshot-interpolation": "1.0.2",
|
|
22
|
-
"@rpgjs/common": "^3.0.0-beta.
|
|
23
|
-
"@rpgjs/sync-client": "^3.0.0-beta.
|
|
22
|
+
"@rpgjs/common": "^3.0.0-beta.5",
|
|
23
|
+
"@rpgjs/sync-client": "^3.0.0-beta.5",
|
|
24
24
|
"@tweenjs/tween.js": "^18.6.0",
|
|
25
25
|
"@types/howler": "2.2.1",
|
|
26
|
+
"bezier-easing": "^2.1.0",
|
|
26
27
|
"howler": "2.2.1",
|
|
27
28
|
"lodash.merge": "4.6.2",
|
|
28
29
|
"pixi-heaven": "0.2.2",
|
|
@@ -30,9 +31,9 @@
|
|
|
30
31
|
"pixi-viewport": "4.15.0",
|
|
31
32
|
"pixi.js": "5.3.10",
|
|
32
33
|
"rxjs": "6.6.3",
|
|
33
|
-
"vue": "3.
|
|
34
|
+
"vue": "^3.2.31"
|
|
34
35
|
},
|
|
35
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "6c053091680a5a2112790ecffec8649376feacd5",
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"typescript": "^4.3.5"
|
|
38
39
|
}
|