textured hollow_asteroid, migrated it from defs.txt to blender scene

LICENSE.md

@@ -34,6 +34,7 @@
     - metal.jpg: ["Seamless metal texture" by hhh316, CC BY 3.0](https://www.deviantart.com/hhh316/art/Seamless-metal-texture-182943398)
     - perforated.png: By Yuni, CC0 License
     - plant.jpg: [OTF_Macro_Leaf_19 by Brent Leimenstoll, CC BY-SA 2.0](https://www.flickr.com/photos/brentleimenstoll/9117089591)
+    - rock.jpg: ["Seamless Gray Rock Stone Background" by Alex Borland, CC0](https://www.publicdomainpictures.net/en/view-image.php?image=147321&picture=seamless-gray-rock-stone-background)
     - roughcoat.png: By Yuni, CC0 License
     - solarpanel.jpg: ["Solar panel-Texture 1" by Conquestus, CC BY 3.0](https://www.deviantart.com/conquestus/art/Solar-panel-Texture-1-703900580)
     - suit.jpg: By Yuni, CC0 License

src/cmd.rs

@@ -1011,6 +1011,28 @@ fn spawn_scenes(
                         // command: density 5000
                         state.density = 5000.0;
                     }
+                    "hideout" => {
+                        state.model = Some("hollow_asteroid".to_string());
+
+                        // command: name "Inconspicuous Asteroid"
+                        state.name = Some("Inconspicuous Asteroid".to_string());
+
+                        // command: id hideout
+                        state.id = "hideout".to_string();
+
+                        // command: collider mesh
+                        state.collider_is_one_mesh_of_scene = true;
+                        state.collider_is_mesh = true;
+
+                        // command: pointofinterest yes
+                        state.is_point_of_interest = true;
+
+                        // command: density 10000000000
+                        state.density = 10000000000.0;
+
+                        // command: angularmomentum 0 0.015 0
+                        state.angular_momentum = DVec3::new(0.0, 0.015, 0.0);
+                    }
                     "pizzeria" => {
                         state.model = Some("pizzeria".to_string());
 
@@ -1046,7 +1068,7 @@ fn spawn_scenes(
                         // command: angularmomentum 0 0.1 0
                         state.angular_momentum = DVec3::new(0.0, 0.1, 0.0);
                     }
-                    "tutorialnpc" | "chef" | "tourist" | "pig" => {
+                    "tutorialnpc" | "chef" | "tourist" | "cultleader" | "cultfollower" | "pig" => {
                         state.model = Some("suitv2".to_string());
 
                         // command: collider handcrafted
@@ -1130,6 +1152,16 @@ fn spawn_scenes(
 
                             // command: pronoun she
                             state.pronoun = Some("she".to_string());
+                        } else if template == "cultleader" {
+                            state.name = Some("Ash".to_string());
+                            state.chat = "Ash".to_string();
+                            state.wants_matchvelocity_id = Some("hideout".to_string());
+                            state.pronoun = Some("they".to_string());
+                        } else if template == "cultfollower" {
+                            state.name = Some("River".to_string());
+                            state.chat = "River".to_string();
+                            state.wants_matchvelocity_id = Some("hideout".to_string());
+                            state.pronoun = Some("she".to_string());
                         } else if template == "pig" {
                             state.name = Some("Mudley".to_string());
                             state.id = "Mudley".to_string();
@@ -1189,7 +1221,6 @@ fn spawn_scenes(
                             // command: armodel clippy_ar
                             state.ar_models.push("clippy_ar".to_string());
                         }
-
                     }
                     _ => {
                         error!("Can't find template named `{template}' in cmd::spawn_scenes!");

src/data/defs.txt

@@ -380,47 +380,6 @@ actor 5000 0 -3000 metis
     scale 500
     angularmomentum 0 0.015 0
 
-actor 13200 300 -3000 hollow_asteroid
-    name "Inconspicuous Asteroid"
-    id cultasteroid
-    collider mesh
-    relativeto player
-    density 10000000000
-    scale 40
-    pointofinterest yes
-    angularmomentum 0 0.015 0
-    actor 0 0 0 suitv2
-        template person
-        relativeto cultasteroid
-        wants matchvelocitywith cultasteroid
-        name "Ash"
-        chatid Ash
-        pronoun they
-    actor -8 8 0 suitv2
-        template person
-        relativeto cultasteroid
-        wants matchvelocitywith cultasteroid
-        name "River"
-        chatid River
-        rotationy 54
-        pronoun she
-    actor 6 11 4 lightorb
-        relativeto cultasteroid
-        name "Light Orb"
-        collider mesh
-        scale 0.25
-        light FF8F4A 2000000
-    actor -6 4 8 lightorb
-        relativeto cultasteroid
-        name "Light Orb"
-        collider mesh
-        scale 0.25
-        light FF8F4A 2000000
-    actor -10 -14 0 crate
-        relativeto cultasteroid
-        collider mesh
-        name "Supply Crate"
-
 actor -200 -110 1000 satellite
     name "Communications Satellite"
     relativeto player
@@ -469,6 +428,9 @@ actor -8000 -1000 -100 monolith
     thrust 0 0 0 30 1
     collider mesh
 
+scene 13200 300 -3000 hideout
+    relativeto player
+
 scene -3100 -200 -660 greenhouse
     relativeto player
 

src/data/scenes.in

@@ -27,6 +27,12 @@
 ("greenhouse", "mirror", [3.0, 0.0, -40.0], [-0.33143952, -7.651644e-10, 1.5707964], [10.0, 10.0, 10.0]),
 ("greenhouse", "mirror", [3.0, 0.0, 40.0], [0.34906584, -3.5681582e-9, 1.5707964], [10.0, 10.0, 10.0]),
 ("greenhouse", "mirrorrotating", [0.0, 17.0, 10.0], [0.0073764813, -0.009006099, 1.2773504], [10.0, 10.0, 10.0]),
+("hideout", "cultfollower", [-5.8353786, -2.5615554, -3.7410629], [0.06712008, -0.048212107, 0.90042466], [2.0, 2.0, 2.0]),
+("hideout", "cultleader", [5.1847, 0.46660036, 2.3273885], [0.0, -0.0, 1.5707964], [2.0, 2.0, 2.0]),
+("hideout", "fueltank", [6.33423, 14.39224, -8.332877], [0.20105419, -0.005021105, -0.5410085], [3.0, 3.0, 3.0]),
+("hideout", "hideout", [0.0, 0.0, 0.0], [0.0, 0.0, 0.0], [40.0, 40.0, 40.0]),
+("hideout", "lightorb", [6.0, -4.0, 11.0], [0.0, 0.0, 0.0], [0.25, 0.25, 0.25]),
+("hideout", "lightorb", [-6.0, -8.0, 4.0], [0.0, 0.0, 0.0], [0.25, 0.25, 0.25]),
 ("pizzeria", "chef", [-46.73846, 2.4681277, -2.8273444], [0.0, -0.0, -1.5707964], [2.0, 2.0, 2.0]),
 ("pizzeria", "clippy_pizza", [-51.33497, 20.947536, -9.836457], [0.0, -1.3247921, -0.66126215], [3.0, 3.0, 3.0]),
 ("pizzeria", "lightorb", [-48.202663, 11.565462, 12.844695], [0.0, 0.0, 0.0], [0.25, 0.25, 0.25]),

src/load.rs

@@ -43,7 +43,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
         "suit_ar_wings" => "models/suit_v2/ar_wings.glb#Scene0",
         "sus" => "models/sus.glb#Scene0",
         "asteroid1" => "models/asteroid1.gltf#Scene0",
-        "hollow_asteroid" => "models/hollow_asteroid.glb#Scene0",
+        "hollow_asteroid" => "models/hollow_asteroid.gltf#Scene0",
         "moonlet" => "models/moonlet.glb#Scene0",
         "monolith" => "models/monolith_neon.glb#Scene0",
         "mirror" => "models/mirror.glb#Scene0",