@rpgjs/client 3.2.0 → 3.3.0
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/Components/AbstractComponent.d.ts +31 -0
- package/lib/Components/AbstractComponent.js +104 -0
- package/lib/Components/AbstractComponent.js.map +1 -0
- package/lib/Components/BarComponent.d.ts +20 -0
- package/lib/Components/BarComponent.js +168 -0
- package/lib/Components/BarComponent.js.map +1 -0
- package/lib/Components/ColorComponent.d.ts +8 -6
- package/lib/Components/ColorComponent.js +25 -11
- package/lib/Components/ColorComponent.js.map +1 -1
- package/lib/Components/Component.d.ts +24 -3
- package/lib/Components/Component.js +178 -28
- package/lib/Components/Component.js.map +1 -1
- package/lib/Components/DebugComponent.d.ts +10 -0
- package/lib/Components/DebugComponent.js +33 -0
- package/lib/Components/DebugComponent.js.map +1 -0
- package/lib/Components/IComponent.d.ts +0 -0
- package/lib/Components/IComponent.js +2 -0
- package/lib/Components/IComponent.js.map +1 -0
- package/lib/Components/ImageComponent.d.ts +8 -6
- package/lib/Components/ImageComponent.js +19 -5
- package/lib/Components/ImageComponent.js.map +1 -1
- package/lib/Components/ShapeComponent.d.ts +10 -0
- package/lib/Components/ShapeComponent.js +57 -0
- package/lib/Components/ShapeComponent.js.map +1 -0
- package/lib/Components/TextComponent.d.ts +8 -3
- package/lib/Components/TextComponent.js +26 -4
- package/lib/Components/TextComponent.js.map +1 -1
- package/lib/Components/TileComponent.d.ts +7 -6
- package/lib/Components/TileComponent.js +21 -9
- package/lib/Components/TileComponent.js.map +1 -1
- package/lib/Effects/Animation.d.ts +6 -0
- package/lib/Effects/Animation.js +25 -3
- package/lib/Effects/Animation.js.map +1 -1
- package/lib/GameEngine.d.ts +2 -0
- package/lib/GameEngine.js +30 -5
- package/lib/GameEngine.js.map +1 -1
- package/lib/Sprite/Character.d.ts +3 -0
- package/lib/Sprite/Character.js +9 -0
- package/lib/Sprite/Character.js.map +1 -1
- package/package.json +6 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileComponent.js","sourceRoot":"","sources":["../../src/Components/TileComponent.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"TileComponent.js","sourceRoot":"","sources":["../../src/Components/TileComponent.ts"],"names":[],"mappings":";;;;;;AAEA,2DAAkC;AAClC,qEAA4C;AAC5C,2DAAiE;AAGjE,MAAa,aAAc,SAAQ,qCAAsD;IAAzF;;QAEI,gBAAW,GAAa,EAAE,CAAA;QAC1B,QAAG,GAAW,CAAC,CAAA;IA6BnB,CAAC;IA3BG,MAAM,CAAC,IAAc;QACjB,IAAI,OAAO,IAAI,CAAC,KAAK,IAAI,QAAQ,EAAE;YAC/B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAA;SACxB;aAAM;YACH,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAA;SAC5B;QACD,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QACrB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC;IAED,YAAY,CAAC,MAAW;;QACpB,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAY,CAAA;QACjD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;QAC7B,MAAM,OAAO,GAAG,mBAAS,CAAC,WAAW,CACjC,IAAI,CAAC,GAAG,EACR,OAAO,CAAC,QAAQ,CACnB,CAAA;QACD,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC;gBAClB,GAAG,EAAE,IAAI,CAAC,GAAG;aACT,EAAE,OAAO,CAAC,CAAA;YAClB,IAAI,CAAC,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,KAAK,mCAAI,CAAC,CAAA;YAClC,IAAI,CAAC,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,mCAAI,CAAC,CAAA;YACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SACtB;IACL,CAAC;;AA/BL,sCAgCC;AA/BmB,gBAAE,GAAW,MAAM,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SpritesheetOptions, TextureOptions, AnimationFrames, FrameOptions, TransformOptions } from '../Sprite/Spritesheet';
|
|
2
2
|
import { RpgComponent } from '../Components/Component';
|
|
3
|
+
import { Observable } from 'rxjs';
|
|
3
4
|
declare type Image = {
|
|
4
5
|
image: string;
|
|
5
6
|
};
|
|
@@ -32,10 +33,15 @@ export declare class Animation extends PIXI.Sprite {
|
|
|
32
33
|
private time;
|
|
33
34
|
private frameIndex;
|
|
34
35
|
private animations;
|
|
36
|
+
private _animation$;
|
|
37
|
+
readonly animation$: Observable<PIXI.Sprite | null>;
|
|
35
38
|
onFinish: () => void;
|
|
36
39
|
constructor(id: string);
|
|
37
40
|
private createTextures;
|
|
38
41
|
private createAnimations;
|
|
42
|
+
private getSpriteSize;
|
|
43
|
+
getSpriteHeight(): number;
|
|
44
|
+
getSpriteWidth(): number;
|
|
39
45
|
has(name: string): boolean;
|
|
40
46
|
get(name: string): AnimationDataFrames;
|
|
41
47
|
isPlaying(name?: string): boolean;
|
package/lib/Effects/Animation.js
CHANGED
|
@@ -5,6 +5,8 @@ const common_1 = require("@rpgjs/common");
|
|
|
5
5
|
const Spritesheets_1 = require("../Sprite/Spritesheets");
|
|
6
6
|
const Logger_1 = require("../Logger");
|
|
7
7
|
const RpgSound_1 = require("../Sound/RpgSound");
|
|
8
|
+
const AnimationCharacter_1 = require("./AnimationCharacter");
|
|
9
|
+
const rxjs_1 = require("rxjs");
|
|
8
10
|
const { isFunction, arrayEquals } = common_1.Utils;
|
|
9
11
|
class Animation extends PIXI.Sprite {
|
|
10
12
|
constructor(id) {
|
|
@@ -14,6 +16,8 @@ class Animation extends PIXI.Sprite {
|
|
|
14
16
|
this.time = 0;
|
|
15
17
|
this.frameIndex = 0;
|
|
16
18
|
this.animations = new Map();
|
|
19
|
+
this._animation$ = new rxjs_1.BehaviorSubject(null);
|
|
20
|
+
this.animation$ = this._animation$.asObservable();
|
|
17
21
|
this.spritesheet = Spritesheets_1.spritesheets.get(this.id);
|
|
18
22
|
if (!this.spritesheet) {
|
|
19
23
|
throw (0, Logger_1.log)(`Impossible to find the ${this.id} spritesheet. Did you put the right name or create the spritesheet?`);
|
|
@@ -68,6 +72,16 @@ class Animation extends PIXI.Sprite {
|
|
|
68
72
|
});
|
|
69
73
|
}
|
|
70
74
|
}
|
|
75
|
+
getSpriteSize(name) {
|
|
76
|
+
var _a, _b;
|
|
77
|
+
return ((_b = this.animations.get(((_a = this.currentAnimation) === null || _a === void 0 ? void 0 : _a.name) || AnimationCharacter_1.Animation.Stand)) === null || _b === void 0 ? void 0 : _b.data[name]) || 0;
|
|
78
|
+
}
|
|
79
|
+
getSpriteHeight() {
|
|
80
|
+
return this.getSpriteSize('spriteHeight');
|
|
81
|
+
}
|
|
82
|
+
getSpriteWidth() {
|
|
83
|
+
return this.getSpriteSize('spriteWidth');
|
|
84
|
+
}
|
|
71
85
|
has(name) {
|
|
72
86
|
return this.animations.has(name);
|
|
73
87
|
}
|
|
@@ -156,10 +170,11 @@ class Animation extends PIXI.Sprite {
|
|
|
156
170
|
if (this.applyTransform) {
|
|
157
171
|
frame = Object.assign(Object.assign({}, frame), this.applyTransform(frame, data, this.spritesheet));
|
|
158
172
|
}
|
|
173
|
+
const realSize = getVal('spriteRealSize');
|
|
174
|
+
const heightOfSprite = typeof realSize == 'number' ? realSize : realSize === null || realSize === void 0 ? void 0 : realSize.height;
|
|
175
|
+
const widthOfSprite = typeof realSize == 'number' ? realSize : realSize === null || realSize === void 0 ? void 0 : realSize.width;
|
|
159
176
|
const applyAnchorBySize = () => {
|
|
160
|
-
|
|
161
|
-
if (val && this.hitbox) {
|
|
162
|
-
const heightOfSprite = typeof val == 'number' ? val : val.height;
|
|
177
|
+
if (heightOfSprite && this.hitbox) {
|
|
163
178
|
const { spriteWidth, spriteHeight } = data;
|
|
164
179
|
const w = ((spriteWidth - this.hitbox.w) / 2) / spriteWidth;
|
|
165
180
|
const gap = (spriteHeight - heightOfSprite) / 2;
|
|
@@ -181,6 +196,13 @@ class Animation extends PIXI.Sprite {
|
|
|
181
196
|
applyTransformValue('angle');
|
|
182
197
|
applyTransformValue('rotation');
|
|
183
198
|
applyTransformValue('visible');
|
|
199
|
+
this._animation$.next({
|
|
200
|
+
spriteWidth: widthOfSprite || sprite.width,
|
|
201
|
+
spriteHeight: heightOfSprite || sprite.height,
|
|
202
|
+
anchor: sprite.anchor,
|
|
203
|
+
width: getVal('spriteWidth'),
|
|
204
|
+
height: getVal('spriteHeight')
|
|
205
|
+
});
|
|
184
206
|
}
|
|
185
207
|
if (!nextFrame) {
|
|
186
208
|
this.time = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Animation.js","sourceRoot":"","sources":["../../src/Effects/Animation.ts"],"names":[],"mappings":";;;AAAA,0CAAqC;AACrC,yDAAqD;AAErD,sCAA+B;AAC/B,gDAA4C;
|
|
1
|
+
{"version":3,"file":"Animation.js","sourceRoot":"","sources":["../../src/Effects/Animation.ts"],"names":[],"mappings":"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"}
|
package/lib/GameEngine.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export declare class GameEngineClient extends RpgCommonGame {
|
|
|
10
10
|
renderer: RpgRenderer;
|
|
11
11
|
private _objects;
|
|
12
12
|
private _obsObjects;
|
|
13
|
+
private _obsObjectsDeleteNotifier$;
|
|
13
14
|
private _shapes;
|
|
14
15
|
private _objectsChanged;
|
|
15
16
|
world: {
|
|
@@ -53,6 +54,7 @@ export declare class GameEngineClient extends RpgCommonGame {
|
|
|
53
54
|
getShape(id: string): ObjectFixture | null;
|
|
54
55
|
getObjectAndShape(id: string): ObjectFixture | null;
|
|
55
56
|
resetObjects(): void;
|
|
57
|
+
getDeleteNotifier(id: string): Observable<void>;
|
|
56
58
|
private _remove;
|
|
57
59
|
removeObject(id: string): boolean;
|
|
58
60
|
removeShape(id: string): boolean;
|
package/lib/GameEngine.js
CHANGED
|
@@ -9,6 +9,7 @@ class GameEngineClient extends common_1.RpgCommonGame {
|
|
|
9
9
|
super(common_1.GameSide.Client);
|
|
10
10
|
this._objects = new rxjs_1.BehaviorSubject({});
|
|
11
11
|
this._obsObjects = {};
|
|
12
|
+
this._obsObjectsDeleteNotifier$ = {};
|
|
12
13
|
this._shapes = new rxjs_1.BehaviorSubject({});
|
|
13
14
|
this._objectsChanged = new rxjs_1.BehaviorSubject({});
|
|
14
15
|
this.world = {
|
|
@@ -92,11 +93,17 @@ class GameEngineClient extends common_1.RpgCommonGame {
|
|
|
92
93
|
this._objects.next({});
|
|
93
94
|
this._shapes.next({});
|
|
94
95
|
}
|
|
96
|
+
getDeleteNotifier(id) {
|
|
97
|
+
return this._obsObjectsDeleteNotifier$[id].asObservable();
|
|
98
|
+
}
|
|
95
99
|
_remove(prop, id) {
|
|
96
100
|
const logic = prop == '_objects' ? this.getObject(id) : this.getShape(id);
|
|
97
101
|
if (logic) {
|
|
98
102
|
const objects = Object.assign({}, this[prop].value); // clone
|
|
99
103
|
delete objects[id];
|
|
104
|
+
this._obsObjectsDeleteNotifier$[id].next();
|
|
105
|
+
this._obsObjectsDeleteNotifier$[id].complete();
|
|
106
|
+
this._obsObjects[id].complete();
|
|
100
107
|
delete this._obsObjects[id];
|
|
101
108
|
this[prop].next(objects);
|
|
102
109
|
return true;
|
|
@@ -121,13 +128,31 @@ class GameEngineClient extends common_1.RpgCommonGame {
|
|
|
121
128
|
}
|
|
122
129
|
updateObject(obj) {
|
|
123
130
|
const { playerId: id, params, localEvent, paramsChanged, isShape } = obj;
|
|
124
|
-
|
|
131
|
+
const layoutToArray = (params) => {
|
|
132
|
+
const layout = params.layout;
|
|
133
|
+
if (layout) {
|
|
134
|
+
['center', 'top', 'right', 'bottom', 'left'].forEach((key) => {
|
|
135
|
+
if (!layout[key])
|
|
136
|
+
return;
|
|
137
|
+
GameEngineClient.toArray(layout[key], 'lines');
|
|
138
|
+
if (!layout[key].lines)
|
|
139
|
+
return;
|
|
140
|
+
layout[key].lines.map(layout => {
|
|
141
|
+
GameEngineClient.toArray(layout, 'col');
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
layoutToArray(params);
|
|
125
147
|
GameEngineClient.toArray(params, 'polygon');
|
|
126
148
|
const isMe = () => id == this.playerId;
|
|
127
149
|
let logic;
|
|
128
150
|
let teleported = false;
|
|
129
151
|
let propName = '_objects';
|
|
130
|
-
const createObsForObject = (data) =>
|
|
152
|
+
const createObsForObject = (data) => {
|
|
153
|
+
this._obsObjectsDeleteNotifier$[id] = new rxjs_1.Subject();
|
|
154
|
+
this._obsObjects[id] = new rxjs_1.BehaviorSubject(data);
|
|
155
|
+
};
|
|
131
156
|
if (isShape) {
|
|
132
157
|
propName = '_shapes';
|
|
133
158
|
logic = this.world.getShape(id);
|
|
@@ -169,9 +194,9 @@ class GameEngineClient extends common_1.RpgCommonGame {
|
|
|
169
194
|
logic[key] = params[key];
|
|
170
195
|
}
|
|
171
196
|
if (paramsChanged) {
|
|
172
|
-
|
|
173
|
-
if (paramsChanged.
|
|
174
|
-
logic.componentChanged = paramsChanged.
|
|
197
|
+
layoutToArray(paramsChanged);
|
|
198
|
+
if (paramsChanged.layout)
|
|
199
|
+
logic.componentChanged = paramsChanged.layout;
|
|
175
200
|
if (paramsChanged.teleported) {
|
|
176
201
|
teleported = true;
|
|
177
202
|
logic.position = Object.assign({}, params.position); // clone
|
package/lib/GameEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GameEngine.js","sourceRoot":"","sources":["../src/GameEngine.ts"],"names":[],"mappings":";;;AAAA,0CAAmF;AACnF,+
|
|
1
|
+
{"version":3,"file":"GameEngine.js","sourceRoot":"","sources":["../src/GameEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,8 @@ export default class Character extends PIXI.Sprite {
|
|
|
10
10
|
private objSaved;
|
|
11
11
|
private data;
|
|
12
12
|
constructor(component: RpgComponent, graphic: string);
|
|
13
|
+
getGraphicHeight(): number;
|
|
14
|
+
getGraphicWidth(): number;
|
|
15
|
+
animationSprite(): import("rxjs").Observable<PIXI.Sprite | null>;
|
|
13
16
|
private setAnimationAnchor;
|
|
14
17
|
}
|
package/lib/Sprite/Character.js
CHANGED
|
@@ -59,6 +59,15 @@ class Character extends PIXI.Sprite {
|
|
|
59
59
|
this.addChild(this.animation);
|
|
60
60
|
this.setAnimationAnchor();
|
|
61
61
|
}
|
|
62
|
+
getGraphicHeight() {
|
|
63
|
+
return this.animation.getSpriteHeight();
|
|
64
|
+
}
|
|
65
|
+
getGraphicWidth() {
|
|
66
|
+
return this.animation.getSpriteWidth();
|
|
67
|
+
}
|
|
68
|
+
animationSprite() {
|
|
69
|
+
return this.animation.animation$;
|
|
70
|
+
}
|
|
62
71
|
setAnimationAnchor() {
|
|
63
72
|
this.animation.hitbox = { h: this.data.hHitbox, w: this.data.wHitbox };
|
|
64
73
|
this.animation.applyTransform = (frame, animation, spritesheet) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Character.js","sourceRoot":"","sources":["../../src/Sprite/Character.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Character.js","sourceRoot":"","sources":["../../src/Sprite/Character.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rpgjs/client",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -18,11 +18,12 @@
|
|
|
18
18
|
"author": "Samuel Ronce",
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@rpgjs/common": "^3.
|
|
22
|
-
"@rpgjs/tiled": "^3.
|
|
23
|
-
"@rpgjs/types": "^3.
|
|
21
|
+
"@rpgjs/common": "^3.3.0",
|
|
22
|
+
"@rpgjs/tiled": "^3.3.0",
|
|
23
|
+
"@rpgjs/types": "^3.3.0",
|
|
24
24
|
"@types/howler": "2.2.1",
|
|
25
25
|
"howler": "2.2.1",
|
|
26
|
+
"lodash.get": "^4.4.2",
|
|
26
27
|
"lodash.merge": "4.6.2",
|
|
27
28
|
"pixi-tilemap": "2.1.3",
|
|
28
29
|
"pixi-viewport": "4.15.0",
|
|
@@ -31,7 +32,7 @@
|
|
|
31
32
|
"simple-room-client": "^1.0.0",
|
|
32
33
|
"vue": "^3.2.39"
|
|
33
34
|
},
|
|
34
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "076ac72a11bd90c004a3fe0659e9e2fa886db401",
|
|
35
36
|
"devDependencies": {
|
|
36
37
|
"typescript": "^4.7.4"
|
|
37
38
|
}
|