diff --git a/assets/models/whale.bin b/assets/models/whale.bin new file mode 100644 index 0000000..f2f75d3 Binary files /dev/null and b/assets/models/whale.bin differ diff --git a/assets/models/whale.glb b/assets/models/whale.glb deleted file mode 100644 index bd680bb..0000000 Binary files a/assets/models/whale.glb and /dev/null differ diff --git a/assets/models/whale.gltf b/assets/models/whale.gltf new file mode 100644 index 0000000..2d584c9 --- /dev/null +++ b/assets/models/whale.gltf @@ -0,0 +1,709 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.70", + "version":"2.0" + }, + "extensionsUsed":[ + "KHR_materials_emissive_strength" + ], + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Collider", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0, + 0, + -0.8517786860466003 + ] + }, + { + "mesh":1, + "name":"SphereShadeAsteroid" + }, + { + "mesh":2, + "name":"Cylinder", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0, + 0, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.001", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0, + 0.25, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.002", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0, + -0.25, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.003", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + -0.22000011801719666, + 0.12999999523162842, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.004", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697696447372437, + 0.12038250267505646 + ], + "translation":[ + -0.22000011801719666, + -0.12999999523162842, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.005", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0.21999987959861755, + 0.12999999523162842, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.006", + "rotation":[ + 0.70710688829422, + 0, + 0, + 0.7071066498756409 + ], + "scale":[ + 0.12038252502679825, + 0.06697691231966019, + 0.12038250267505646 + ], + "translation":[ + 0.21999987959861755, + -0.12999999523162842, + -0.8517786860466003 + ] + }, + { + "mesh":2, + "name":"Cylinder.007", + "rotation":[ + 0.40557974576950073, + 0.5792279243469238, + -0.5792279839515686, + 0.40557974576950073 + ], + "scale":[ + 0.12038256227970123, + 0.044512517750263214, + 0.12038254737854004 + ], + "translation":[ + -0.9712018370628357, + 0, + 0.062312301248311996 + ] + }, + { + "mesh":2, + "name":"Cylinder.008", + "rotation":[ + 0.4055797755718231, + -0.5792279839515686, + 0.5792280435562134, + 0.40557974576950073 + ], + "scale":[ + 0.12038251012563705, + 0.04451249539852142, + 0.12038248777389526 + ], + "translation":[ + 0.9712016582489014, + 0, + 0.06231236085295677 + ] + }, + { + "mesh":2, + "name":"Cylinder.009", + "rotation":[ + 0, + -0.17364823818206787, + 0.9848078489303589, + 7.590405637358799e-09 + ], + "scale":[ + 0.12038246542215347, + 0.04451249539852142, + 0.12038251012563705 + ], + "translation":[ + 0, + 0.9712017178535461, + 0.06231239065527916 + ] + }, + { + "mesh":2, + "name":"Cylinder.010", + "rotation":[ + 0, + -0.9848077893257141, + 0.1736481636762619, + 4.304728307147343e-08 + ], + "scale":[ + 0.1203826293349266, + 0.04451251029968262, + 0.12038261443376541 + ], + "translation":[ + 0, + -0.9712018370628357, + 0.062312301248311996 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Asteroid", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0.871999979019165, + "roughnessFactor":0.8320000171661377 + } + }, + { + "doubleSided":true, + "name":"Inside", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":1 + }, + "metallicFactor":0.800000011920929, + "roughnessFactor":0.800000011920929 + } + }, + { + "doubleSided":true, + "emissiveFactor":[ + 0.007861939258873463, + 0.6351664066314697, + 1 + ], + "extensions":{ + "KHR_materials_emissive_strength":{ + "emissiveStrength":32 + } + }, + "name":"Thruster", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.006291341036558151, + 0.5082777142524719, + 0.8002276420593262, + 1 + ], + "metallicFactor":0, + "roughnessFactor":0.5 + } + }, + { + "doubleSided":true, + "name":"Engine", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.01483176089823246, + 0.01483176089823246, + 0.01483176089823246, + 1 + ], + "metallicFactor":0.46000000834465027, + "roughnessFactor":0.875 + } + } + ], + "meshes":[ + { + "name":"Collider", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1 + }, + "indices":2 + } + ] + }, + { + "name":"Sphere", + "primitives":[ + { + "attributes":{ + "POSITION":3, + "NORMAL":4, + "TEXCOORD_0":5 + }, + "indices":6, + "material":0 + }, + { + "attributes":{ + "POSITION":7, + "NORMAL":8, + "TEXCOORD_0":9 + }, + "indices":10, + "material":1 + } + ] + }, + { + "name":"Cylinder", + "primitives":[ + { + "attributes":{ + "POSITION":11, + "NORMAL":12, + "TEXCOORD_0":13 + }, + "indices":14, + "material":2 + }, + { + "attributes":{ + "POSITION":15, + "NORMAL":16, + "TEXCOORD_0":17 + }, + "indices":18, + "material":3 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + }, + { + "sampler":0, + "source":0 + } + ], + "images":[ + { + "mimeType":"image/jpeg", + "name":"mercury", + "uri":"textures/mercury.jpg" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":3190, + "max":[ + 8.269089698791504, + 26.76024627685547, + 8.217630386352539 + ], + "min":[ + -8.439277648925781, + -1.0000009536743164, + -8.282991409301758 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":3190, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5123, + "count":4182, + "type":"SCALAR" + }, + { + "bufferView":3, + "componentType":5126, + "count":4943, + "max":[ + 1.0023242235183716, + 0.9883838295936584, + 0.9643056988716125 + ], + "min":[ + -1.020846962928772, + -0.9929111003875732, + -0.8851138949394226 + ], + "type":"VEC3" + }, + { + "bufferView":4, + "componentType":5126, + "count":4943, + "type":"VEC3" + }, + { + "bufferView":5, + "componentType":5126, + "count":4943, + "type":"VEC2" + }, + { + "bufferView":6, + "componentType":5123, + "count":29046, + "type":"SCALAR" + }, + { + "bufferView":7, + "componentType":5126, + "count":2667, + "max":[ + 0.7215039730072021, + 0.5917508602142334, + 0.8757549524307251 + ], + "min":[ + -0.698997974395752, + -0.8130655884742737, + -0.7327467203140259 + ], + "type":"VEC3" + }, + { + "bufferView":8, + "componentType":5126, + "count":2667, + "type":"VEC3" + }, + { + "bufferView":9, + "componentType":5126, + "count":2667, + "type":"VEC2" + }, + { + "bufferView":10, + "componentType":5123, + "count":15498, + "type":"SCALAR" + }, + { + "bufferView":11, + "componentType":5126, + "count":32, + "max":[ + 0.16796797513961792, + -1, + 0.16796797513961792 + ], + "min":[ + -0.16796797513961792, + -1, + -0.16796797513961792 + ], + "type":"VEC3" + }, + { + "bufferView":12, + "componentType":5126, + "count":32, + "type":"VEC3" + }, + { + "bufferView":13, + "componentType":5126, + "count":32, + "type":"VEC2" + }, + { + "bufferView":14, + "componentType":5123, + "count":90, + "type":"SCALAR" + }, + { + "bufferView":15, + "componentType":5126, + "count":288, + "max":[ + 1, + 1, + 1 + ], + "min":[ + -1, + -1, + -1 + ], + "type":"VEC3" + }, + { + "bufferView":16, + "componentType":5126, + "count":288, + "type":"VEC3" + }, + { + "bufferView":17, + "componentType":5126, + "count":288, + "type":"VEC2" + }, + { + "bufferView":18, + "componentType":5123, + "count":666, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":38280, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":38280, + "byteOffset":38280, + "target":34962 + }, + { + "buffer":0, + "byteLength":8364, + "byteOffset":76560, + "target":34963 + }, + { + "buffer":0, + "byteLength":59316, + "byteOffset":84924, + "target":34962 + }, + { + "buffer":0, + "byteLength":59316, + "byteOffset":144240, + "target":34962 + }, + { + "buffer":0, + "byteLength":39544, + "byteOffset":203556, + "target":34962 + }, + { + "buffer":0, + "byteLength":58092, + "byteOffset":243100, + "target":34963 + }, + { + "buffer":0, + "byteLength":32004, + "byteOffset":301192, + "target":34962 + }, + { + "buffer":0, + "byteLength":32004, + "byteOffset":333196, + "target":34962 + }, + { + "buffer":0, + "byteLength":21336, + "byteOffset":365200, + "target":34962 + }, + { + "buffer":0, + "byteLength":30996, + "byteOffset":386536, + "target":34963 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":417532, + "target":34962 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":417916, + "target":34962 + }, + { + "buffer":0, + "byteLength":256, + "byteOffset":418300, + "target":34962 + }, + { + "buffer":0, + "byteLength":180, + "byteOffset":418556, + "target":34963 + }, + { + "buffer":0, + "byteLength":3456, + "byteOffset":418736, + "target":34962 + }, + { + "buffer":0, + "byteLength":3456, + "byteOffset":422192, + "target":34962 + }, + { + "buffer":0, + "byteLength":2304, + "byteOffset":425648, + "target":34962 + }, + { + "buffer":0, + "byteLength":1332, + "byteOffset":427952, + "target":34963 + } + ], + "samplers":[ + { + "magFilter":9729, + "minFilter":9987 + } + ], + "buffers":[ + { + "byteLength":429284, + "uri":"whale.bin" + } + ] +} diff --git a/src/blender/whale.blend b/src/blender/whale.blend new file mode 100644 index 0000000..31c5601 Binary files /dev/null and b/src/blender/whale.blend differ diff --git a/src/load.rs b/src/load.rs index fd3ca20..6e9f328 100644 --- a/src/load.rs +++ b/src/load.rs @@ -65,7 +65,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str { "orbitring" => "models/orbitring.glb#Scene0", "clippy" => "models/clippy/clippy.glb#Scene0", "clippy_ar" => "models/clippy/ar_happy.glb#Scene0", - "whale" => "models/whale.glb#Scene0", + "whale" => "models/whale.gltf#Scene0", "marker_satellites" => "models/marker_satellites.glb#Scene0", "marker_planets" => "models/marker_planets.glb#Scene0", "point_of_interest" => "models/point_of_interest.glb#Scene0",