Make error case not bugging

4ian · Sep 16, 2024 · c3d3fc8 · c3d3fc8
1 parent 4e4af17
commit c3d3fc8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Extensions/TileMap/JsExtension.js b/Extensions/TileMap/JsExtension.js
@@ -2338,7 +2338,9 @@ module.exports = {
           ? this._editableTileMap.isEmpty()
           : false;
         let objectToChange;
-        if (isTileMapEmpty || !atlasImageResourceName) {
+        if (this.errorPixiObject) {
+          objectToChange = this.errorPixiObject;
+        } else if (isTileMapEmpty || !atlasImageResourceName) {
           this.tileMapPixiObject.visible = false;
           this._placeholderPixiObject.visible = true;
           this._placeholderTextPixiObject.text = !atlasImageResourceName

diff --git a/newIDE/app/src/InstancesEditor/TileMapPaintingPreview.js b/newIDE/app/src/InstancesEditor/TileMapPaintingPreview.js
@@ -25,14 +25,16 @@ export const updateSceneToTileMapTransformation = (
     scaleY = 1;
   if (instance.hasCustomSize()) {
     const editableTileMap = renderedInstance.getEditableTileMap();
-    if (!editableTileMap) {
+    if (editableTileMap) {
+      scaleX = instance.getCustomWidth() / editableTileMap.getWidth();
+      scaleY = instance.getCustomHeight() / editableTileMap.getHeight();
+    } else {
       console.error(
-        `Could not find the editable tile map for instance of object ${instance.getObjectName()}.`
+        `Could not find the editable tile map for instance of object ${instance.getObjectName()}. Make sure the tile map object is correctly configured.`
       );
-      return;
+      // Do not early return on error to make the preview still working to not give
+      // a sense of something broken.
     }
-    scaleX = instance.getCustomWidth() / editableTileMap.getWidth();
-    scaleY = instance.getCustomHeight() / editableTileMap.getHeight();
   }
   const absScaleX = Math.abs(scaleX);
   const absScaleY = Math.abs(scaleY);

diff --git a/newIDE/app/src/ObjectEditor/Editors/SimpleTileMapEditor.js b/newIDE/app/src/ObjectEditor/Editors/SimpleTileMapEditor.js
@@ -131,6 +131,7 @@ const SimpleTileMapEditor = ({
   const onChangeAtlasImage = React.useCallback(
     () => {
       if (onObjectUpdated) onObjectUpdated();
+      setError(null);
       onSizeUpdated();
       forceUpdate();
     },