Fix import and assets path's problem

Augmenta-tech · Jul 26, 2023 · 444403d · 444403d
1 parent 4de0458
commit 444403d
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 23 deletions.
diff --git a/js/UI/LidarUI.js b/js/UI/LidarUI.js
@@ -1,4 +1,4 @@
-import { getLidarsTypes, units } from '/js/data.js'
+import { getLidarsTypes, units } from '../data.js'
 
 class LidarUI{
     constructor(lidar, sceneManager)

diff --git a/js/UI/NodeUI.js b/js/UI/NodeUI.js
@@ -1,7 +1,7 @@
 import { Vector3 } from 'three'
 
-import { getCamerasTypes, units } from '/js/data.js'
-import { Node } from '/js/scene/objects/sensors/Node.js'
+import { getCamerasTypes, units } from '../data.js'
+import { Node } from '../scene/objects/sensors/Node.js'
 
 class NodeUI{
     constructor(node, sceneManager)

diff --git a/js/UI/UIManager.js b/js/UI/UIManager.js
@@ -1,5 +1,5 @@
-import { SceneManager } from '/js/scene/SceneManager.js';
-import { Node } from '/js/scene/objects/sensors/Node.js';
+import { SceneManager } from '../scene/SceneManager.js';
+import { Node } from '../scene/objects/sensors/Node.js';
 import { Wizard } from './Wizard.js';
 import { Popup } from './Popup.js';
 

diff --git a/js/UI/Wizard.js b/js/UI/Wizard.js
@@ -1,9 +1,9 @@
 import { Vector2 } from 'three'
-import { getCamerasTypes, getLidarsTypes, units } from '/js/data.js';
+import { getCamerasTypes, getLidarsTypes, units } from '../data.js';
 
-import { SceneManager } from '/js/scene/SceneManager.js'
-import { Node } from '/js/scene/objects/sensors/Node.js';
-import { Lidar } from '/js/scene/objects/sensors/Lidar.js'
+import { SceneManager } from '../scene/SceneManager.js'
+import { Node } from '../scene/objects/sensors/Node.js';
+import { Lidar } from '../scene/objects/sensors/Lidar.js'
 
 class Wizard{
     constructor()

diff --git a/js/data.js b/js/data.js
@@ -1,6 +1,7 @@
 // set global variable
 window.camerasTypes = null;
 window.lidarsTypes = null;
+const path = window?.designerPath || './';
 
 function readJSONFile(file, callback) {
     var rawFile = new XMLHttpRequest();
@@ -21,7 +22,7 @@ export function getCamerasTypes()
     if(window.camerasTypes === null)
     {
         let result;
-        readJSONFile("/js/camera-data/camera-data.json", function(text){
+        readJSONFile(path + "js/camera-data/camera-data.json", function(text){
             const sensorsData = JSON.parse(text);
             result = sensorsData.sensors.cameras;
 
@@ -40,7 +41,7 @@ export function getLidarsTypes()
     if(window.lidarsTypes === null)
     {
         let result;
-        readJSONFile("/js/camera-data/camera-data.json", function(text){
+        readJSONFile(path + "js/camera-data/camera-data.json", function(text){
             const sensorsData = JSON.parse(text);
             result = sensorsData.sensors.lidars;
 

diff --git a/js/main.js b/js/main.js
@@ -1,5 +1,8 @@
 import { Engine } from './Engine.js';
 
+//Modify this to set up your base url for assets
+//window.designerPath = "./Camera-Simulation/"
+
 const main = new Engine();
 
 export{main}
diff --git a/js/scene/SceneManager.js b/js/scene/SceneManager.js
@@ -19,13 +19,13 @@ import {
 } from 'three';
 import { DoubleSide } from 'three';
 import { FontLoader } from 'three-loaders/FontLoader.js';
-import { units } from '/js/data.js';
-import { Checkerboard } from '/js/scene/Checkerboard.js';
-import { SceneObjects } from '/js/scene/objects/SceneObjects.js';
-import { Node } from '/js/scene/objects/sensors/Node.js';
-import { Observable } from '/js/scene/Observable.js';
-import { TransformControls } from '/js/lib/TransformControls.js';
-import { ViewportManager } from '/js/ViewportManager.js';
+import { units } from '../data.js';
+import { Checkerboard } from './Checkerboard.js';
+import { SceneObjects } from './objects/SceneObjects.js';
+import { Node } from './objects/sensors/Node.js';
+import { Observable } from './Observable.js';
+import { TransformControls } from '../lib/TransformControls.js';
+import { ViewportManager } from '../ViewportManager.js';
 
 //DEBUG
 import { SphereGeometry } from 'three';

diff --git a/js/scene/objects/SceneObjects.js b/js/scene/objects/SceneObjects.js
@@ -12,7 +12,7 @@ import { Lidar } from './sensors/Lidar.js';
 class SceneObjects{
     static loadFont(isBuilder, callback)
     {
-        const path = isBuilder ? './designer/' : './';
+        const path = './';
         new FontLoader().load( path + 'fonts/helvetiker_regular.typeface.json', function ( response ) {
             SceneObjects.font = response;
             callback();

diff --git a/js/scene/objects/props/Dummy.js b/js/scene/objects/props/Dummy.js
@@ -104,10 +104,10 @@ function loadModel(isBuilder, genre)
 
     };
 
-    const path = isBuilder ? './designer/' : './';
+    const path = './';
 
     new MTLLoader()
-    .setPath( path + 'models/'+ genre +'02/' )
+    .setPath( 'models/'+ genre +'02/' )
     .setRequestHeader({ "Content-Type" : "model/mtl"})
     .load( genre +'02.mtl', function ( materials ) {
 

diff --git a/js/scene/objects/sensors/Lidar.js b/js/scene/objects/sensors/Lidar.js
@@ -10,7 +10,7 @@ import {
     Group
 } from 'three';
 
-import { getLidarsTypes, units } from '/js/data.js'
+import { getLidarsTypes, units } from '../../../data.js'
 
 
 class Lidar{

diff --git a/js/scene/objects/sensors/Node.js b/js/scene/objects/sensors/Node.js
@@ -9,7 +9,7 @@ import {
 } from 'three';
 import { TextGeometry } from 'three-text-geometry';
 
-import { getCamerasTypes } from '/js/data.js';
+import { getCamerasTypes } from '../../../data.js';
 
 import { SceneObjects } from '../SceneObjects.js';