implement wing avatar, give it to icarus (and player, optionally)

This commit is contained in:
yuni 2024-05-23 05:23:31 +02:00
parent 192d2e0fcb
commit cc3213788e
5 changed files with 4 additions and 0 deletions

Binary file not shown.

BIN
src/blender/wings.blend Normal file

Binary file not shown.

View file

@ -489,6 +489,7 @@ actor 30 -12 -40 suitv2
name Icarus name Icarus
id Icarus id Icarus
chatid Icarus chatid Icarus
armodel suit_ar_wings
alive yes alive yes
collider handcrafted collider handcrafted
angularmomentum 0.4 0.2 0.1 angularmomentum 0.4 0.2 0.1

View file

@ -46,6 +46,7 @@ pub const DASHBOARD_DEF: &[(Dashboard, &str)] = &[
pub const PLAYER_AR_AVATARS: &[(Avatar, &str, f32, &str)] = &[ pub const PLAYER_AR_AVATARS: &[(Avatar, &str, f32, &str)] = &[
(Avatar::None, "", 1.0, "No Avatar"), (Avatar::None, "", 1.0, "No Avatar"),
(Avatar::ChefHat, "suit_ar_chefhat", 1.0, "Chef Hat"), (Avatar::ChefHat, "suit_ar_chefhat", 1.0, "Chef Hat"),
(Avatar::Wings, "suit_ar_wings", 1.0, "Wings"),
(Avatar::Asteroid, "asteroid2", 1.2, "Asteroid"), (Avatar::Asteroid, "asteroid2", 1.2, "Asteroid"),
]; ];
@ -171,6 +172,7 @@ struct FPSUpdateTimer(Timer);
pub enum Avatar { pub enum Avatar {
None, None,
ChefHat, ChefHat,
Wings,
Asteroid, Asteroid,
} }

View file

@ -30,6 +30,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
match name { match name {
"suitv2" => "models/suit_v2/suit_v2.glb#Scene0", "suitv2" => "models/suit_v2/suit_v2.glb#Scene0",
"suit_ar_chefhat" => "models/suit_v2/ar_chefhat.glb#Scene0", "suit_ar_chefhat" => "models/suit_v2/ar_chefhat.glb#Scene0",
"suit_ar_wings" => "models/suit_v2/ar_wings.glb#Scene0",
"asteroid1" => "models/asteroid.glb#Scene0", "asteroid1" => "models/asteroid.glb#Scene0",
"asteroid2" => "models/asteroid2.glb#Scene0", "asteroid2" => "models/asteroid2.glb#Scene0",
"asteroid_lum" => "models/asteroid_lum.glb#Scene0", "asteroid_lum" => "models/asteroid_lum.glb#Scene0",