Fix undo/redo for default values of instances

4ian · 4ian · commit 5d1fe836555f · 2025-09-23T18:01:17.000+02:00
diff --git a/Extensions/3D/A_RuntimeObject3D.ts b/Extensions/3D/A_RuntimeObject3D.ts
@@ -147,21 +147,9 @@ namespace gdjs {
       if (initialInstanceData.depth !== undefined) {
         this.setDepth(initialInstanceData.depth);
       }
-      if (initialInstanceData.flippedX) {
-        this.flipX(true);
-      } else if (this.isFlippedX()) {
-        this.flipX(false);
-      }
-      if (initialInstanceData.flippedY) {
-        this.flipY(true);
-      } else if (this.isFlippedY()) {
-        this.flipY(false);
-      }
-      if (initialInstanceData.flippedZ) {
-        this.flipZ(true);
-      } else if (this.isFlippedZ()) {
-        this.flipZ(false);
-      }
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
+      this.flipZ(!!initialInstanceData.flippedZ);
     }
 
     setX(x: float): void {
diff --git a/Extensions/3D/CustomRuntimeObject3D.ts b/Extensions/3D/CustomRuntimeObject3D.ts
@@ -74,15 +74,9 @@ namespace gdjs {
       if (initialInstanceData.depth !== undefined) {
         this.setDepth(initialInstanceData.depth);
       }
-      if (initialInstanceData.flippedX) {
-        this.flipX(initialInstanceData.flippedX);
-      }
-      if (initialInstanceData.flippedY) {
-        this.flipY(initialInstanceData.flippedY);
-      }
-      if (initialInstanceData.flippedZ) {
-        this.flipZ(initialInstanceData.flippedZ);
-      }
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
+      this.flipZ(!!initialInstanceData.flippedZ);
     }
 
     getNetworkSyncData(): CustomObject3DNetworkSyncDataType {
diff --git a/Extensions/BitmapText/bitmaptextruntimeobject.ts b/Extensions/BitmapText/bitmaptextruntimeobject.ts
@@ -218,9 +218,11 @@ namespace gdjs {
         this.setWrappingWidth(initialInstanceData.width);
         this.setWrapping(true);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     override onDestroyed(): void {
diff --git a/Extensions/PanelSpriteObject/panelspriteruntimeobject.ts b/Extensions/PanelSpriteObject/panelspriteruntimeobject.ts
@@ -167,9 +167,11 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     /**
diff --git a/Extensions/PrimitiveDrawing/shapepainterruntimeobject.ts b/Extensions/PrimitiveDrawing/shapepainterruntimeobject.ts
@@ -196,12 +196,8 @@ namespace gdjs {
      * @param initialInstanceData The extra parameters
      */
     extraInitializationFromInitialInstance(initialInstanceData: InstanceData) {
-      if (initialInstanceData.flippedX) {
-        this.flipX(initialInstanceData.flippedX);
-      }
-      if (initialInstanceData.flippedY) {
-        this.flipY(initialInstanceData.flippedY);
-      }
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
     }
 
     stepBehaviorsPreEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
diff --git a/Extensions/Spine/spineruntimeobject.ts b/Extensions/Spine/spineruntimeobject.ts
@@ -199,15 +199,13 @@ namespace gdjs {
         this.setSize(initialInstanceData.width, initialInstanceData.height);
         this.invalidateHitboxes();
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
-      if (initialInstanceData.flippedX) {
-        this.flipX(initialInstanceData.flippedX);
-      }
-      if (initialInstanceData.flippedY) {
-        this.flipY(initialInstanceData.flippedY);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
     }
 
     getDrawableX(): number {
diff --git a/Extensions/TextInput/textinputruntimeobject.ts b/Extensions/TextInput/textinputruntimeobject.ts
@@ -331,9 +331,11 @@ namespace gdjs {
         this.setHeight(initialInstanceData.height);
         this._renderer.updatePadding();
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     onScenePaused(runtimeScene: gdjs.RuntimeScene): void {
diff --git a/Extensions/TextObject/textruntimeobject.ts b/Extensions/TextObject/textruntimeobject.ts
@@ -354,9 +354,11 @@ namespace gdjs {
       } else {
         this.setWrapping(false);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     /**
diff --git a/Extensions/TileMap/simpletilemapruntimeobject.ts b/Extensions/TileMap/simpletilemapruntimeobject.ts
@@ -205,9 +205,11 @@ namespace gdjs {
           this.setWidth(initialInstanceData.width);
           this.setHeight(initialInstanceData.height);
         }
-        if (initialInstanceData.opacity !== undefined) {
-          this.setOpacity(initialInstanceData.opacity);
-        }
+        this.setOpacity(
+          initialInstanceData.opacity === undefined
+            ? 255
+            : initialInstanceData.opacity
+        );
 
         // 4. Update position (calculations based on renderer's dimensions).
         this._renderer.updatePosition();
diff --git a/Extensions/TileMap/tilemapruntimeobject.ts b/Extensions/TileMap/tilemapruntimeobject.ts
@@ -193,9 +193,11 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     private _updateTileMap(): void {
diff --git a/Extensions/TiledSpriteObject/tiledspriteruntimeobject.ts b/Extensions/TiledSpriteObject/tiledspriteruntimeobject.ts
@@ -130,9 +130,11 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     /**
diff --git a/Extensions/Video/videoruntimeobject.ts b/Extensions/Video/videoruntimeobject.ts
@@ -146,9 +146,11 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
     }
 
     onDestroyed(): void {
diff --git a/GDJS/Runtime/CustomRuntimeObject.ts b/GDJS/Runtime/CustomRuntimeObject.ts
@@ -249,15 +249,13 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
-      if (initialInstanceData.flippedX) {
-        this.flipX(initialInstanceData.flippedX);
-      }
-      if (initialInstanceData.flippedY) {
-        this.flipY(initialInstanceData.flippedY);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
     }
 
     override onDeletedFromScene(): void {
diff --git a/GDJS/Runtime/debugger-client/hot-reloader.ts b/GDJS/Runtime/debugger-client/hot-reloader.ts
@@ -1685,22 +1685,16 @@ namespace gdjs {
         somethingChanged = true;
       }
       if (gdjs.Base3DHandler && gdjs.Base3DHandler.is3D(runtimeObject)) {
-        if (oldInstance.z !== newInstance.z && newInstance.z !== undefined) {
-          runtimeObject.setZ(newInstance.z);
+        if (oldInstance.z !== newInstance.z) {
+          runtimeObject.setZ(newInstance.z || 0);
           somethingChanged = true;
         }
-        if (
-          oldInstance.rotationX !== newInstance.rotationX &&
-          newInstance.rotationX !== undefined
-        ) {
-          runtimeObject.setRotationX(newInstance.rotationX);
+        if (oldInstance.rotationX !== newInstance.rotationX) {
+          runtimeObject.setRotationX(newInstance.rotationX || 0);
           somethingChanged = true;
         }
-        if (
-          oldInstance.rotationY !== newInstance.rotationY &&
-          newInstance.rotationY !== undefined
-        ) {
-          runtimeObject.setRotationY(newInstance.rotationY);
+        if (oldInstance.rotationY !== newInstance.rotationY) {
+          runtimeObject.setRotationY(newInstance.rotationY || 0);
           somethingChanged = true;
         }
       }
diff --git a/GDJS/Runtime/spriteruntimeobject.ts b/GDJS/Runtime/spriteruntimeobject.ts
@@ -185,15 +185,13 @@ namespace gdjs {
         this.setWidth(initialInstanceData.width);
         this.setHeight(initialInstanceData.height);
       }
-      if (initialInstanceData.opacity !== undefined) {
-        this.setOpacity(initialInstanceData.opacity);
-      }
-      if (initialInstanceData.flippedX !== undefined) {
-        this.flipX(initialInstanceData.flippedX);
-      }
-      if (initialInstanceData.flippedY !== undefined) {
-        this.flipY(initialInstanceData.flippedY);
-      }
+      this.setOpacity(
+        initialInstanceData.opacity === undefined
+          ? 255
+          : initialInstanceData.opacity
+      );
+      this.flipX(!!initialInstanceData.flippedX);
+      this.flipY(!!initialInstanceData.flippedY);
     }
 
     /**
diff --git a/newIDE/app/src/SceneEditor/index.js b/newIDE/app/src/SceneEditor/index.js
@@ -931,11 +931,13 @@ export default class SceneEditor extends React.Component<Props, State> {
     const { previewDebuggerServer } = this.props;
     if (!previewDebuggerServer) return;
 
+    const instances = serializeToJSObject(this.props.initialInstances);
+
     previewDebuggerServer.getExistingDebuggerIds().forEach(debuggerId => {
       previewDebuggerServer.sendMessage(debuggerId, {
         command: 'hotReloadAllInstances',
         payload: {
-          instances: serializeToJSObject(this.props.initialInstances),
+          instances,
         },
       });
     });

Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,11 @@ namespace gdjs {`
`218`	`218`	`this.setWrappingWidth(initialInstanceData.width);`
`219`	`219`	`this.setWrapping(true);`
`220`	`220`	`}`
`221`		`- if (initialInstanceData.opacity !== undefined) {`
`222`		`- this.setOpacity(initialInstanceData.opacity);`
`223`		`- }`
	`221`	`+ this.setOpacity(`
	`222`	`+ initialInstanceData.opacity === undefined`
	`223`	`+ ? 255`
	`224`	`+ : initialInstanceData.opacity`
	`225`	`+ );`
`224`	`226`	`}`
`225`	`227`
`226`	`228`	`override onDestroyed(): void {`
Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,11 @@ namespace gdjs {`
`167`	`167`	`this.setWidth(initialInstanceData.width);`
`168`	`168`	`this.setHeight(initialInstanceData.height);`
`169`	`169`	`}`
`170`		`- if (initialInstanceData.opacity !== undefined) {`
`171`		`- this.setOpacity(initialInstanceData.opacity);`
`172`		`- }`
	`170`	`+ this.setOpacity(`
	`171`	`+ initialInstanceData.opacity === undefined`
	`172`	`+ ? 255`
	`173`	`+ : initialInstanceData.opacity`
	`174`	`+ );`
`173`	`175`	`}`
`174`	`176`
`175`	`177`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -331,9 +331,11 @@ namespace gdjs {`
`331`	`331`	`this.setHeight(initialInstanceData.height);`
`332`	`332`	`this._renderer.updatePadding();`
`333`	`333`	`}`
`334`		`- if (initialInstanceData.opacity !== undefined) {`
`335`		`- this.setOpacity(initialInstanceData.opacity);`
`336`		`- }`
	`334`	`+ this.setOpacity(`
	`335`	`+ initialInstanceData.opacity === undefined`
	`336`	`+ ? 255`
	`337`	`+ : initialInstanceData.opacity`
	`338`	`+ );`
`337`	`339`	`}`
`338`	`340`
`339`	`341`	`onScenePaused(runtimeScene: gdjs.RuntimeScene): void {`
Original file line number	Diff line number	Diff line change
`@@ -354,9 +354,11 @@ namespace gdjs {`
`354`	`354`	`} else {`
`355`	`355`	`this.setWrapping(false);`
`356`	`356`	`}`
`357`		`- if (initialInstanceData.opacity !== undefined) {`
`358`		`- this.setOpacity(initialInstanceData.opacity);`
`359`		`- }`
	`357`	`+ this.setOpacity(`
	`358`	`+ initialInstanceData.opacity === undefined`
	`359`	`+ ? 255`
	`360`	`+ : initialInstanceData.opacity`
	`361`	`+ );`
`360`	`362`	`}`
`361`	`363`
`362`	`364`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,11 @@ namespace gdjs {`
`193`	`193`	`this.setWidth(initialInstanceData.width);`
`194`	`194`	`this.setHeight(initialInstanceData.height);`
`195`	`195`	`}`
`196`		`- if (initialInstanceData.opacity !== undefined) {`
`197`		`- this.setOpacity(initialInstanceData.opacity);`
`198`		`- }`
	`196`	`+ this.setOpacity(`
	`197`	`+ initialInstanceData.opacity === undefined`
	`198`	`+ ? 255`
	`199`	`+ : initialInstanceData.opacity`
	`200`	`+ );`
`199`	`201`	`}`
`200`	`202`
`201`	`203`	`private _updateTileMap(): void {`