diff --git a/assets/models/ar_skirt_tartan.bin b/assets/models/ar_skirt_tartan.bin new file mode 100644 index 0000000..4f94a7e Binary files /dev/null and b/assets/models/ar_skirt_tartan.bin differ diff --git a/assets/models/ar_skirt_tartan.gltf b/assets/models/ar_skirt_tartan.gltf new file mode 100644 index 0000000..dc1626a --- /dev/null +++ b/assets/models/ar_skirt_tartan.gltf @@ -0,0 +1,153 @@ +{ + "asset":{ + "generator":"Khronos glTF Blender I/O v4.2.70", + "version":"2.0" + }, + "scene":0, + "scenes":[ + { + "name":"Scene", + "nodes":[ + 0 + ] + } + ], + "nodes":[ + { + "mesh":0, + "name":"Skirt", + "rotation":[ + 0.18716467916965485, + 0, + 0, + 0.9823286533355713 + ], + "scale":[ + 0.7949548363685608, + 0.7549549341201782, + 0.5049549341201782 + ], + "translation":[ + 0, + 0, + -0.3132408559322357 + ] + } + ], + "materials":[ + { + "doubleSided":true, + "name":"Denim", + "pbrMetallicRoughness":{ + "baseColorTexture":{ + "index":0 + }, + "metallicFactor":0.5158730149269104, + "roughnessFactor":0.841269850730896 + } + } + ], + "meshes":[ + { + "name":"Mesh", + "primitives":[ + { + "attributes":{ + "POSITION":0, + "NORMAL":1, + "TEXCOORD_0":2 + }, + "indices":3, + "material":0 + } + ] + } + ], + "textures":[ + { + "sampler":0, + "source":0 + } + ], + "images":[ + { + "mimeType":"image/png", + "name":"tartan", + "uri":"textures/tartan.png" + } + ], + "accessors":[ + { + "bufferView":0, + "componentType":5126, + "count":2761, + "max":[ + 0.44324639439582825, + 0.14108650386333466, + 0.4957937002182007 + ], + "min":[ + -0.44725117087364197, + -0.3539474904537201, + -0.2795291841030121 + ], + "type":"VEC3" + }, + { + "bufferView":1, + "componentType":5126, + "count":2761, + "type":"VEC3" + }, + { + "bufferView":2, + "componentType":5126, + "count":2761, + "type":"VEC2" + }, + { + "bufferView":3, + "componentType":5123, + "count":15360, + "type":"SCALAR" + } + ], + "bufferViews":[ + { + "buffer":0, + "byteLength":33132, + "byteOffset":0, + "target":34962 + }, + { + "buffer":0, + "byteLength":33132, + "byteOffset":33132, + "target":34962 + }, + { + "buffer":0, + "byteLength":22088, + "byteOffset":66264, + "target":34962 + }, + { + "buffer":0, + "byteLength":30720, + "byteOffset":88352, + "target":34963 + } + ], + "samplers":[ + { + "magFilter":9729, + "minFilter":9987 + } + ], + "buffers":[ + { + "byteLength":119072, + "uri":"ar_skirt_tartan.bin" + } + ] +} diff --git a/assets/models/textures/tartan.png b/assets/models/textures/tartan.png new file mode 100644 index 0000000..4196dc0 Binary files /dev/null and b/assets/models/textures/tartan.png differ diff --git a/src/blender/ar_skirt_tartan.blend b/src/blender/ar_skirt_tartan.blend new file mode 100644 index 0000000..17ed3e6 Binary files /dev/null and b/src/blender/ar_skirt_tartan.blend differ diff --git a/src/hud.rs b/src/hud.rs index 1836515..af1a874 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -50,6 +50,7 @@ pub const PLAYER_AR_AVATARS: &[(Avatar, &str, f32, &str)] = &[ (Avatar::Hoodie, "suit_ar_hoodie", 1.0, "Hoodie"), (Avatar::HoodieUp, "suit_ar_hoodie_up", 1.0, "Hoodie Up"), (Avatar::Skirt, "suit_ar_skirt", 1.0, "Skirt"), + (Avatar::SkirtTartan, "suit_ar_skirt_tartan", 1.0, "Tartan Skirt"), (Avatar::Dress, "suit_ar_dress", 1.0, "Dress"), (Avatar::Nekomimi, "suit_ar_nekomimi", 1.0, "Cat Ears"), (Avatar::Wings, "suit_ar_wings", 1.0, "Wings"), @@ -205,6 +206,7 @@ pub enum Avatar { Hoodie, HoodieUp, Skirt, + SkirtTartan, Dress, Wings, Asteroid, diff --git a/src/load.rs b/src/load.rs index a6acc3a..11958b7 100644 --- a/src/load.rs +++ b/src/load.rs @@ -37,6 +37,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str { "suit_ar_hoodie" => "models/ar_hoodie.gltf#Scene0", "suit_ar_hoodie_up" => "models/ar_hoodie_up.gltf#Scene0", "suit_ar_skirt" => "models/ar_skirt.gltf#Scene0", + "suit_ar_skirt_tartan" => "models/ar_skirt_tartan.gltf#Scene0", "suit_ar_dress" => "models/ar_dress.gltf#Scene0", "suit_ar_wings" => "models/suit_v2/ar_wings.glb#Scene0", "sus" => "models/sus.glb#Scene0", diff --git a/src/svg/tartan.svg b/src/svg/tartan.svg new file mode 100644 index 0000000..cd93f25 --- /dev/null +++ b/src/svg/tartan.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +