Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom object flipping (#6967)

Browse Source 
Do not show in changelog
This commit is contained in:
D8H
2024-09-17 15:15:25 +02:00
committed by GitHub
parent 96d912a6f2
commit 1a3a27b73b
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
newIDE/app/src/ObjectsRendering/Renderers/LegacyRenderedCustomObjectInstance.js
View File

@@ -301,6 +301,9 @@ export default class LegacyRenderedCustomObjectInstance
this._instance.getAngle() this._instance.getAngle()
); );
this._pixiObject.scale.x = 1;
this._pixiObject.scale.y = 1;
// Opacity is not handled by 3D objects. // Opacity is not handled by 3D objects.
// TODO Transform 3D objects according to their flipping. // TODO Transform 3D objects according to their flipping.
if (!this._isRenderedIn3D) { if (!this._isRenderedIn3D) {
@@ -308,8 +311,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);
} }
} }

9
newIDE/app/src/ObjectsRendering/Renderers/RenderedCustomObjectInstance.js
View File

@@ -387,7 +387,6 @@ export default class RenderedCustomObjectInstance extends Rendered3DInstance
this._pixiObject.rotation = RenderedInstance.toRad( this._pixiObject.rotation = RenderedInstance.toRad(
this._instance.getAngle() this._instance.getAngle()
); );
this._pixiObject.scale.x = 1; this._pixiObject.scale.x = 1;
this._pixiObject.scale.y = 1; this._pixiObject.scale.y = 1;
} }
@@ -399,8 +398,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);
} }
} }

12
newIDE/app/src/ObjectsRendering/Renderers/RenderedSpriteInstance.js
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 {