diff --git a/assets/models/ar_choker.bin b/assets/models/ar_choker.bin new file mode 100644 index 0000000..f9fd6f8 Binary files /dev/null and b/assets/models/ar_choker.bin differ diff --git a/assets/models/ar_choker.gltf b/assets/models/ar_choker.gltf new file mode 100644 index 0000000..5cc6383 --- /dev/null +++ b/assets/models/ar_choker.gltf @@ -0,0 +1,234 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.70", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Cylinder", + "rotation":[ + 0.2990456521511078, + 0, + 0, + 0.9542388319969177 + ], + "scale":[ + 0.1190018355846405, + 0.02275676839053631, + 0.1190018355846405 + ], + "translation":[ + 0, + 0.5599928498268127, + 0.07695265114307404 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Denim", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0.7063491940498352, + "roughnessFactor":0.841269850730896 + } + }, + { + "doubleSided":true, + "name":"Metal", + "pbrMetallicRoughness":{ + "baseColorFactor":[ + 0.6014198064804077, + 0.6014198064804077, + 0.6014198064804077, + 1 + ], + "metallicFactor":0.9047619104385376, + "roughnessFactor":0.119047611951828 + } + } + ], + "meshes":[ + { + "name":"Cylinder", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + }, + { + "attributes":{ + "POSITION":4, + "NORMAL":5, + "TEXCOORD_0":6 + }, + "indices":7, + "material":1 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + } + ], + "images":[ + { + "mimeType":"image/jpeg", + "name":"denim", + "uri":"textures/denim.jpg" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":224, + "max":[ + 0.939642608165741, + 1.2586437463760376, + 1.084672451019287 + ], + "min":[ + -0.9994356036186218, + -2.073982000350952, + -0.9989151358604431 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":224, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":224, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":798, + "type":"SCALAR" + }, + { + "bufferView":4, + "componentType":5126, + "count":63, + "max":[ + 1.0668237209320068, + 0.6634414792060852, + 1.251813292503357 + ], + "min":[ + -1.0482804775238037, + -1.274949073791504, + 0.17538878321647644 + ], + "type":"VEC3" + }, + { + "bufferView":5, + "componentType":5126, + "count":63, + "type":"VEC3" + }, + { + "bufferView":6, + "componentType":5126, + "count":63, + "type":"VEC2" + }, + { + "bufferView":7, + "componentType":5123, + "count":168, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":2688, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":2688, + "byteOffset":2688, + "target":34962 + }, + { + "buffer":0, + "byteLength":1792, + "byteOffset":5376, + "target":34962 + }, + { + "buffer":0, + "byteLength":1596, + "byteOffset":7168, + "target":34963 + }, + { + "buffer":0, + "byteLength":756, + "byteOffset":8764, + "target":34962 + }, + { + "buffer":0, + "byteLength":756, + "byteOffset":9520, + "target":34962 + }, + { + "buffer":0, + "byteLength":504, + "byteOffset":10276, + "target":34962 + }, + { + "buffer":0, + "byteLength":336, + "byteOffset":10780, + "target":34963 + } + ], + "samplers":[ + { + "magFilter":9729, + "minFilter":9987 + } + ], + "buffers":[ + { + "byteLength":11116, + "uri":"ar_choker.bin" + } + ] +} diff --git a/src/blender/ar_choker.blend b/src/blender/ar_choker.blend new file mode 100644 index 0000000..19a9f10 Binary files /dev/null and b/src/blender/ar_choker.blend differ diff --git a/src/data/defs.txt b/src/data/defs.txt index 2e8148d..84bae52 100644 --- a/src/data/defs.txt +++ b/src/data/defs.txt @@ -337,6 +337,7 @@ actor 700 -100 -1100 suitv2 armodel suit_ar_skirt armodel suit_ar_nekomimi armodel suit_ar_bra + armodel suit_ar_choker angularmomentum 0 0 0 wants maxrotation 0 wants matchvelocitywith lunaplatform diff --git a/src/load.rs b/src/load.rs index 11958b7..fd3ca20 100644 --- a/src/load.rs +++ b/src/load.rs @@ -33,6 +33,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str { "suit_ar_armor" => "models/ar_armor.gltf#Scene0", "suit_ar_bra" => "models/ar_bra.gltf#Scene0", "suit_ar_chefhat" => "models/suit_v2/ar_chefhat.glb#Scene0", + "suit_ar_choker" => "models/ar_choker.gltf#Scene0", "suit_ar_nekomimi" => "models/ar_nekomimi.gltf#Scene0", "suit_ar_hoodie" => "models/ar_hoodie.gltf#Scene0", "suit_ar_hoodie_up" => "models/ar_hoodie_up.gltf#Scene0",