hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reorganized models

Browse source
This commit is contained in:
yuni 2024-04-22 23:36:19 +02:00
parent 08f88f7eeb
commit 7f55ca7d80
13 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
assets/models/clippy_ar.glb → assets/models/clippy/ar_happy.glb
View file

0
assets/models/clippy.glb → assets/models/clippy/clippy.glb
View file

BIN
assets/models/suit.glb
View file

Binary file not shown.

0
assets/models/suit_ar_chefhat.glb → assets/models/suit_v1/ar_chefhat.glb
View file

0
assets/skeleton/suit_v1/base.glb → assets/models/suit_v1/base.glb
View file

0
assets/skeleton/suit_v1/collider.glb → assets/models/suit_v1/collider.glb
View file

0
assets/skeleton/suit_v1/head.glb → assets/models/suit_v1/head.glb
View file

0
assets/skeleton/suit_v1/lower_arm.glb → assets/models/suit_v1/lower_arm.glb
View file

0
assets/skeleton/suit_v1/lower_leg.glb → assets/models/suit_v1/lower_leg.glb
View file

0
assets/skeleton/suit_v1/upper_arm.glb → assets/models/suit_v1/upper_arm.glb
View file

0
assets/skeleton/suit_v1/upper_leg.glb → assets/models/suit_v1/upper_leg.glb
View file

BIN
assets/models/suit_with_collider.glb
View file

Binary file not shown.

29
src/skeleton.rs
View file

@ -20,8 +20,7 @@ impl Plugin for SkeletonPlugin {
pub fn asset_name_to_path(name: &str) -> &'static str {
match name {
"suit" => "models/suit_with_collider.glb#Scene0",
"suit_ar_chefhat" => "models/suit_ar_chefhat.glb#Scene0",
"suit_ar_chefhat" => "models/suit_v1/ar_chefhat.glb#Scene0",
"asteroid1" => "models/asteroid.glb#Scene0",
"asteroid2" => "models/asteroid2.glb#Scene0",
"asteroid_lum" => "models/asteroid_lum.glb#Scene0",
@ -36,8 +35,8 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
"pizzasign" => "models/pizzasign.glb#Scene0",
"selectagon" => "models/selectagon.glb#Scene0",
"orbitring" => "models/orbitring.glb#Scene0",
"clippy" => "models/clippy.glb#Scene0",
"clippy_ar" => "models/clippy_ar.glb#Scene0",
"clippy" => "models/clippy/clippy.glb#Scene0",
"clippy_ar" => "models/clippy/ar_happy.glb#Scene0",
"whale" => "models/whale.glb#Scene0",
"point_of_interest" => "models/point_of_interest.glb#Scene0",
_ => "models/error.glb#Scene0",
@ -50,23 +49,23 @@ pub fn skeleton_name_to_skeletondef(name: &str) -> Option<SkeletonDef> {
// z: positive: forward, negative: backward
match name {
"suitv1" => Some(SkeletonDef::Human(HumanDef {
collider: "skeleton/suit_v1/collider.glb#Scene0".into(),
base: "skeleton/suit_v1/base.glb#Scene0".into(),
collider: "models/suit_v1/collider.glb#Scene0".into(),
base: "models/suit_v1/base.glb#Scene0".into(),
limbs: vec![
LimbDef {
class: Limb::Head,
path: "skeleton/suit_v1/head.glb#Scene0".into(),
path: "models/suit_v1/head.glb#Scene0".into(),
pos: Vec3::new(0.0, 0.46, 0.0),
..default()
},
LimbDef {
class: Limb::UpperArmLeft,
path: "skeleton/suit_v1/upper_arm.glb#Scene0".into(),
path: "models/suit_v1/upper_arm.glb#Scene0".into(),
pos: Vec3::new(0.22, 0.3, 0.0),
mirror: true,
children: vec![LimbDef {
class: Limb::LowerArmLeft,
path: "skeleton/suit_v1/lower_arm.glb#Scene0".into(),
path: "models/suit_v1/lower_arm.glb#Scene0".into(),
pos: Vec3::new(-0.33, 0.0, 0.0),
..default()
}],
@ -74,11 +73,11 @@ pub fn skeleton_name_to_skeletondef(name: &str) -> Option<SkeletonDef> {
},
LimbDef {
class: Limb::UpperArmRight,
path: "skeleton/suit_v1/upper_arm.glb#Scene0".into(),
path: "models/suit_v1/upper_arm.glb#Scene0".into(),
pos: Vec3::new(-0.22, 0.3, 0.0),
children: vec![LimbDef {
class: Limb::LowerArmRight,
path: "skeleton/suit_v1/lower_arm.glb#Scene0".into(),
path: "models/suit_v1/lower_arm.glb#Scene0".into(),
pos: Vec3::new(-0.33, 0.0, 0.0),
..default()
}],
@ -86,12 +85,12 @@ pub fn skeleton_name_to_skeletondef(name: &str) -> Option<SkeletonDef> {
},
LimbDef {
class: Limb::UpperLegLeft,
path: "skeleton/suit_v1/upper_leg.glb#Scene0".into(),
path: "models/suit_v1/upper_leg.glb#Scene0".into(),
pos: Vec3::new(0.15, -0.25, 0.1),
mirror: true,
children: vec![LimbDef {
class: Limb::LowerLegLeft,
path: "skeleton/suit_v1/lower_leg.glb#Scene0".into(),
path: "models/suit_v1/lower_leg.glb#Scene0".into(),
pos: Vec3::new(0.0, -0.3, 0.0),
..default()
}],
@ -99,11 +98,11 @@ pub fn skeleton_name_to_skeletondef(name: &str) -> Option<SkeletonDef> {
},
LimbDef {
class: Limb::UpperLegRight,
path: "skeleton/suit_v1/upper_leg.glb#Scene0".into(),
path: "models/suit_v1/upper_leg.glb#Scene0".into(),
pos: Vec3::new(-0.15, -0.25, 0.1),
children: vec![LimbDef {
class: Limb::LowerLegRight,
path: "skeleton/suit_v1/lower_leg.glb#Scene0".into(),
path: "models/suit_v1/lower_leg.glb#Scene0".into(),
pos: Vec3::new(0.0, -0.3, 0.0),
..default()
}],