give river the red dress (for now. so at least *someone* wears it)

assets/models/ar_dress.gltf

@@ -0,0 +1,228 @@
+{
+	"asset":{
+		"generator":"Khronos glTF Blender I/O v4.2.60",
+		"version":"2.0"
+	},
+	"scene":0,
+	"scenes":[
+		{
+			"name":"Scene",
+			"nodes":[
+				0
+			]
+		}
+	],
+	"nodes":[
+		{
+			"mesh":0,
+			"name":"Cube",
+			"scale":[
+				0.21361224353313446,
+				0.3454160690307617,
+				0.14507770538330078
+			],
+			"translation":[
+				0,
+				0,
+				-0.2844512164592743
+			]
+		}
+	],
+	"materials":[
+		{
+			"doubleSided":true,
+			"name":"Denim",
+			"pbrMetallicRoughness":{
+				"baseColorTexture":{
+					"index":0
+				},
+				"metallicFactor":0.6207181811332703
+			}
+		},
+		{
+			"doubleSided":true,
+			"name":"Denim.001",
+			"pbrMetallicRoughness":{
+				"baseColorTexture":{
+					"index":1
+				},
+				"metallicFactor":0.14664410054683685,
+				"roughnessFactor":0.8888888955116272
+			}
+		}
+	],
+	"meshes":[
+		{
+			"name":"Mesh",
+			"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
+		},
+		{
+			"sampler":0,
+			"source":0
+		}
+	],
+	"images":[
+		{
+			"mimeType":"image/jpeg",
+			"name":"lace_red",
+			"uri":"textures/lace_red.jpg"
+		}
+	],
+	"accessors":[
+		{
+			"bufferView":0,
+			"componentType":5126,
+			"count":4935,
+			"max":[
+				6.589765548706055,
+				1.6830902099609375,
+				9.055266380310059
+			],
+			"min":[
+				-6.589766025543213,
+				-1.3912017345428467,
+				-8.713029861450195
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":1,
+			"componentType":5126,
+			"count":4935,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":2,
+			"componentType":5126,
+			"count":4935,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":3,
+			"componentType":5123,
+			"count":25920,
+			"type":"SCALAR"
+		},
+		{
+			"bufferView":4,
+			"componentType":5126,
+			"count":2734,
+			"max":[
+				6.589765548706055,
+				-0.3425001800060272,
+				9.054472923278809
+			],
+			"min":[
+				-6.589766025543213,
+				-1.3912017345428467,
+				-8.713029861450195
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":5,
+			"componentType":5126,
+			"count":2734,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":6,
+			"componentType":5126,
+			"count":2734,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":7,
+			"componentType":5123,
+			"count":14016,
+			"type":"SCALAR"
+		}
+	],
+	"bufferViews":[
+		{
+			"buffer":0,
+			"byteLength":59220,
+			"byteOffset":0,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":59220,
+			"byteOffset":59220,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":39480,
+			"byteOffset":118440,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":51840,
+			"byteOffset":157920,
+			"target":34963
+		},
+		{
+			"buffer":0,
+			"byteLength":32808,
+			"byteOffset":209760,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":32808,
+			"byteOffset":242568,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":21872,
+			"byteOffset":275376,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":28032,
+			"byteOffset":297248,
+			"target":34963
+		}
+	],
+	"samplers":[
+		{
+			"magFilter":9729,
+			"minFilter":9987
+		}
+	],
+	"buffers":[
+		{
+			"byteLength":325280,
+			"uri":"ar_dress.bin"
+		}
+	]
+}

src/data/defs.txt

@@ -411,10 +411,8 @@ actor 13200 300 -3000 hollow_asteroid
         wants matchvelocitywith cultasteroid
         name "River"
         chatid River
-        armodel suit_ar_skirt
+        armodel suit_ar_dress
-        armodel_secondary suit_ar_bra
         rotationy 54
-        rotationx -90
         pronoun she
     actor 6 11 4 lightorb
         relativeto cultasteroid

src/hud.rs

@@ -49,6 +49,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::Dress, "suit_ar_dress", 1.0, "Dress"),
     (Avatar::Nekomimi, "suit_ar_nekomimi", 1.0, "Cat Ears"),
     (Avatar::Wings, "suit_ar_wings", 1.0, "Wings"),
     (Avatar::Bra, "suit_ar_bra", 1.0, "Bra"),
@@ -186,6 +187,7 @@ pub enum Avatar {
     Hoodie,
     HoodieUp,
     Skirt,
+    Dress,
     Wings,
     Asteroid,
     Bra,

src/load.rs

@@ -36,6 +36,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_dress" => "models/ar_dress.gltf#Scene0",
         "suit_ar_wings" => "models/suit_v2/ar_wings.glb#Scene0",
         "sus" => "models/sus.glb#Scene0",
         "asteroid1" => "models/asteroid.glb#Scene0",