diff --git a/assets/models/hollow_asteroid.glb b/assets/models/hollow_asteroid.bin similarity index 55% rename from assets/models/hollow_asteroid.glb rename to assets/models/hollow_asteroid.bin index b05fba3..807e445 100644 Binary files a/assets/models/hollow_asteroid.glb and b/assets/models/hollow_asteroid.bin differ diff --git a/assets/models/hollow_asteroid.gltf b/assets/models/hollow_asteroid.gltf new file mode 100644 index 0000000..e6ac0e7 --- /dev/null +++ b/assets/models/hollow_asteroid.gltf @@ -0,0 +1,1058 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.70", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"ShellOutside" + }, + { + "mesh":1, + "name":"Cylinder", + "rotation":[ + 0.7071068286895752, + 0, + 0, + 0.7071068286895752 + ], + "scale":[ + 0.28259873390197754, + 0.14983613789081573, + 0.28259873390197754 + ], + "translation":[ + 0, + 0, + 0.7781650424003601 + ] + }, + { + "mesh":2, + "name":"ShellInside" + }, + { + "mesh":3, + "name":"Cube", + "rotation":[ + 0.2446850687265396, + -0.045994825661182404, + 0.10790307819843292, + 0.9624814987182617 + ], + "scale":[ + 0.016423359513282776, + 0.016423359513282776, + 0.31938064098358154 + ], + "translation":[ + -0.5722941160202026, + -0.3963385224342346, + -0.1286868005990982 + ] + }, + { + "mesh":4, + "name":"Cube.001", + "rotation":[ + 0.18848738074302673, + -0.9331722855567932, + -0.1467013955116272, + 0.26859015226364136 + ], + "scale":[ + 0.02924409508705139, + 0.029244091361761093, + 0.568701982498169 + ], + "translation":[ + 0.24938586354255676, + -0.38616928458213806, + -0.1275884211063385 + ] + }, + { + "mesh":5, + "name":"Floor", + "rotation":[ + 0.22662420570850372, + 0.14089469611644745, + -0.03873283416032791, + 0.9629589915275574 + ], + "scale":[ + 0.3258369565010071, + 0.003264262108132243, + 0.14287546277046204 + ], + "translation":[ + -0.17602066695690155, + -0.4113255441188812, + -0.2007010132074356 + ] + }, + { + "mesh":6, + "name":"Cube.003", + "rotation":[ + -0.33639276027679443, + 0.6379992365837097, + -0.2603446841239929, + 0.6418859958648682 + ], + "scale":[ + 0.01887666992843151, + 0.01887666992843151, + 0.36708950996398926 + ], + "translation":[ + 0.12722429633140564, + 0.5380159020423889, + -0.07038053870201111 + ] + }, + { + "mesh":7, + "name":"Cube.004", + "rotation":[ + -0.21550679206848145, + 0.48371076583862305, + -0.16536861658096313, + 0.8320059776306152 + ], + "scale":[ + 0.01887666992843151, + 0.01887667179107666, + 0.36708953976631165 + ], + "translation":[ + 0.055000416934490204, + 0.5608014464378357, + 0.166769340634346 + ] + }, + { + "mesh":8, + "name":"Tank", + "rotation":[ + 0.6296208500862122, + 0.14641901850700378, + 0.04043733701109886, + 0.7619081139564514 + ], + "scale":[ + 0.07744201272726059, + 0.14927244186401367, + 0.07744202017784119 + ], + "translation":[ + 0.0011809244751930237, + 0.5020033121109009, + -0.011742507107555866 + ] + }, + { + "mesh":9, + "name":"Tank.001", + "rotation":[ + 0.6197414398193359, + 0.11763753741979599, + 0.07657001912593842, + 0.7721521854400635 + ], + "scale":[ + 0.07744200527667999, + 0.14927245676517487, + 0.07744201272726059 + ], + "translation":[ + 0.16573497653007507, + 0.4894671142101288, + -0.022204728797078133 + ] + }, + { + "mesh":10, + "name":"Cube.002", + "rotation":[ + -0.4909209907054901, + -0.7642384767532349, + 0.12591591477394104, + 0.3988499641418457 + ], + "scale":[ + 0.029244093224406242, + 0.02924409508705139, + 0.568701982498169 + ], + "translation":[ + 0.30833348631858826, + -0.023365411907434464, + -0.2925625145435333 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Material", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0.30158731341362, + "roughnessFactor":0.7142857313156128 + } + }, + { + "doubleSided":true, + "name":"Material.001", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.04946373403072357, + 0.04946373403072357, + 0.04946373403072357, + 1 + ], + "metallicFactor":0.8492063283920288, + "roughnessFactor":0.555555522441864 + } + }, + { + "name":"Material.002", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":1 + }, + "metallicFactor":0.3888888955116272, + "roughnessFactor":0.7936508059501648 + } + }, + { + "doubleSided":true, + "name":"Floor", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":2 + }, + "metallicFactor":0.7063491940498352, + "roughnessFactor":0.579365074634552 + } + }, + { + "doubleSided":true, + "name":"Paint", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.6094664335250854, + 0.6094664335250854, + 0.6094664335250854, + 1 + ], + "metallicFactor":0.25396817922592163, + "roughnessFactor":0.1666666716337204 + } + } + ], + "meshes":[ + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":4, + "NORMAL":5, + "TEXCOORD_0":6 + }, + "indices":7, + "material":1 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":8, + "NORMAL":9, + "TEXCOORD_0":10 + }, + "indices":11, + "material":2 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":12, + "NORMAL":13, + "TEXCOORD_0":14 + }, + "indices":15, + "material":1 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":16, + "NORMAL":17, + "TEXCOORD_0":18 + }, + "indices":15, + "material":1 + } + ] + }, + { + "name":"Cube.002", + "primitives":[ + { + "attributes":{ + "POSITION":19, + "NORMAL":20, + "TEXCOORD_0":21 + }, + "indices":22, + "material":3 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":23, + "NORMAL":24, + "TEXCOORD_0":25 + }, + "indices":15, + "material":1 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":26, + "NORMAL":27, + "TEXCOORD_0":28 + }, + "indices":15, + "material":1 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":29, + "NORMAL":30, + "TEXCOORD_0":31 + }, + "indices":32, + "material":4 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":33, + "NORMAL":34, + "TEXCOORD_0":35 + }, + "indices":32, + "material":4 + } + ] + }, + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":36, + "NORMAL":37, + "TEXCOORD_0":38 + }, + "indices":15, + "material":1 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + }, + { + "sampler":0, + "source":1 + }, + { + "sampler":0, + "source":2 + } + ], + "images":[ + { + "mimeType":"image/jpeg", + "name":"mercury", + "uri":"textures/mercury.jpg" + }, + { + "mimeType":"image/jpeg", + "name":"rock", + "uri":"textures/rock.jpg" + }, + { + "mimeType":"image/png", + "name":"perforated", + "uri":"textures/perforated.png" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":1624, + "max":[ + 0.9321207404136658, + 0.9251536726951599, + 0.8966113328933716 + ], + "min":[ + -0.938201367855072, + -0.9328452944755554, + -0.9106674194335938 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":1624, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":1624, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":6504, + "type":"SCALAR" + }, + { + "bufferView":4, + "componentType":5126, + "count":2437, + "max":[ + 0.983182430267334, + 0.9151450991630554, + 0.983182430267334 + ], + "min":[ + -0.983182430267334, + -0.9168652296066284, + -0.9831824898719788 + ], + "type":"VEC3" + }, + { + "bufferView":5, + "componentType":5126, + "count":2437, + "type":"VEC3" + }, + { + "bufferView":6, + "componentType":5126, + "count":2437, + "type":"VEC2" + }, + { + "bufferView":7, + "componentType":5123, + "count":12288, + "type":"SCALAR" + }, + { + "bufferView":8, + "componentType":5126, + "count":1501, + "max":[ + 0.8042588829994202, + 0.7132241725921631, + 0.806800127029419 + ], + "min":[ + -0.6674301624298096, + -0.7374663949012756, + -0.582830548286438 + ], + "type":"VEC3" + }, + { + "bufferView":9, + "componentType":5126, + "count":1501, + "type":"VEC3" + }, + { + "bufferView":10, + "componentType":5126, + "count":1501, + "type":"VEC2" + }, + { + "bufferView":11, + "componentType":5123, + "count":5904, + "type":"SCALAR" + }, + { + "bufferView":12, + "componentType":5126, + "count":521, + "max":[ + 8.920257568359375, + 7.299448013305664, + 0.9950506687164307 + ], + "min":[ + -0.7900373935699463, + -5.376383304595947, + -0.9948680996894836 + ], + "type":"VEC3" + }, + { + "bufferView":13, + "componentType":5126, + "count":521, + "type":"VEC3" + }, + { + "bufferView":14, + "componentType":5126, + "count":521, + "type":"VEC2" + }, + { + "bufferView":15, + "componentType":5123, + "count":2496, + "type":"SCALAR" + }, + { + "bufferView":16, + "componentType":5126, + "count":521, + "max":[ + 8.920257568359375, + 7.299448013305664, + 0.9950506687164307 + ], + "min":[ + -0.7900373935699463, + -5.376383304595947, + -0.9948680996894836 + ], + "type":"VEC3" + }, + { + "bufferView":17, + "componentType":5126, + "count":521, + "type":"VEC3" + }, + { + "bufferView":18, + "componentType":5126, + "count":521, + "type":"VEC2" + }, + { + "bufferView":19, + "componentType":5126, + "count":24, + "max":[ + 1, + 1, + 1 + ], + "min":[ + -1, + -1, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":20, + "componentType":5126, + "count":24, + "type":"VEC3" + }, + { + "bufferView":21, + "componentType":5126, + "count":24, + "type":"VEC2" + }, + { + "bufferView":22, + "componentType":5123, + "count":36, + "type":"SCALAR" + }, + { + "bufferView":23, + "componentType":5126, + "count":521, + "max":[ + 8.920257568359375, + 7.299448013305664, + 0.9950506687164307 + ], + "min":[ + -0.7900373935699463, + -5.376383304595947, + -0.9948680996894836 + ], + "type":"VEC3" + }, + { + "bufferView":24, + "componentType":5126, + "count":521, + "type":"VEC3" + }, + { + "bufferView":25, + "componentType":5126, + "count":521, + "type":"VEC2" + }, + { + "bufferView":26, + "componentType":5126, + "count":521, + "max":[ + 8.920257568359375, + 7.299448013305664, + 0.9950506687164307 + ], + "min":[ + -0.7900373935699463, + -5.376383304595947, + -0.9948680996894836 + ], + "type":"VEC3" + }, + { + "bufferView":27, + "componentType":5126, + "count":521, + "type":"VEC3" + }, + { + "bufferView":28, + "componentType":5126, + "count":521, + "type":"VEC2" + }, + { + "bufferView":29, + "componentType":5126, + "count":1004, + "max":[ + 1.0691070556640625, + 0.9457287788391113, + 1.069107174873352 + ], + "min":[ + -1.069107174873352, + -0.9467571973800659, + -1.0691070556640625 + ], + "type":"VEC3" + }, + { + "bufferView":30, + "componentType":5126, + "count":1004, + "type":"VEC3" + }, + { + "bufferView":31, + "componentType":5126, + "count":1004, + "type":"VEC2" + }, + { + "bufferView":32, + "componentType":5123, + "count":5376, + "type":"SCALAR" + }, + { + "bufferView":33, + "componentType":5126, + "count":1004, + "max":[ + 1.0691070556640625, + 0.9457287788391113, + 1.069107174873352 + ], + "min":[ + -1.069107174873352, + -0.9467571973800659, + -1.0691070556640625 + ], + "type":"VEC3" + }, + { + "bufferView":34, + "componentType":5126, + "count":1004, + "type":"VEC3" + }, + { + "bufferView":35, + "componentType":5126, + "count":1004, + "type":"VEC2" + }, + { + "bufferView":36, + "componentType":5126, + "count":521, + "max":[ + 8.920257568359375, + 7.299448013305664, + 0.9950506687164307 + ], + "min":[ + -0.7900373935699463, + -5.376383304595947, + -0.9948680996894836 + ], + "type":"VEC3" + }, + { + "bufferView":37, + "componentType":5126, + "count":521, + "type":"VEC3" + }, + { + "bufferView":38, + "componentType":5126, + "count":521, + "type":"VEC2" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":19488, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":19488, + "byteOffset":19488, + "target":34962 + }, + { + "buffer":0, + "byteLength":12992, + "byteOffset":38976, + "target":34962 + }, + { + "buffer":0, + "byteLength":13008, + "byteOffset":51968, + "target":34963 + }, + { + "buffer":0, + "byteLength":29244, + "byteOffset":64976, + "target":34962 + }, + { + "buffer":0, + "byteLength":29244, + "byteOffset":94220, + "target":34962 + }, + { + "buffer":0, + "byteLength":19496, + "byteOffset":123464, + "target":34962 + }, + { + "buffer":0, + "byteLength":24576, + "byteOffset":142960, + "target":34963 + }, + { + "buffer":0, + "byteLength":18012, + "byteOffset":167536, + "target":34962 + }, + { + "buffer":0, + "byteLength":18012, + "byteOffset":185548, + "target":34962 + }, + { + "buffer":0, + "byteLength":12008, + "byteOffset":203560, + "target":34962 + }, + { + "buffer":0, + "byteLength":11808, + "byteOffset":215568, + "target":34963 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":227376, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":233628, + "target":34962 + }, + { + "buffer":0, + "byteLength":4168, + "byteOffset":239880, + "target":34962 + }, + { + "buffer":0, + "byteLength":4992, + "byteOffset":244048, + "target":34963 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":249040, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":255292, + "target":34962 + }, + { + "buffer":0, + "byteLength":4168, + "byteOffset":261544, + "target":34962 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":265712, + "target":34962 + }, + { + "buffer":0, + "byteLength":288, + "byteOffset":266000, + "target":34962 + }, + { + "buffer":0, + "byteLength":192, + "byteOffset":266288, + "target":34962 + }, + { + "buffer":0, + "byteLength":72, + "byteOffset":266480, + "target":34963 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":266552, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":272804, + "target":34962 + }, + { + "buffer":0, + "byteLength":4168, + "byteOffset":279056, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":283224, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":289476, + "target":34962 + }, + { + "buffer":0, + "byteLength":4168, + "byteOffset":295728, + "target":34962 + }, + { + "buffer":0, + "byteLength":12048, + "byteOffset":299896, + "target":34962 + }, + { + "buffer":0, + "byteLength":12048, + "byteOffset":311944, + "target":34962 + }, + { + "buffer":0, + "byteLength":8032, + "byteOffset":323992, + "target":34962 + }, + { + "buffer":0, + "byteLength":10752, + "byteOffset":332024, + "target":34963 + }, + { + "buffer":0, + "byteLength":12048, + "byteOffset":342776, + "target":34962 + }, + { + "buffer":0, + "byteLength":12048, + "byteOffset":354824, + "target":34962 + }, + { + "buffer":0, + "byteLength":8032, + "byteOffset":366872, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":374904, + "target":34962 + }, + { + "buffer":0, + "byteLength":6252, + "byteOffset":381156, + "target":34962 + }, + { + "buffer":0, + "byteLength":4168, + "byteOffset":387408, + "target":34962 + } + ], + "samplers":[ + { + "magFilter":9729, + "minFilter":9987 + } + ], + "buffers":[ + { + "byteLength":391576, + "uri":"hollow_asteroid.bin" + } + ] +} diff --git a/src/blender/hollow_asteroid.blend b/src/blender/hollow_asteroid.blend index c05a3d2..365abad 100644 Binary files a/src/blender/hollow_asteroid.blend and b/src/blender/hollow_asteroid.blend differ diff --git a/src/blender/scene_hideout.blend b/src/blender/scene_hideout.blend new file mode 100644 index 0000000..33a14a9 Binary files /dev/null and b/src/blender/scene_hideout.blend differ diff --git a/src/cmd.rs b/src/cmd.rs index 0bb4985..47cc3fd 100644 --- a/src/cmd.rs +++ b/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!"); diff --git a/src/data/defs.txt b/src/data/defs.txt index f6fe462..8e7c146 100644 --- a/src/data/defs.txt +++ b/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 diff --git a/src/data/scenes.in b/src/data/scenes.in index 4fcc1fe..702b52c 100644 --- a/src/data/scenes.in +++ b/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]), diff --git a/src/load.rs b/src/load.rs index 8ac95b7..87f3c21 100644 --- a/src/load.rs +++ b/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",