fix path

AmyangXYZ · Jan 15, 2024 · e91bf9b · e91bf9b
1 parent 5e0908e
commit e91bf9b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/public/models/es/sensor/scene.glb → public/models/es/sensor_camera/scene.glb b/public/models/es/sensor/scene.glb → public/models/es/sensor_camera/scene.glb
diff --git a/src/components/TopoEditToolbox.vue b/src/components/TopoEditToolbox.vue
@@ -18,9 +18,10 @@ const nodeTypes = [
   {
     label: 'End systems',
     types: [
-      { label: 'Edge server', value: NODE_TYPE.END_SYSTEM_SENSOR },
-      { label: 'Sensor', value: NODE_TYPE.END_SYSTEM_SENSOR },
-      { label: 'Robotic arm', value: NODE_TYPE.END_SYSTEM_ROBOTIC_ARM }
+      { label: 'Edge server', value: NODE_TYPE.END_SYSTEM_SERVER },
+      { label: 'Temp Sensor', value: NODE_TYPE.END_SYSTEM_SENSOR_TEMP },
+      { label: 'Camera', value: NODE_TYPE.END_SYSTEM_SENSOR_CAMERA },
+      { label: 'Robotic arm', value: NODE_TYPE.END_SYSTEM_ACTUATOR_ROBOTIC_ARM }
     ]
   }
 ]

diff --git a/src/core/network.ts b/src/core/network.ts
@@ -164,8 +164,11 @@ export class NetworkHub {
       for (let i = 1; i <= this.Config.value.num_nodes; i++) {
         const n = <Node>{
           id: this.Nodes.value.length,
-          type: [0, 1, 2, 3, 11, 12, 13, 14, 15, 16, 17][
-            Math.floor((this.Rand.next() * Object.keys(NODE_TYPE).length) / 2)
+          // type: [0, 1, 2, 3, 11, 12, 13, 14, 15, 16, 17][
+          //   Math.floor((this.Rand.next() * Object.keys(NODE_TYPE).length) / 2)
+          // ],
+          type: [0, 1, 2, 3, 11, 12, 16][
+            Math.floor(this.Rand.next() * 7)
           ],
           pos: [
             Math.floor(this.Rand.next() * this.Config.value.grid_size) -

diff --git a/src/core/typedefs.ts b/src/core/typedefs.ts
@@ -13,7 +13,7 @@ export enum NODE_TYPE {
   FIVE_G_GNB,
   FIVE_G_UE,
   END_SYSTEM_SERVER = 11,
-  END_SYSTEM_SENSOR,
+  END_SYSTEM_SENSOR_CAMERA,
   END_SYSTEM_SENSOR_TEMP,
   END_SYSTEM_SENSOR_PRESSURE,
   END_SYSTEM_SENSOR_HUMIDITY,
@@ -27,7 +27,7 @@ export const NODE_TYPE_DISPLAY_NAME = <{ [name: string]: string }>{
   FIVE_G_GNB: '5G gNB',
   FIVE_G_UE: '5G UE',
   END_SYSTEM_SERVER: 'Edge Server',
-  END_SYSTEM_SENSOR: 'Sensor',
+  END_SYSTEM_SENSOR_CAMERA: 'Camera',
   END_SYSTEM_SENSOR_TEMP: 'Temperature Sensor',
   END_SYSTEM_SENSOR_PRESSURE: 'Pressure Sensor',
   END_SYSTEM_SENSOR_HUMIDITY: 'Humidity Sensor',

diff --git a/src/hooks/useDrawTopology.ts b/src/hooks/useDrawTopology.ts
@@ -181,8 +181,8 @@ export async function useDrawTopology(dom: HTMLElement) {
       Math.PI / 2
     )
     await loadModel(
-      NODE_TYPE.END_SYSTEM_SENSOR,
-      '/models/es/sensor/scene.glb',
+      NODE_TYPE.END_SYSTEM_SENSOR_CAMERA,
+      '/models/es/sensor_camera/scene.glb',
       2,
       -Math.PI / 3
     )