Compare commits

...

1 Commits

Author SHA1 Message Date
Clément Pasteau
bfdc737963 Fix some renderedInstances not flipping correctly 2024-09-17 14:59:03 +02:00
3 changed files with 20 additions and 8 deletions

View File

@@ -308,8 +308,12 @@ export default class LegacyRenderedCustomObjectInstance
const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5); const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5);
this._pixiObject.alpha = alphaForDisplay; this._pixiObject.alpha = alphaForDisplay;
if (this._instance.isFlippedX()) this._pixiObject.scale.x *= -1; this._pixiObject.scale.x =
if (this._instance.isFlippedY()) this._pixiObject.scale.y *= -1; Math.abs(this._pixiObject.scale.x) *
(this._instance.isFlippedX() ? -1 : 1);
this._pixiObject.scale.y =
Math.abs(this._pixiObject.scale.y) *
(this._instance.isFlippedY() ? -1 : 1);
} }
} }

View File

@@ -399,8 +399,12 @@ export default class RenderedCustomObjectInstance extends Rendered3DInstance
const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5); const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5);
this._pixiObject.alpha = alphaForDisplay; this._pixiObject.alpha = alphaForDisplay;
if (this._instance.isFlippedX()) this._pixiObject.scale.x *= -1; this._pixiObject.scale.x =
if (this._instance.isFlippedY()) this._pixiObject.scale.y *= -1; Math.abs(this._pixiObject.scale.x) *
(this._instance.isFlippedX() ? -1 : 1);
this._pixiObject.scale.y =
Math.abs(this._pixiObject.scale.y) *
(this._instance.isFlippedY() ? -1 : 1);
} }
} }

View File

@@ -123,8 +123,12 @@ export default class RenderedSpriteInstance extends RenderedInstance {
const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5); const alphaForDisplay = Math.max(this._instance.getOpacity() / 255, 0.5);
this._pixiObject.alpha = alphaForDisplay; this._pixiObject.alpha = alphaForDisplay;
if (this._instance.isFlippedX()) this._pixiObject.scale.x *= -1; this._pixiObject.scale.x =
if (this._instance.isFlippedY()) this._pixiObject.scale.y *= -1; Math.abs(this._pixiObject.scale.x) *
(this._instance.isFlippedX() ? -1 : 1);
this._pixiObject.scale.y =
Math.abs(this._pixiObject.scale.y) *
(this._instance.isFlippedY() ? -1 : 1);
} }
updateSprite(): boolean { updateSprite(): boolean {
@@ -215,13 +219,13 @@ export default class RenderedSpriteInstance extends RenderedInstance {
getOriginX(): number { getOriginX(): number {
if (!this._sprite || !this._pixiObject) return 0; if (!this._sprite || !this._pixiObject) return 0;
return this._sprite.getOrigin().getX() * this._pixiObject.scale.x; return this._sprite.getOrigin().getX() * Math.abs(this._pixiObject.scale.x);
} }
getOriginY(): number { getOriginY(): number {
if (!this._sprite || !this._pixiObject) return 0; if (!this._sprite || !this._pixiObject) return 0;
return this._sprite.getOrigin().getY() * this._pixiObject.scale.y; return this._sprite.getOrigin().getY() * Math.abs(this._pixiObject.scale.y);
} }
getDefaultWidth(): number { getDefaultWidth(): number {