Merge pull request #1 from ir-engine/dev

0.8 release to prd
ir-engine · Sep 13, 2024 · 84e6025 · 84e6025
2 parents a48ab89 + 2e4ebaf
commit 84e6025
Show file tree

Hide file tree

Showing 29 changed files with 113 additions and 281 deletions.
diff --git a/.mocharc.js b/.mocharc.js
diff --git a/assets/prefabs/cloud.gltf b/assets/prefabs/cloud.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/cloud.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/cloud.gltf"
       }
     }
   ],
@@ -92,7 +92,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/Cloud.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/Cloud.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "IntervalValue",

diff --git a/assets/prefabs/explosion.gltf b/assets/prefabs/explosion.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/explosion.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/explosion.gltf"
       }
     }
   ],
@@ -74,7 +74,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/Explosion.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/Explosion.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "IntervalValue",

diff --git a/assets/prefabs/fire_particles_spritesheet_1.gltf b/assets/prefabs/fire_particles_spritesheet_1.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/fire_particles_spritesheet_1.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/fire_particles_spritesheet_1.gltf"
       }
     }
   ],
@@ -76,8 +76,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/fire_campfire.ktx2",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/fire_mesh.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/fire_campfire.ktx2",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/fire_mesh.glb",
             "startTileIndex": {
               "type": "ConstantValue",
               "value": 0

diff --git a/assets/prefabs/fireball.gltf b/assets/prefabs/fireball.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/fireball.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/fireball.gltf"
       }
     }
   ],
@@ -74,7 +74,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/FireBall.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/FireBall.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "IntervalValue",

diff --git a/assets/prefabs/game-ray-fire-mesh.gltf b/assets/prefabs/game-ray-fire-mesh.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/game-ray-fire-mesh.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/game-ray-fire-mesh.gltf"
       }
     }
   ],
@@ -76,8 +76,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/ray1.png",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/quad.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/ray1.png",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/quad.glb",
             "startTileIndex": {
               "type": "ConstantValue",
               "value": 0

diff --git a/assets/prefabs/game-ray-fire.gltf b/assets/prefabs/game-ray-fire.gltf
@@ -4,7 +4,7 @@
     {
       "nodes": [0],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/game-ray-fire.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/game-ray-fire.gltf"
         }
     }
   ],
@@ -36,7 +36,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/ray1.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/ray1.png",
             "instancingGeometry": "",
             "startTileIndex": { "type": "ConstantValue", "value": 0 },
             "uTileCount": 1,

diff --git a/assets/prefabs/game-ray-purple-mesh.gltf b/assets/prefabs/game-ray-purple-mesh.gltf
@@ -4,7 +4,7 @@
     {
       "nodes": [0],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/game-ray-purple.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/game-ray-purple.gltf"
       }
     }
   ],
@@ -37,8 +37,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/ray2.png",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/quad.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/ray2.png",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/quad.glb",
             "startTileIndex": { "type": "ConstantValue", "value": 0 },
             "uTileCount": 1,
             "vTileCount": 1,

diff --git a/assets/prefabs/game-ray-purple.gltf b/assets/prefabs/game-ray-purple.gltf
@@ -4,7 +4,7 @@
     {
       "nodes": [0],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/game-ray-purple.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/game-ray-purple.gltf"
             }
     }
   ],
@@ -36,7 +36,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/ray2.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/ray2.png",
             "instancingGeometry": "",
             "startTileIndex": { "type": "ConstantValue", "value": 0 },
             "uTileCount": 1,

diff --git a/assets/prefabs/game-ray.gltf b/assets/prefabs/game-ray.gltf
@@ -4,8 +4,8 @@
     {
       "nodes": [0],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/game-ray.gltf",
-        "sceneID": "2eb3169b-49d4-46e0-bbf8-54663bb76d1b-__$project$__/ir-vfx/assets/game-ray.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/game-ray.gltf",
+        "sceneID": "2eb3169b-49d4-46e0-bbf8-54663bb76d1b-__$project$__/ir-engine/ir-vfx/assets/game-ray.gltf"
       }
     }
   ],
@@ -37,7 +37,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/spark_ray.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/spark_ray.png",
             "instancingGeometry": "",
             "startTileIndex": { "type": "ConstantValue", "value": 0 },
             "uTileCount": 1,

diff --git a/assets/prefabs/lightning_quad.gltf b/assets/prefabs/lightning_quad.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/lightning_quad.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/lightning_quad.gltf"
       }
     }
   ],
@@ -92,8 +92,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/lightning.png",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/quad.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/lightning.png",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/quad.glb",
             "startTileIndex": {
               "type": "ConstantValue",
               "value": 0

diff --git a/assets/prefabs/lightning_quad2.gltf b/assets/prefabs/lightning_quad2.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/lightning_quad2.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/lightning_quad2.gltf"
       }
     }
   ],
@@ -92,8 +92,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/lightning.png",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/fire_mesh.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/lightning.png",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/fire_mesh.glb",
             "startTileIndex": {
               "type": "ConstantValue",
               "value": 0

diff --git a/assets/prefabs/portal-blue.gltf b/assets/prefabs/portal-blue.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/portal-blue.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/portal-blue.gltf"
       }
     }
   ],
@@ -77,7 +77,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/circle.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/circle.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "ConstantValue",

diff --git a/assets/prefabs/portal-circle.gltf b/assets/prefabs/portal-circle.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/portal-circle.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/portal-circle.gltf"
       }
     }
   ],
@@ -77,7 +77,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/twirl.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/twirl.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "ConstantValue",

diff --git a/assets/prefabs/portal-mesh.gltf b/assets/prefabs/portal-mesh.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/portal-mesh.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/portal-mesh.gltf"
       }
     }
   ],
@@ -95,8 +95,8 @@
               "followLocalOrigin": true
             },
             "renderMode": 2,
-            "texture": "__$project$__/ir-vfx/assets/textures/spark_rotate.png",
-            "instancingGeometry": "__$project$__/ir-vfx/assets/geometry/half-sphere.glb",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/spark_rotate.png",
+            "instancingGeometry": "__$project$__/ir-engine/ir-vfx/assets/geometry/half-sphere.glb",
             "startTileIndex": {
               "type": "ConstantValue",
               "value": 0

diff --git a/assets/prefabs/portal-purpleblue.gltf b/assets/prefabs/portal-purpleblue.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/portal-purpleblue.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/portal-purpleblue.gltf"
       }
     }
   ],
@@ -81,7 +81,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/spark.ktx2",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/spark.ktx2",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "ConstantValue",

diff --git a/assets/prefabs/rose-petals.gltf b/assets/prefabs/rose-petals.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/rose-petals.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/rose-petals.gltf"
       }
     }
   ],
@@ -104,7 +104,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/rose-petal.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/rose-petal.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "ConstantValue",

diff --git a/assets/prefabs/smoke.gltf b/assets/prefabs/smoke.gltf
@@ -10,7 +10,7 @@
         0
       ],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/prefabs/smoke.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/prefabs/smoke.gltf"
       }
     }
   ],
@@ -92,7 +92,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/sprite_sheets/Smoke.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/sprite_sheets/Smoke.png",
             "instancingGeometry": "",
             "startTileIndex": {
               "type": "IntervalValue",

diff --git a/assets/prefabs/sparkle-star1.gltf b/assets/prefabs/sparkle-star1.gltf
@@ -6,7 +6,7 @@
 
       "nodes": [0],
       "extras": {
-        "src": "__$project$__/ir-vfx/assets/sparkle-star.gltf"
+        "src": "__$project$__/ir-engine/ir-vfx/assets/sparkle-star.gltf"
         }
     }
   ],
@@ -39,7 +39,7 @@
               "followLocalOrigin": true
             },
             "renderMode": 0,
-            "texture": "__$project$__/ir-vfx/assets/textures/star_01.png",
+            "texture": "__$project$__/ir-engine/ir-vfx/assets/textures/star_01.png",
             "instancingGeometry": "",
             "startTileIndex": { "type": "ConstantValue", "value": 0 },
             "uTileCount": 1,