[Reviewed] [3D particle] Allow to be used inside custom objects (#1653)

Author: D8H

extensions/reviewed/ParticleEmitter3D.json

@@ -2,14 +2,14 @@
   "author": "",
   "category": "Visual effect",
   "extensionNamespace": "",
-  "gdevelopVersion": ">=5.5.222",
   "fullName": "3D particle emitter",
+  "gdevelopVersion": ">=5.5.222",
   "helpPath": "",
   "iconUrl": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLWZpcmUiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBkPSJNMTcuNjYgMTEuMkMxNy40MyAxMC45IDE3LjE1IDEwLjY0IDE2Ljg5IDEwLjM4QzE2LjIyIDkuNzggMTUuNDYgOS4zNSAxNC44MiA4LjcyQzEzLjMzIDcuMjYgMTMgNC44NSAxMy45NSAzQzEzIDMuMjMgMTIuMTcgMy43NSAxMS40NiA0LjMyQzguODcgNi40IDcuODUgMTAuMDcgOS4wNyAxMy4yMkM5LjExIDEzLjMyIDkuMTUgMTMuNDIgOS4xNSAxMy41NUM5LjE1IDEzLjc3IDkgMTMuOTcgOC44IDE0LjA1QzguNTcgMTQuMTUgOC4zMyAxNC4wOSA4LjE0IDEzLjkzQzguMDggMTMuODggOC4wNCAxMy44MyA4IDEzLjc2QzYuODcgMTIuMzMgNi42OSAxMC4yOCA3LjQ1IDguNjRDNS43OCAxMCA0Ljg3IDEyLjMgNSAxNC40N0M1LjA2IDE0Ljk3IDUuMTIgMTUuNDcgNS4yOSAxNS45N0M1LjQzIDE2LjU3IDUuNyAxNy4xNyA2IDE3LjdDNy4wOCAxOS40MyA4Ljk1IDIwLjY3IDEwLjk2IDIwLjkyQzEzLjEgMjEuMTkgMTUuMzkgMjAuOCAxNy4wMyAxOS4zMkMxOC44NiAxNy42NiAxOS41IDE1IDE4LjU2IDEyLjcyTDE4LjQzIDEyLjQ2QzE4LjIyIDEyIDE3LjY2IDExLjIgMTcuNjYgMTEuMk0xNC41IDE3LjVDMTQuMjIgMTcuNzQgMTMuNzYgMTggMTMuNCAxOC4xQzEyLjI4IDE4LjUgMTEuMTYgMTcuOTQgMTAuNSAxNy4yOEMxMS42OSAxNyAxMi40IDE2LjEyIDEyLjYxIDE1LjIzQzEyLjc4IDE0LjQzIDEyLjQ2IDEzLjc3IDEyLjMzIDEzQzEyLjIxIDEyLjI2IDEyLjIzIDExLjYzIDEyLjUgMTAuOTRDMTIuNjkgMTEuMzIgMTIuODkgMTEuNyAxMy4xMyAxMkMxMy45IDEzIDE1LjExIDEzLjQ0IDE1LjM3IDE0LjhDMTUuNDEgMTQuOTQgMTUuNDMgMTUuMDggMTUuNDMgMTUuMjNDMTUuNDYgMTYuMDUgMTUuMSAxNi45NSAxNC41IDE3LjVIMTQuNVoiIC8+PC9zdmc+",
   "name": "ParticleEmitter3D",
   "previewIconUrl": "https://asset-resources.gdevelop.io/public-resources/Icons/f2e5a34bf465f781866677762d385d6c8e9e8d203383f2df9a3b7e0fad6a2cb5_fire.svg",
   "shortDescription": "Display a large number of particles to create visual effects.",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": [
     "Particle emitters can be used to display:",
     "- Fire",
@@ -71,14 +71,16 @@
             "        const threeObject3D = this.get3DRendererObject();",
             "",
             "        threeObject3D.rotation.set(",
-            "            gdjs.toRad(this._object.getRotationX()),",
+            "            // TODO The rotation on X goes the wrong way.",
+            "            // Increment the major and remove this sign.",
+            "            - gdjs.toRad(this._object.getRotationX()),",
             "            gdjs.toRad(this._object.getRotationY()),",
-            "            -gdjs.toRad(this._object.angle)",
+            "            gdjs.toRad(this._object.angle)",
             "        );",
             "",
             "        threeObject3D.position.set(",
             "            this._object.getX(),",
-            "            -this._object.getY(),",
+            "            this._object.getY(),",
             "            this._object.getZ()",
             "        );",
             "",
@@ -6783,6 +6785,71 @@
       "is3D": true,
       "isUsingLegacyInstancesRenderer": true,
       "name": "ParticleEmitter3D",
+      "objects": [
+        {
+          "adaptCollisionMaskAutomatically": true,
+          "assetStoreId": "",
+          "name": "Particle",
+          "type": "Sprite",
+          "updateIfNotVisible": false,
+          "variables": [],
+          "effects": [],
+          "behaviors": [],
+          "animations": [
+            {
+              "name": "Image",
+              "useMultipleDirections": false,
+              "directions": [
+                {
+                  "looping": false,
+                  "timeBetweenFrames": 0.08,
+                  "sprites": []
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "objectsFolderStructure": {
+        "folderName": "__ROOT",
+        "children": [
+          {
+            "objectName": "Particle"
+          }
+        ]
+      },
+      "objectsGroups": [],
+      "layers": [
+        {
+          "ambientLightColorB": 200,
+          "ambientLightColorG": 200,
+          "ambientLightColorR": 200,
+          "camera3DFarPlaneDistance": 10000,
+          "camera3DFieldOfView": 45,
+          "camera3DNearPlaneDistance": 3,
+          "cameraType": "",
+          "followBaseLayerCamera": false,
+          "isLightingLayer": false,
+          "isLocked": false,
+          "name": "",
+          "renderingType": "",
+          "visibility": true,
+          "cameras": [
+            {
+              "defaultSize": true,
+              "defaultViewport": true,
+              "height": 0,
+              "viewportBottom": 1,
+              "viewportLeft": 0,
+              "viewportRight": 1,
+              "viewportTop": 0,
+              "width": 0
+            }
+          ],
+          "effects": []
+        }
+      ],
+      "instances": [],
       "eventsFunctions": [
         {
           "fullName": "",
@@ -6911,7 +6978,7 @@
                 "",
                 "// This is a hack that may break in future releases.",
                 "// Replace the group that would hold children objects by the emmiter.",
-                "const layer = gameScene.getLayer(object.getLayer());",
+                "const layer = object.getInstanceContainer().getLayer(object.getLayer());",
                 "const group = object.getRenderer()._threeGroup;",
                 "layer.getRenderer().remove3DRendererObject(group);",
                 "particleSystem.emitter.position.copy(group.position);",
@@ -7001,7 +7068,7 @@
                 "    for (const layerName of layerNames) {",
                 "        const layer = gameScene.getLayer(layerName);",
                 "        if (layer.__particleEmmiter3DExtension) {",
-                "            layer.__particleEmmiter3DExtension.batchSystem.update(object.getElapsedTime() / 1000);",
+                "            layer.__particleEmmiter3DExtension.batchSystem.update(layer.getElapsedTime() / 1000);",
                 "        }",
                 "    }",
                 "}"
@@ -7449,7 +7516,7 @@
                     "    for (const layerName of layerNames) {",
                     "        const layer = gameScene.getLayer(layerName);",
                     "        if (layer.__particleEmmiter3DExtension) {",
-                    "            layer.__particleEmmiter3DExtension.batchSystem.update(object.getElapsedTime() / 1000);",
+                    "            layer.__particleEmmiter3DExtension.batchSystem.update(layer.getElapsedTime() / 1000);",
                     "        }",
                     "    }",
                     "}"
@@ -7489,10 +7556,16 @@
                 "    // Here runtimeScene is the gdjs.CustomRuntimeObjectInstanceContainer inside the custom object.",
                 "    const gameScene = object.getRuntimeScene();",
                 "",
-                "    const layer = gameScene.getLayer(object.getLayer());",
+                "    let rootObject = object;",
+                "    while (rootObject.getInstanceContainer().getOwner) {",
+                "        rootObject = rootObject.getInstanceContainer().getOwner();",
+                "    }",
+                "",
+                "    const layer = gameScene.getLayer(rootObject.getLayer());",
                 "    layer.__particleEmmiter3DExtension = layer.__particleEmmiter3DExtension || {};",
                 "    if (!layer.__particleEmmiter3DExtension.batchSystem) {",
                 "        const batchSystem = new gdjs.__particleEmmiter3DExtension.BatchedRenderer();",
+                "        batchSystem.scale.y *= -1;",
                 "        const threeScene = layer.getRenderer().getThreeScene();",
                 "        if (threeScene) {",
                 "            threeScene.add(batchSystem);",
@@ -7536,7 +7609,7 @@
               ],
               "parameterObjects": "Object",
               "useStrict": true,
-              "eventsSheetExpanded": false
+              "eventsSheetExpanded": true
             }
           ],
           "parameters": [
@@ -9758,72 +9831,7 @@
           "hidden": true,
           "name": "RotationY"
         }
-      ],
-      "objects": [
-        {
-          "adaptCollisionMaskAutomatically": true,
-          "assetStoreId": "",
-          "name": "Particle",
-          "type": "Sprite",
-          "updateIfNotVisible": false,
-          "variables": [],
-          "effects": [],
-          "behaviors": [],
-          "animations": [
-            {
-              "name": "Image",
-              "useMultipleDirections": false,
-              "directions": [
-                {
-                  "looping": false,
-                  "timeBetweenFrames": 0.08,
-                  "sprites": []
-                }
-              ]
-            }
-          ]
-        }
-      ],
-      "objectsFolderStructure": {
-        "folderName": "__ROOT",
-        "children": [
-          {
-            "objectName": "Particle"
-          }
-        ]
-      },
-      "objectsGroups": [],
-      "layers": [
-        {
-          "ambientLightColorB": 200,
-          "ambientLightColorG": 200,
-          "ambientLightColorR": 200,
-          "camera3DFarPlaneDistance": 10000,
-          "camera3DFieldOfView": 45,
-          "camera3DNearPlaneDistance": 3,
-          "cameraType": "",
-          "followBaseLayerCamera": false,
-          "isLightingLayer": false,
-          "isLocked": false,
-          "name": "",
-          "renderingType": "",
-          "visibility": true,
-          "cameras": [
-            {
-              "defaultSize": true,
-              "defaultViewport": true,
-              "height": 0,
-              "viewportBottom": 1,
-              "viewportLeft": 0,
-              "viewportRight": 1,
-              "viewportTop": 0,
-              "width": 0
-            }
-          ],
-          "effects": []
-        }
-      ],
-      "instances": []
+      ]
     }
   ]
 }