excalibur 0.26.0-alpha.352 → 0.26.0-alpha.353
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/CHANGELOG.md +1 -0
- package/build/dist/Graphics/Animation.d.ts +2 -1
- package/build/dist/Graphics/Animation.js +14 -11
- package/build/dist/Graphics/Animation.js.map +1 -1
- package/build/dist/Graphics/GraphicsComponent.js +2 -2
- package/build/dist/Graphics/GraphicsComponent.js.map +1 -1
- package/build/dist/Graphics/Raster.js +4 -2
- package/build/dist/Graphics/Raster.js.map +1 -1
- package/build/dist/Graphics/Sprite.js +6 -4
- package/build/dist/Graphics/Sprite.js.map +1 -1
- package/build/dist/Graphics/Text.js +3 -4
- package/build/dist/Graphics/Text.js.map +1 -1
- package/build/dist/excalibur.js +31 -25
- package/build/dist/excalibur.js.map +1 -1
- package/build/dist/excalibur.min.js +2 -2
- package/build/dist/index.js +2 -2
- package/build/esm/Graphics/Animation.d.ts +2 -1
- package/build/esm/excalibur.js +31 -25
- package/build/esm/excalibur.js.map +1 -1
- package/build/esm/excalibur.min.js +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -51,6 +51,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
|
51
51
|
|
|
52
52
|
### Fixed
|
|
53
53
|
|
|
54
|
+
- Fixed issue where scaled graphics were not calculating the correct bounds
|
|
54
55
|
- Fixed unreleased issue where clock implementation was not updating frame id
|
|
55
56
|
- Fixed alpha pre-multiply math in multiple shaders
|
|
56
57
|
- Fixed label initialization of fonts, passing a font in the constructor work
|
|
@@ -103,6 +103,8 @@ export declare class Animation extends Graphic implements HasTick {
|
|
|
103
103
|
private _playing;
|
|
104
104
|
constructor(options: GraphicOptions & AnimationOptions);
|
|
105
105
|
clone(): Animation;
|
|
106
|
+
get width(): number;
|
|
107
|
+
get height(): number;
|
|
106
108
|
/**
|
|
107
109
|
* Create an Animation from a [[SpriteSheet]], a list of indices into the sprite sheet, a duration per frame
|
|
108
110
|
* and optional [[AnimationStrategy]]
|
|
@@ -184,6 +186,5 @@ export declare class Animation extends Graphic implements HasTick {
|
|
|
184
186
|
* @param idempotencyToken Prevents double ticking in a frame by passing a unique token to the frame
|
|
185
187
|
*/
|
|
186
188
|
tick(elapsedMilliseconds: number, idempotencyToken?: number): void;
|
|
187
|
-
private _updateDimensions;
|
|
188
189
|
protected _drawImage(ctx: ExcaliburGraphicsContext, x: number, y: number): void;
|
|
189
190
|
}
|
|
@@ -73,6 +73,20 @@ export class Animation extends Graphic {
|
|
|
73
73
|
...this.cloneGraphicOptions()
|
|
74
74
|
});
|
|
75
75
|
}
|
|
76
|
+
get width() {
|
|
77
|
+
const maybeFrame = this.currentFrame;
|
|
78
|
+
if (maybeFrame) {
|
|
79
|
+
return Math.abs(maybeFrame.graphic.width * this.scale.x);
|
|
80
|
+
}
|
|
81
|
+
return 0;
|
|
82
|
+
}
|
|
83
|
+
get height() {
|
|
84
|
+
const maybeFrame = this.currentFrame;
|
|
85
|
+
if (maybeFrame) {
|
|
86
|
+
return Math.abs(maybeFrame.graphic.height * this.scale.y);
|
|
87
|
+
}
|
|
88
|
+
return 0;
|
|
89
|
+
}
|
|
76
90
|
/**
|
|
77
91
|
* Create an Animation from a [[SpriteSheet]], a list of indices into the sprite sheet, a duration per frame
|
|
78
92
|
* and optional [[AnimationStrategy]]
|
|
@@ -209,14 +223,11 @@ export class Animation extends Graphic {
|
|
|
209
223
|
* @param frameNumber
|
|
210
224
|
*/
|
|
211
225
|
goToFrame(frameNumber) {
|
|
212
|
-
var _a, _b;
|
|
213
226
|
this._currentFrame = frameNumber;
|
|
214
227
|
this._timeLeftInFrame = this.frameDuration;
|
|
215
228
|
const maybeFrame = this.frames[this._currentFrame];
|
|
216
229
|
if (maybeFrame && !this._done) {
|
|
217
230
|
this._timeLeftInFrame = (maybeFrame === null || maybeFrame === void 0 ? void 0 : maybeFrame.duration) || this.frameDuration;
|
|
218
|
-
this.width = (_a = maybeFrame.graphic) === null || _a === void 0 ? void 0 : _a.width;
|
|
219
|
-
this.height = (_b = maybeFrame.graphic) === null || _b === void 0 ? void 0 : _b.height;
|
|
220
231
|
this.events.emit('frame', maybeFrame);
|
|
221
232
|
}
|
|
222
233
|
}
|
|
@@ -288,14 +299,6 @@ export class Animation extends Graphic {
|
|
|
288
299
|
if (this._timeLeftInFrame <= 0) {
|
|
289
300
|
this.goToFrame(this._nextFrame());
|
|
290
301
|
}
|
|
291
|
-
this._updateDimensions();
|
|
292
|
-
}
|
|
293
|
-
_updateDimensions() {
|
|
294
|
-
var _a, _b;
|
|
295
|
-
if (this.currentFrame) {
|
|
296
|
-
this.width = (_a = this.currentFrame.graphic) === null || _a === void 0 ? void 0 : _a.width;
|
|
297
|
-
this.height = (_b = this.currentFrame.graphic) === null || _b === void 0 ? void 0 : _b.height;
|
|
298
|
-
}
|
|
299
302
|
}
|
|
300
303
|
_drawImage(ctx, x, y) {
|
|
301
304
|
if (this.currentFrame) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Animation.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Animation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAU,aAAa,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAW3B,MAAM,CAAN,IAAY,kBASX;AATD,WAAY,kBAAkB;IAC5B;;OAEG;IACH,yCAAmB,CAAA;IACnB;;OAEG;IACH,2CAAqB,CAAA;AACvB,CAAC,EATW,kBAAkB,KAAlB,kBAAkB,QAS7B;AAED,MAAM,CAAN,IAAY,iBAiBX;AAjBD,WAAY,iBAAiB;IAC3B;;OAEG;IACH,gCAAW,CAAA;IACX;;OAEG;IACH,kCAAa,CAAA;IACb;;OAEG;IACH,0CAAqB,CAAA;IACrB;;OAEG;IACH,sCAAiB,CAAA;AACnB,CAAC,EAjBW,iBAAiB,KAAjB,iBAAiB,QAiB5B;AAiDD;;;;GAIG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO;IAiBpC,YAAY,OAA0C;;QACpD,KAAK,CAAC,OAAO,CAAC,CAAC;QAhBV,WAAM,GAAG,IAAI,eAAe,EAAO,CAAC,CAAC,gCAAgC;QACrE,WAAM,GAAY,EAAE,CAAC;QACrB,aAAQ,GAAsB,iBAAiB,CAAC,IAAI,CAAC;QACrD,kBAAa,GAAW,GAAG,CAAC;QAC5B,cAAS,GAAW,CAAC,CAAC;QAErB,sBAAiB,GAAG,CAAC,CAAC,CAAC;QAEvB,eAAU,GAAG,IAAI,CAAC;QAClB,kBAAa,GAAG,CAAC,CAAC;QAClB,qBAAgB,GAAG,CAAC,CAAC;QACrB,eAAU,GAAG,CAAC,CAAC,CAAC,8BAA8B;QAC9C,UAAK,GAAG,KAAK,CAAC;QACd,aAAQ,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Animation.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Animation.ts"],"names":[],"mappings":"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"}
|
|
@@ -265,8 +265,8 @@ export class GraphicsComponent extends Component {
|
|
|
265
265
|
offset = options.offset;
|
|
266
266
|
}
|
|
267
267
|
const bounds = graphic.localBounds;
|
|
268
|
-
const offsetX = -bounds.width *
|
|
269
|
-
const offsetY = -bounds.height *
|
|
268
|
+
const offsetX = -bounds.width * anchor.x + offset.x;
|
|
269
|
+
const offsetY = -bounds.height * anchor.y + offset.y;
|
|
270
270
|
bb = graphic === null || graphic === void 0 ? void 0 : graphic.localBounds.translate(vec(offsetX + layer.offset.x, offsetY + layer.offset.y)).combine(bb);
|
|
271
271
|
}
|
|
272
272
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphicsComponent.js","sourceRoot":"","sources":["../../../src/engine/Graphics/GraphicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,OAAO,CAAC,CAAE,OAA8B,CAAC,IAAI,CAAC;AAChD,CAAC;AA6DD,MAAM,OAAO,aAAa;IAExB,YAAoB,QAA8B,EAAU,SAA4B;QAApE,aAAQ,GAAR,QAAQ,CAAsB;QAAU,cAAS,GAAT,SAAS,CAAmB;QADjF,aAAQ,GAAyD,EAAE,CAAC;IACgB,CAAC;IAC5F,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAUM,IAAI,CAAC,aAAgC;QAC1C,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;SAC1B;aAAM;YACL,IAAI,GAAG,GAAY,IAAI,CAAC;YACxB,IAAI,aAAa,YAAY,OAAO,EAAE;gBACpC,GAAG,GAAG,aAAa,CAAC;aACrB;iBAAM;gBACL,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;aAChD;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC;SAChE;IACH,CAAC;IAED;;;;;;OAMG;IACI,IAAI,CAA8B,aAAyB,EAAE,OAA6B;QAC/F,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QACzB,IAAI,GAAY,CAAC;QACjB,IAAI,aAAa,YAAY,OAAO,EAAE;YACpC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;SAC3E;aAAM;YACL,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,CACxB,4CAA4C,aAAa,wCAAwC,EACjG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC1B,CAAC;aACH;SACF;QACD,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9C,OAAO,GAAQ,CAAC;SACjB;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED;;;;OAIG;IACI,GAAG,CAA8B,aAAyB,EAAE,OAA6B;QAC9F,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,IAAI,CAAI,aAAa,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,IAAW,KAAK,CAAC,KAAa;QAC5B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAW,MAAM;;QACf,OAAO,MAAA,IAAI,CAAC,QAAQ,CAAC,MAAM,mCAAI,MAAM,CAAC,IAAI,CAAC;IAC7C,CAAC;IAED,IAAW,MAAM,CAAC,KAAa;QAC7B,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,IAAW,WAAW;;QACpB,OAAO,MAAA,IAAI,CAAC,IAAI,mCAAI,WAAW,CAAC;IAClC,CAAC;CACF;AAED,MAAM,OAAO,cAAc;IAIzB,YAAoB,UAA6B;QAA7B,eAAU,GAAV,UAAU,CAAmB;QAHzC,YAAO,GAAoB,EAAE,CAAC;QAC9B,cAAS,GAA2C,EAAE,CAAC;QAG7D,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAC5E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IACM,MAAM,CAAC,OAA6B;QACzC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAWM,GAAG,CAAC,IAAa;QACtB,IAAI,IAAI,EAAE;YACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,WAAW;QAChB,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;YAChC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAC3C;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEM,GAAG,CAAC,IAAY;QACrB,OAAO,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC;IAChC,CAAC;IAEO,cAAc,CAAC,KAAoB;QACzC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC9B,mBAAmB;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,SAAS,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,SAAwB;IAqD7D,YAAY,OAAkC;QAC5C,KAAK,EAAE,CAAC;QArDD,SAAI,GAAG,aAAa,CAAC;QAEtB,cAAS,GAAuC,EAAE,CAAC;QAyB3D;;WAEG;QACI,YAAO,GAAY,IAAI,CAAC;QAE/B;;WAEG;QACI,YAAO,GAAW,CAAC,CAAC;QAE3B;;WAEG;QACI,WAAM,GAAW,MAAM,CAAC,IAAI,CAAC;QAEpC;;WAEG;QACI,WAAM,GAAW,MAAM,CAAC,IAAI,CAAC;QAEpC;;WAEG;QACI,iBAAY,GAAY,KAAK,CAAC;QA6F7B,YAAO,GAAgB,IAAI,CAAC;QAzFlC,WAAW;QACX,OAAO,GAAG;YACR,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,OAAO;SACX,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE7G,IAAI,CAAC,SAAS,GAAG,QAAQ,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAI,CAAC,YAAY,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC,SAAS,CAAC;QAC7C,IAAI,CAAC,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,UAAU,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QAEzB,IAAI,CAAC,MAAM,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;SACpC;IACH,CAAC;IArEM,UAAU,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IA8DD;;OAEG;IACH,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IASM,GAAG,CAAC,aAA+B,EAAE,OAAiB;QAC3D,IAAI,IAAI,GAAG,SAAS,CAAC;QACrB,IAAI,YAAY,GAAY,IAAI,CAAC;QACjC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,IAAI,GAAG,aAAa,CAAC;YACrB,YAAY,GAAG,OAAO,CAAC;SACxB;aAAM;YACL,YAAY,GAAG,aAAa,CAAC;SAC9B;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QAC/E,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACtB;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;OAEG;IACI,IAAI,CAA8B,aAAyB,EAAE,OAA6B;QAC/F,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAI,aAAa,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACI,GAAG,CAA8B,aAAyB,EAAE,OAA6B;QAC9F,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAI,aAAa,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAUM,IAAI,CAAC,aAAgC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAGD,IAAW,WAAW,CAAC,MAAmB;QACxC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAW,WAAW;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;QACD,IAAI,EAAE,GAAG,IAAI,WAAW,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE;YACrC,KAAK,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE;gBACjD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;oBACnB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBACzB;gBACD,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;oBACnB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBACzB;gBACD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;gBACnC,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"GraphicsComponent.js","sourceRoot":"","sources":["../../../src/engine/Graphics/GraphicsComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,9 +77,10 @@ export class Raster extends Graphic {
|
|
|
77
77
|
* Any `padding`s set will be factored into the width
|
|
78
78
|
*/
|
|
79
79
|
get width() {
|
|
80
|
-
return this._getTotalWidth();
|
|
80
|
+
return Math.abs(this._getTotalWidth() * this.scale.x);
|
|
81
81
|
}
|
|
82
82
|
set width(value) {
|
|
83
|
+
value /= Math.abs(this.scale.x);
|
|
83
84
|
this._bitmap.width = value;
|
|
84
85
|
this._originalWidth = value;
|
|
85
86
|
this.flagDirty();
|
|
@@ -91,9 +92,10 @@ export class Raster extends Graphic {
|
|
|
91
92
|
* Any `padding` set will be factored into the height
|
|
92
93
|
*/
|
|
93
94
|
get height() {
|
|
94
|
-
return this._getTotalHeight();
|
|
95
|
+
return Math.abs(this._getTotalHeight() * this.scale.y);
|
|
95
96
|
}
|
|
96
97
|
set height(value) {
|
|
98
|
+
value /= Math.abs(this.scale.y);
|
|
97
99
|
this._bitmap.height = value;
|
|
98
100
|
this._originalHeight = value;
|
|
99
101
|
this.flagDirty();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Raster.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AA4CzD;;;;;GAKG;AACH,MAAM,OAAgB,MAAO,SAAQ,OAAO;IAM1C,YAAY,OAAwC;;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QANV,cAAS,GAAmB,IAAI,CAAC;QAGhC,WAAM,GAAY,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Raster.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Raster.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,16 +21,18 @@ export class Sprite extends Graphic {
|
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
get width() {
|
|
24
|
-
return this.destSize.width * this.scale.x;
|
|
24
|
+
return Math.abs(this.destSize.width * this.scale.x);
|
|
25
25
|
}
|
|
26
26
|
get height() {
|
|
27
|
-
return this.destSize.height * this.scale.y;
|
|
27
|
+
return Math.abs(this.destSize.height * this.scale.y);
|
|
28
28
|
}
|
|
29
29
|
set width(newWidth) {
|
|
30
|
+
newWidth /= Math.abs(this.scale.x);
|
|
30
31
|
this.destSize.width = newWidth;
|
|
31
32
|
super.width = Math.ceil(this.destSize.width);
|
|
32
33
|
}
|
|
33
34
|
set height(newHeight) {
|
|
35
|
+
newHeight /= Math.abs(this.scale.y);
|
|
34
36
|
this.destSize.height = newHeight;
|
|
35
37
|
super.height = Math.ceil(this.destSize.height);
|
|
36
38
|
}
|
|
@@ -44,8 +46,8 @@ export class Sprite extends Graphic {
|
|
|
44
46
|
// If the destination is not specified, use the source if specified, then native
|
|
45
47
|
this.destSize.width = ((_c = this.destSize) === null || _c === void 0 ? void 0 : _c.width) || ((_d = this.sourceView) === null || _d === void 0 ? void 0 : _d.width) || nativeWidth;
|
|
46
48
|
this.destSize.height = ((_e = this.destSize) === null || _e === void 0 ? void 0 : _e.height) || ((_f = this.sourceView) === null || _f === void 0 ? void 0 : _f.height) || nativeHeight;
|
|
47
|
-
this.width = Math.ceil(this.destSize.width);
|
|
48
|
-
this.height = Math.ceil(this.destSize.height);
|
|
49
|
+
this.width = Math.ceil(this.destSize.width) * this.scale.x;
|
|
50
|
+
this.height = Math.ceil(this.destSize.height) * this.scale.y;
|
|
49
51
|
}
|
|
50
52
|
_preDraw(ex, x, y) {
|
|
51
53
|
if (this.image.isLoaded()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sprite.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Sprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAoB7C,MAAM,OAAO,MAAO,SAAQ,OAAO;IAWjC,YAAY,OAAuC;;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC,EAAE,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,CAAC,EAAE,CAAC;QAC/F,IAAI,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC,EAAE,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,CAAC,EAAE,CAAC;QAC/E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACzB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAhBM,MAAM,CAAC,IAAI,CAAC,KAAkB;QACnC,OAAO,IAAI,MAAM,CAAC;YAChB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IAcD,IAAoB,KAAK;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Sprite.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Sprite.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,13 +45,13 @@ export class Text extends Graphic {
|
|
|
45
45
|
if (this._textWidth === 0) {
|
|
46
46
|
this._calculateDimension();
|
|
47
47
|
}
|
|
48
|
-
return this._textWidth;
|
|
48
|
+
return this._textWidth * this.scale.x;
|
|
49
49
|
}
|
|
50
50
|
get height() {
|
|
51
51
|
if (this._textHeight === 0) {
|
|
52
52
|
this._calculateDimension();
|
|
53
53
|
}
|
|
54
|
-
return this._textHeight;
|
|
54
|
+
return this._textHeight * this.scale.y;
|
|
55
55
|
}
|
|
56
56
|
_calculateDimension() {
|
|
57
57
|
const { width, height } = this.font.measureText(this._text);
|
|
@@ -59,7 +59,7 @@ export class Text extends Graphic {
|
|
|
59
59
|
this._textHeight = height;
|
|
60
60
|
}
|
|
61
61
|
get localBounds() {
|
|
62
|
-
return this.font.measureText(this._text);
|
|
62
|
+
return this.font.measureText(this._text).scale(this.scale);
|
|
63
63
|
}
|
|
64
64
|
_rotate(_ex) {
|
|
65
65
|
// None this is delegated to font
|
|
@@ -77,7 +77,6 @@ export class Text extends Graphic {
|
|
|
77
77
|
}
|
|
78
78
|
this.font.flipHorizontal = this.flipHorizontal;
|
|
79
79
|
this.font.flipVertical = this.flipVertical;
|
|
80
|
-
this.font.scale = this.scale;
|
|
81
80
|
this.font.rotation = this.rotation;
|
|
82
81
|
this.font.origin = this.origin;
|
|
83
82
|
this.font.opacity = this.opacity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Text.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAkB,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAmB9B;;;;GAIG;AACH,MAAM,OAAO,IAAK,SAAQ,OAAO;IAE/B,YAAY,OAAqC;;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QAeT,UAAK,GAAW,EAAE,CAAC;QAoBnB,eAAU,GAAW,CAAC,CAAC;QASvB,gBAAW,GAAW,CAAC,CAAC;QA3C9B,iDAAiD;QACjD,IAAI,CAAC,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,CAAC,KAAK,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAEM,KAAK;;QACV,OAAO,IAAI,IAAI,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACvB,KAAK,EAAE,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,EAAE,mCAAI,KAAK,CAAC,KAAK;YACzC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;SACxB,CAAC,CAAC;IACL,CAAC;IAGD,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAW,IAAI,CAAC,KAAa;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,CAAC;IAGD,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,IAAW,IAAI,CAAC,IAAuB;QACrC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAID,IAAW,KAAK;QACd,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE;YACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../src/engine/Graphics/Text.ts"],"names":[],"mappings":"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"}
|
package/build/dist/excalibur.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* excalibur - 0.26.0-alpha.
|
|
2
|
+
* excalibur - 0.26.0-alpha.353+28cb331 - 2021-12-29
|
|
3
3
|
* https://github.com/excaliburjs/Excalibur
|
|
4
4
|
* Copyright (c) 2021 Excalibur.js <https://github.com/excaliburjs/Excalibur/graphs/contributors>
|
|
5
5
|
* Licensed BSD-2-Clause
|
|
@@ -6569,9 +6569,10 @@ class Raster extends Graphic {
|
|
|
6569
6569
|
* Any `padding`s set will be factored into the width
|
|
6570
6570
|
*/
|
|
6571
6571
|
get width() {
|
|
6572
|
-
return this._getTotalWidth();
|
|
6572
|
+
return Math.abs(this._getTotalWidth() * this.scale.x);
|
|
6573
6573
|
}
|
|
6574
6574
|
set width(value) {
|
|
6575
|
+
value /= Math.abs(this.scale.x);
|
|
6575
6576
|
this._bitmap.width = value;
|
|
6576
6577
|
this._originalWidth = value;
|
|
6577
6578
|
this.flagDirty();
|
|
@@ -6583,9 +6584,10 @@ class Raster extends Graphic {
|
|
|
6583
6584
|
* Any `padding` set will be factored into the height
|
|
6584
6585
|
*/
|
|
6585
6586
|
get height() {
|
|
6586
|
-
return this._getTotalHeight();
|
|
6587
|
+
return Math.abs(this._getTotalHeight() * this.scale.y);
|
|
6587
6588
|
}
|
|
6588
6589
|
set height(value) {
|
|
6590
|
+
value /= Math.abs(this.scale.y);
|
|
6589
6591
|
this._bitmap.height = value;
|
|
6590
6592
|
this._originalHeight = value;
|
|
6591
6593
|
this.flagDirty();
|
|
@@ -8152,16 +8154,18 @@ class Sprite extends Graphic {
|
|
|
8152
8154
|
});
|
|
8153
8155
|
}
|
|
8154
8156
|
get width() {
|
|
8155
|
-
return this.destSize.width * this.scale.x;
|
|
8157
|
+
return Math.abs(this.destSize.width * this.scale.x);
|
|
8156
8158
|
}
|
|
8157
8159
|
get height() {
|
|
8158
|
-
return this.destSize.height * this.scale.y;
|
|
8160
|
+
return Math.abs(this.destSize.height * this.scale.y);
|
|
8159
8161
|
}
|
|
8160
8162
|
set width(newWidth) {
|
|
8163
|
+
newWidth /= Math.abs(this.scale.x);
|
|
8161
8164
|
this.destSize.width = newWidth;
|
|
8162
8165
|
super.width = Math.ceil(this.destSize.width);
|
|
8163
8166
|
}
|
|
8164
8167
|
set height(newHeight) {
|
|
8168
|
+
newHeight /= Math.abs(this.scale.y);
|
|
8165
8169
|
this.destSize.height = newHeight;
|
|
8166
8170
|
super.height = Math.ceil(this.destSize.height);
|
|
8167
8171
|
}
|
|
@@ -8175,8 +8179,8 @@ class Sprite extends Graphic {
|
|
|
8175
8179
|
// If the destination is not specified, use the source if specified, then native
|
|
8176
8180
|
this.destSize.width = ((_c = this.destSize) === null || _c === void 0 ? void 0 : _c.width) || ((_d = this.sourceView) === null || _d === void 0 ? void 0 : _d.width) || nativeWidth;
|
|
8177
8181
|
this.destSize.height = ((_e = this.destSize) === null || _e === void 0 ? void 0 : _e.height) || ((_f = this.sourceView) === null || _f === void 0 ? void 0 : _f.height) || nativeHeight;
|
|
8178
|
-
this.width = Math.ceil(this.destSize.width);
|
|
8179
|
-
this.height = Math.ceil(this.destSize.height);
|
|
8182
|
+
this.width = Math.ceil(this.destSize.width) * this.scale.x;
|
|
8183
|
+
this.height = Math.ceil(this.destSize.height) * this.scale.y;
|
|
8180
8184
|
}
|
|
8181
8185
|
_preDraw(ex, x, y) {
|
|
8182
8186
|
if (this.image.isLoaded()) {
|
|
@@ -16326,8 +16330,8 @@ class GraphicsComponent extends Component {
|
|
|
16326
16330
|
offset = options.offset;
|
|
16327
16331
|
}
|
|
16328
16332
|
const bounds = graphic.localBounds;
|
|
16329
|
-
const offsetX = -bounds.width *
|
|
16330
|
-
const offsetY = -bounds.height *
|
|
16333
|
+
const offsetX = -bounds.width * anchor.x + offset.x;
|
|
16334
|
+
const offsetY = -bounds.height * anchor.y + offset.y;
|
|
16331
16335
|
bb = graphic === null || graphic === void 0 ? void 0 : graphic.localBounds.translate(vec(offsetX + layer.offset.x, offsetY + layer.offset.y)).combine(bb);
|
|
16332
16336
|
}
|
|
16333
16337
|
}
|
|
@@ -18331,13 +18335,13 @@ class Text extends Graphic {
|
|
|
18331
18335
|
if (this._textWidth === 0) {
|
|
18332
18336
|
this._calculateDimension();
|
|
18333
18337
|
}
|
|
18334
|
-
return this._textWidth;
|
|
18338
|
+
return this._textWidth * this.scale.x;
|
|
18335
18339
|
}
|
|
18336
18340
|
get height() {
|
|
18337
18341
|
if (this._textHeight === 0) {
|
|
18338
18342
|
this._calculateDimension();
|
|
18339
18343
|
}
|
|
18340
|
-
return this._textHeight;
|
|
18344
|
+
return this._textHeight * this.scale.y;
|
|
18341
18345
|
}
|
|
18342
18346
|
_calculateDimension() {
|
|
18343
18347
|
const { width, height } = this.font.measureText(this._text);
|
|
@@ -18345,7 +18349,7 @@ class Text extends Graphic {
|
|
|
18345
18349
|
this._textHeight = height;
|
|
18346
18350
|
}
|
|
18347
18351
|
get localBounds() {
|
|
18348
|
-
return this.font.measureText(this._text);
|
|
18352
|
+
return this.font.measureText(this._text).scale(this.scale);
|
|
18349
18353
|
}
|
|
18350
18354
|
_rotate(_ex) {
|
|
18351
18355
|
// None this is delegated to font
|
|
@@ -18363,7 +18367,6 @@ class Text extends Graphic {
|
|
|
18363
18367
|
}
|
|
18364
18368
|
this.font.flipHorizontal = this.flipHorizontal;
|
|
18365
18369
|
this.font.flipVertical = this.flipVertical;
|
|
18366
|
-
this.font.scale = this.scale;
|
|
18367
18370
|
this.font.rotation = this.rotation;
|
|
18368
18371
|
this.font.origin = this.origin;
|
|
18369
18372
|
this.font.opacity = this.opacity;
|
|
@@ -22009,6 +22012,20 @@ class Animation extends Graphic {
|
|
|
22009
22012
|
...this.cloneGraphicOptions()
|
|
22010
22013
|
});
|
|
22011
22014
|
}
|
|
22015
|
+
get width() {
|
|
22016
|
+
const maybeFrame = this.currentFrame;
|
|
22017
|
+
if (maybeFrame) {
|
|
22018
|
+
return Math.abs(maybeFrame.graphic.width * this.scale.x);
|
|
22019
|
+
}
|
|
22020
|
+
return 0;
|
|
22021
|
+
}
|
|
22022
|
+
get height() {
|
|
22023
|
+
const maybeFrame = this.currentFrame;
|
|
22024
|
+
if (maybeFrame) {
|
|
22025
|
+
return Math.abs(maybeFrame.graphic.height * this.scale.y);
|
|
22026
|
+
}
|
|
22027
|
+
return 0;
|
|
22028
|
+
}
|
|
22012
22029
|
/**
|
|
22013
22030
|
* Create an Animation from a [[SpriteSheet]], a list of indices into the sprite sheet, a duration per frame
|
|
22014
22031
|
* and optional [[AnimationStrategy]]
|
|
@@ -22145,14 +22162,11 @@ class Animation extends Graphic {
|
|
|
22145
22162
|
* @param frameNumber
|
|
22146
22163
|
*/
|
|
22147
22164
|
goToFrame(frameNumber) {
|
|
22148
|
-
var _a, _b;
|
|
22149
22165
|
this._currentFrame = frameNumber;
|
|
22150
22166
|
this._timeLeftInFrame = this.frameDuration;
|
|
22151
22167
|
const maybeFrame = this.frames[this._currentFrame];
|
|
22152
22168
|
if (maybeFrame && !this._done) {
|
|
22153
22169
|
this._timeLeftInFrame = (maybeFrame === null || maybeFrame === void 0 ? void 0 : maybeFrame.duration) || this.frameDuration;
|
|
22154
|
-
this.width = (_a = maybeFrame.graphic) === null || _a === void 0 ? void 0 : _a.width;
|
|
22155
|
-
this.height = (_b = maybeFrame.graphic) === null || _b === void 0 ? void 0 : _b.height;
|
|
22156
22170
|
this.events.emit('frame', maybeFrame);
|
|
22157
22171
|
}
|
|
22158
22172
|
}
|
|
@@ -22224,14 +22238,6 @@ class Animation extends Graphic {
|
|
|
22224
22238
|
if (this._timeLeftInFrame <= 0) {
|
|
22225
22239
|
this.goToFrame(this._nextFrame());
|
|
22226
22240
|
}
|
|
22227
|
-
this._updateDimensions();
|
|
22228
|
-
}
|
|
22229
|
-
_updateDimensions() {
|
|
22230
|
-
var _a, _b;
|
|
22231
|
-
if (this.currentFrame) {
|
|
22232
|
-
this.width = (_a = this.currentFrame.graphic) === null || _a === void 0 ? void 0 : _a.width;
|
|
22233
|
-
this.height = (_b = this.currentFrame.graphic) === null || _b === void 0 ? void 0 : _b.height;
|
|
22234
|
-
}
|
|
22235
22241
|
}
|
|
22236
22242
|
_drawImage(ctx, x, y) {
|
|
22237
22243
|
if (this.currentFrame) {
|
|
@@ -29343,7 +29349,7 @@ Promises_Promise = Promise_1 = Promises_decorate([
|
|
|
29343
29349
|
* The current Excalibur version string
|
|
29344
29350
|
* @description `process.env.__EX_VERSION` gets replaced by Webpack on build
|
|
29345
29351
|
*/
|
|
29346
|
-
const EX_VERSION = "0.26.0-alpha.
|
|
29352
|
+
const EX_VERSION = "0.26.0-alpha.353+28cb331";
|
|
29347
29353
|
|
|
29348
29354
|
polyfill();
|
|
29349
29355
|
// This file is used as the bundle entry point and exports everything
|