From 0c3dc01ca9cfe61207ca88118fb53276a5ee3d16 Mon Sep 17 00:00:00 2001
From: LJ5O <75009579+LJ5O@users.noreply.github.com>
Date: Wed, 3 Jan 2024 23:32:21 +0100
Subject: [PATCH] Moved some files

---
 src/objects/models/{ => name}/NameEN.gltf |  0
 src/objects/models/{ => name}/NameFR.gltf |  0
 src/objects/models/{ => name}/NameJP.gltf |  0
 src/objects/models/{ => tree}/tree1.gltf  |  0
 src/objects/models/{ => tree}/tree2.gltf  |  0
 src/objects/models/{ => tree}/tree3.gltf  |  0
 src/objects/models/{ => tree}/tree4.gltf  |  0
 src/utils/addAssetsOnScene.js             | 14 +++++++-------
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/objects/models/{ => name}/NameEN.gltf (100%)
 rename src/objects/models/{ => name}/NameFR.gltf (100%)
 rename src/objects/models/{ => name}/NameJP.gltf (100%)
 rename src/objects/models/{ => tree}/tree1.gltf (100%)
 rename src/objects/models/{ => tree}/tree2.gltf (100%)
 rename src/objects/models/{ => tree}/tree3.gltf (100%)
 rename src/objects/models/{ => tree}/tree4.gltf (100%)

diff --git a/src/objects/models/NameEN.gltf b/src/objects/models/name/NameEN.gltf
similarity index 100%
rename from src/objects/models/NameEN.gltf
rename to src/objects/models/name/NameEN.gltf
diff --git a/src/objects/models/NameFR.gltf b/src/objects/models/name/NameFR.gltf
similarity index 100%
rename from src/objects/models/NameFR.gltf
rename to src/objects/models/name/NameFR.gltf
diff --git a/src/objects/models/NameJP.gltf b/src/objects/models/name/NameJP.gltf
similarity index 100%
rename from src/objects/models/NameJP.gltf
rename to src/objects/models/name/NameJP.gltf
diff --git a/src/objects/models/tree1.gltf b/src/objects/models/tree/tree1.gltf
similarity index 100%
rename from src/objects/models/tree1.gltf
rename to src/objects/models/tree/tree1.gltf
diff --git a/src/objects/models/tree2.gltf b/src/objects/models/tree/tree2.gltf
similarity index 100%
rename from src/objects/models/tree2.gltf
rename to src/objects/models/tree/tree2.gltf
diff --git a/src/objects/models/tree3.gltf b/src/objects/models/tree/tree3.gltf
similarity index 100%
rename from src/objects/models/tree3.gltf
rename to src/objects/models/tree/tree3.gltf
diff --git a/src/objects/models/tree4.gltf b/src/objects/models/tree/tree4.gltf
similarity index 100%
rename from src/objects/models/tree4.gltf
rename to src/objects/models/tree/tree4.gltf
diff --git a/src/utils/addAssetsOnScene.js b/src/utils/addAssetsOnScene.js
index 2ef4e5b..234f058 100644
--- a/src/utils/addAssetsOnScene.js
+++ b/src/utils/addAssetsOnScene.js
@@ -209,10 +209,10 @@ export async function addAssetsOnScene(scene){
     /* --------------------
     ADDING TREES
     -------------------- */
-    const treeOakModel = await loadModel('src/objects/models/tree1.gltf');
-    const treeAppleOakModel = await loadModel('src/objects/models/tree2.gltf');
-    const treeSakuraModel = await loadModel('src/objects/models/tree3.gltf');
-    const treePineModel = await loadModel('src/objects/models/tree4.gltf');
+    const treeOakModel = await loadModel('src/objects/models/tree/tree1.gltf');
+    const treeAppleOakModel = await loadModel('src/objects/models/tree/tree2.gltf');
+    const treeSakuraModel = await loadModel('src/objects/models/tree/tree3.gltf');
+    const treePineModel = await loadModel('src/objects/models/tree/tree4.gltf');
 
     function prepareTree(treeModel){
         //Small function to apply every neccessary transformation on trees before placing them
@@ -319,11 +319,11 @@ export async function addAssetsOnScene(scene){
     -------------------- */
     let nameplateModel;
     if(true){//Will be used later for localization
-        nameplateModel = await loadModel('src/objects/models/NameFR.gltf');
+        nameplateModel = await loadModel('src/objects/models/name/NameFR.gltf');
     }else if(false){
-        nameplateModel = await loadModel('src/objects/models/NameJP.gltf');
+        nameplateModel = await loadModel('src/objects/models/name/NameJP.gltf');
     }else{
-        nameplateModel = await loadModel('src/objects/models/NameEN.gltf');
+        nameplateModel = await loadModel('src/objects/models/name/NameEN.gltf');
     }
     nameplateModel.scene.scale.set(0.6,0.6,0.6);
     nameplateModel.scene.rotateOnWorldAxis(new THREE.Vector3(1, 0, 0), MathUtils.degToRad(60));