Remove Cursors from all Models

- Removed legacy cursor object from all models, SCOs, and materials. - Added LOD 1 to Breaker Switch.
redthirten · Jun 10, 2024 · 6c23522 · 6c23522
1 parent e853353
commit 6c23522
Show file tree

Hide file tree

Showing 21 changed files with 2,220 additions and 2,388 deletions.
diff --git a/scenery/reds_light_switches/Breaker Switch.nl2sco b/scenery/reds_light_switches/Breaker Switch.nl2sco
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <sceneobject>
-    <model path="models/breaker_switch.dae">
+    <model path="models/breaker_switch_lod0.dae">
+      <lod path="models/breaker_switch_lod1.dae" distance="7"/>
       <clip distance="90"/>
       <clip mesh="switch1" distance="25"/>
       <clip mesh="shield" distance="15"/>
@@ -66,7 +67,6 @@
     <materialpath name="breaker_handle_bump">materials/breaker_handle_user0.nl2mat</materialpath>
     <materialpath name="breaker_label">materials/breaker_label.nl2mat</materialpath>
     <materialpath name="breaker_on_off">materials/breaker_on_off.nl2mat</materialpath>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="key_norm">materials/breaker_key_hole.nl2mat</materialpath>
     <materialpath name="red">materials/plastic_user0.nl2mat</materialpath>
     <materialpath name="screw">materials/screw.nl2mat</materialpath>

diff --git a/scenery/reds_light_switches/Electrical Tower Box.nl2sco b/scenery/reds_light_switches/Electrical Tower Box.nl2sco
@@ -61,7 +61,6 @@
       <label>Disable Entity Color Changing</label>
     </scriptparameter>
     <materialpath name="black_plastic">materials/plastic_black.nl2mat</materialpath>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="key_norm">materials/breaker_key_hole.nl2mat</materialpath>
     <materialpath name="lsr13">materials/lsr13.nl2mat</materialpath>
     <materialpath name="metal">materials/soft_metal.nl2mat</materialpath>

diff --git a/scenery/reds_light_switches/Four Switch Box with Lid.nl2sco b/scenery/reds_light_switches/Four Switch Box with Lid.nl2sco
@@ -93,7 +93,6 @@
       <label>Disable Entity Color Changing</label>
     </scriptparameter>
     <materialpath name="black">materials/plastic_black.nl2mat</materialpath>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="four_way_group_labels">materials/four_way_group_labels.nl2mat</materialpath>
     <materialpath name="four_way_labels">materials/four_way_labels.nl2mat</materialpath>
     <materialpath name="four_way_lid_label">materials/four_way_lid_label.nl2mat</materialpath>

diff --git a/scenery/reds_light_switches/Light Switch (European).nl2sco b/scenery/reds_light_switches/Light Switch (European).nl2sco
@@ -52,7 +52,6 @@
       <description>Disables changing the alpha channel of entity slot 0 (used to make vanilla lights appear fully &quot;off&quot;). Useful if colors or textures are being negatively affected on 3rd party lights.</description>
       <label>Disable Entity Color Changing</label>
     </scriptparameter>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="material">materials/plastic_user0.nl2mat</materialpath>
   </sceneobject>
 </root>
diff --git a/scenery/reds_light_switches/Light Switch 2.nl2sco b/scenery/reds_light_switches/Light Switch 2.nl2sco
@@ -66,7 +66,6 @@
       <description>Disables changing the alpha channel of entity slot 0 (used to make vanilla lights appear fully &quot;off&quot;). Useful if colors or textures are being negatively affected on 3rd party lights.</description>
       <label>Disable Entity Color Changing</label>
     </scriptparameter>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="material">materials/plastic_user0.nl2mat</materialpath>
   </sceneobject>
 </root>
diff --git a/scenery/reds_light_switches/Light Switch.nl2sco b/scenery/reds_light_switches/Light Switch.nl2sco
@@ -52,7 +52,6 @@
       <description>Disables changing the alpha channel of entity slot 0 (used to make vanilla lights appear fully &quot;off&quot;). Useful if colors or textures are being negatively affected on 3rd party lights.</description>
       <label>Disable Entity Color Changing</label>
     </scriptparameter>
-    <materialpath name="cursor">materials/cursor.nl2mat</materialpath>
     <materialpath name="material">materials/plastic_user0.nl2mat</materialpath>
   </sceneobject>
 </root>
diff --git a/scenery/reds_light_switches/Touch Panel Switch.nl2sco b/scenery/reds_light_switches/Touch Panel Switch.nl2sco
@@ -64,7 +64,6 @@
     </scriptparameter>
     <materialpath name="enclosure">materials/plastic_user0.nl2mat</materialpath>
     <materialpath name="glass">materials/glass_basic_transparent.nl2mat</materialpath>
-    <materialpath name="hand_cursor">materials/cursor_hand.nl2mat</materialpath>
     <materialpath name="screen">materials/touchpanel_screen.nl2mat</materialpath>
   </sceneobject>
 </root>
diff --git a/scenery/reds_light_switches/materials/cursor.nl2mat b/scenery/reds_light_switches/materials/cursor.nl2mat
diff --git a/scenery/reds_light_switches/materials/cursor_hand.nl2mat b/scenery/reds_light_switches/materials/cursor_hand.nl2mat
diff --git a/scenery/reds_light_switches/materials/textures/hand_cursor.png b/scenery/reds_light_switches/materials/textures/hand_cursor.png
diff --git a/scenery/reds_light_switches/models/binary_switch.dae b/scenery/reds_light_switches/models/binary_switch.dae
@@ -4,8 +4,8 @@
         <contributor>
             <authoring_tool>SketchUp 17.2.2555</authoring_tool>
         </contributor>
-        <created>2022-05-12T20:13:55Z</created>
-        <modified>2022-05-12T20:13:55Z</modified>
+        <created>2024-06-10T18:03:58Z</created>
+        <modified>2024-06-10T18:03:58Z</modified>
         <unit meter="0.0254" name="inch" />
         <up_axis>Z_UP</up_axis>
     </asset>
@@ -27,7 +27,7 @@
         <visual_scene id="ID2">
             <node name="SketchUp">
                 <node name="skp_camera_Last_Saved_SketchUp_View">
-                    <matrix>0.5579837 0.2264741 -0.7983506 -3.365846 -0.8298519 0.1522788 -0.5368026 -3.590998 -1.249001e-16 0.9620398 0.272909 2.416869 0 0 0 1</matrix>
+                    <matrix>0.8459296 0.1000886 -0.5238181 -1.934344 -0.5332946 0.1587638 -0.8308976 -4.731537 -4.163336e-17 0.9822302 0.1876797 2.082726 0 0 0 1</matrix>
                     <instance_camera url="#ID1" />
                 </node>
                 <node id="ID3" name="instance_0">
@@ -46,10 +46,6 @@
                     <matrix>1 0 0 0.3937008 0 1 0 -0.669685 0 0 1 0.1771654 0 0 0 1</matrix>
                     <instance_node url="#ID102" />
                 </node>
-                <node id="ID116" name="instance_4">
-                    <matrix>1 0 0 0.492126 0 1 0 -0.9255906 0 0 1 0.2755906 0 0 0 1</matrix>
-                    <instance_node url="#ID117" />
-                </node>
             </node>
         </visual_scene>
     </library_visual_scenes>
@@ -158,17 +154,6 @@
                 </bind_material>
             </instance_geometry>
         </node>
-        <node id="ID117" name="cursor1">
-            <instance_geometry url="#ID118">
-                <bind_material>
-                    <technique_common>
-                        <instance_material symbol="Material2" target="#ID119">
-                            <bind_vertex_input semantic="UVSET0" input_semantic="TEXCOORD" input_set="0" />
-                        </instance_material>
-                    </technique_common>
-                </bind_material>
-            </instance_geometry>
-        </node>
     </library_nodes>
     <library_geometries>
         <geometry id="ID5">
@@ -579,38 +564,6 @@
                 </triangles>
             </mesh>
         </geometry>
-        <geometry id="ID118">
-            <mesh>
-                <source id="ID121">
-                    <float_array id="ID124" count="12">0.984252 0 0.984252 0 0 0 0.984252 0 0 0 0 0.984252</float_array>
-                    <technique_common>
-                        <accessor count="4" source="#ID124" stride="3">
-                            <param name="X" type="float" />
-                            <param name="Y" type="float" />
-                            <param name="Z" type="float" />
-                        </accessor>
-                    </technique_common>
-                </source>
-                <source id="ID122">
-                    <float_array id="ID125" count="12">0 -1 0 0 -1 0 0 -1 0 0 -1 0</float_array>
-                    <technique_common>
-                        <accessor count="4" source="#ID125" stride="3">
-                            <param name="X" type="float" />
-                            <param name="Y" type="float" />
-                            <param name="Z" type="float" />
-                        </accessor>
-                    </technique_common>
-                </source>
-                <vertices id="ID123">
-                    <input semantic="POSITION" source="#ID121" />
-                    <input semantic="NORMAL" source="#ID122" />
-                </vertices>
-                <triangles count="2" material="Material2">
-                    <input offset="0" semantic="VERTEX" source="#ID123" />
-                    <p>0 1 2 1 0 3</p>
-                </triangles>
-            </mesh>
-        </geometry>
     </library_geometries>
     <library_materials>
         <material id="ID6" name="black">
@@ -634,9 +587,6 @@
         <material id="ID104" name="metal_0">
             <instance_effect url="#ID105" />
         </material>
-        <material id="ID119" name="cursor">
-            <instance_effect url="#ID120" />
-        </material>
     </library_materials>
     <library_effects>
         <effect id="ID7">
@@ -766,33 +716,22 @@
                 </technique>
             </profile_COMMON>
         </effect>
-        <effect id="ID120">
-            <profile_COMMON>
-                <technique sid="COMMON">
-                    <lambert>
-                        <diffuse>
-                            <color>0 1 0 1</color>
-                        </diffuse>
-                    </lambert>
-                </technique>
-            </profile_COMMON>
-        </effect>
     </library_effects>
     <library_images>
         <image id="ID18">
-            <init_from>switch/placard.png</init_from>
+            <init_from>binary_switch/placard.png</init_from>
         </image>
         <image id="ID33">
-            <init_from>switch/metal.jpg</init_from>
+            <init_from>binary_switch/metal.jpg</init_from>
         </image>
         <image id="ID48">
-            <init_from>switch/black_plastic.jpg</init_from>
+            <init_from>binary_switch/black_plastic.jpg</init_from>
         </image>
         <image id="ID61">
-            <init_from>switch/switch_grip_height.png</init_from>
+            <init_from>binary_switch/switch_grip_height.png</init_from>
         </image>
         <image id="ID106">
-            <init_from>switch/metal_0.jpg</init_from>
+            <init_from>binary_switch/metal_0.jpg</init_from>
         </image>
     </library_images>
     <scene>