Update for location and settings bugs

kipr · Jul 11, 2023 · c4261e1 · c4261e1
1 parent 44cc970
commit c4261e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/components/World/NodeSettings.tsx b/src/components/World/NodeSettings.tsx
@@ -981,7 +981,9 @@ class NodeSettings extends React.PureComponent<Props, State> {
       ComboBox.option(LocalizedString.lookup(tr('Radiation Science Pack'), locale), 'noradscience'),
       ComboBox.option(LocalizedString.lookup(tr('Communication Tower 2'), locale), 'commstower'),
       ComboBox.option(LocalizedString.lookup(tr('Science Pad'), locale), 'sciencepad'),
-      ComboBox.option(LocalizedString.lookup(tr('Hab 2'), locale), 'habitat'),
+      ComboBox.option(LocalizedString.lookup(tr('Living Habitat'), locale), 'habitat'),
+      ComboBox.option(LocalizedString.lookup(tr('Research Habitat'), locale), 'research_habitat'),
+      ComboBox.option(LocalizedString.lookup(tr('Controls Habitat'), locale), 'control_habitat'),
       ComboBox.option(LocalizedString.lookup(tr('Walkway'), locale), 'walkway'),
       ComboBox.option(LocalizedString.lookup(tr('Solar Panel'), locale), 'solarpanel'),
       ComboBox.option(LocalizedString.lookup(tr('BotGuy Astronaut'), locale), 'botguy'),

diff --git a/src/node-templates/index.ts b/src/node-templates/index.ts
@@ -405,7 +405,7 @@ export const preBuiltGeometries = Object.freeze<Dict<Geometry>>({
   },
   'commstower': {
     type: 'file',
-    uri: '/static/object_binaries/comm_tower.glb'
+    uri: '/static/object_binaries/comm_tower_lowered.glb'
   },
   'habitat': {
     type: 'file',

diff --git a/src/scenes/moonSandbox.ts b/src/scenes/moonSandbox.ts
@@ -76,29 +76,29 @@ const SOLARPANEL_ORIGIN: ReferenceFrame = {
 };
 
 const WALKWAY_ORIGIN: ReferenceFrame = {
-  position: Vector3.centimeters(50, 0, 65),
+  position: Vector3.centimeters(50, 9, 65),
   scale: { x: 12, y: 12, z: 12 }
 };
 
 const COMMSTOWER_ORIGIN: ReferenceFrame = {
-  position: Vector3.centimeters(80, 0, 0),
+  position: Vector3.centimeters(80, 4, 0),
   scale: { x: 7, y: 7, z: 7 }
 };
 
 const HABITAT_ORIGIN: ReferenceFrame = {
-  position: Vector3.centimeters(50, 0, 95),
+  position: Vector3.centimeters(50, 3.5, 95),
   scale: { x: 12, y: 12, z: 12 },
   orientation: Rotation.eulerDegrees(0, 180, 0)
 };
 
 const RESEARCH_HABITAT_ORIGIN: ReferenceFrame = {
-  position: Vector3.centimeters(50, 0, 35),
+  position: Vector3.centimeters(50, 3.5, 35),
   scale: { x: 12, y: 12, z: 12 },
   orientation: Rotation.eulerDegrees(0, 180, 0)
 };
 
 const CONTROL_HABITAT_ORIGIN: ReferenceFrame = {
-  position: Vector3.centimeters(50, 0, 5),
+  position: Vector3.centimeters(50, 3.5, 5),
   scale: { x: 12, y: 12, z: 12 },
   orientation: Rotation.eulerDegrees(0, 180, 0)
 };
@@ -213,6 +213,7 @@ export const Moon_Sandbox: Scene = {
       name: tr('Science Pad'),
       startingOrigin: SCIENCEPAD_ORIGIN,
       origin: SCIENCEPAD_ORIGIN,
+      editable: true,
       visible: true,
     },
     'container': {
@@ -299,6 +300,7 @@ export const Moon_Sandbox: Scene = {
       geometryId: 'indicator',
       name: tr('Life Indicator Light'),
       visible: false,
+      editable: true,
       origin: {
         position: Vector3.centimeters(-10, 4, 110)
       },
@@ -315,6 +317,7 @@ export const Moon_Sandbox: Scene = {
       geometryId: 'indicator',
       name: tr('No Life Indicator Light'),
       visible: false,
+      editable: true,
       origin: {
         position: Vector3.centimeters(10, 4, 110)
       },

diff --git a/static/object_binaries/comm_tower_lowered.glb b/static/object_binaries/comm_tower_lowered.glb