diff --git a/assets/models/Martian Chess.glb b/assets/models/Martian Chess.glb index 60bc757..1b0a09f 100644 --- a/assets/models/Martian Chess.glb +++ b/assets/models/Martian Chess.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2288bf563607c4ace5df10ec7c791c64a7f528ceab860c52c448ba8043752262 -size 30428676 +oid sha256:53108b62dee4dfcfbb4863e5442a2576d5a308cc3bb431680e417e350d0dcf17 +size 29968520 diff --git a/assets/models/untitled.glb b/assets/models/untitled.glb deleted file mode 100644 index 01e1aad..0000000 --- a/assets/models/untitled.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb8aca7b0b6a2c4652436eb0ae9f7e562abd491f0941455290642e89126cce9a -size 187392 diff --git a/src/display3d.rs b/src/display3d.rs index 8db6ba4..b70c0c3 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -551,16 +551,8 @@ fn pick_up( children.iter_descendants(entity).for_each(|child| { if let Ok(mut player) = players.get_mut(child) { info!("Picking up {:?} {:?}", entity, piece); - let animation = match piece { - game::Piece::Queen => gltf.named_animations.get("QueenPickup"), - game::Piece::Drone => gltf.named_animations.get("DronePickup"), - game::Piece::Pawn => gltf.named_animations.get("PawnPickup"), - }; - let idle = match piece { - game::Piece::Queen => gltf.named_animations.get("QueenIdle"), - game::Piece::Drone => gltf.named_animations.get("DroneIdle"), - game::Piece::Pawn => gltf.named_animations.get("PawnIdle"), - }; + let animation = gltf.named_animations.get("PiecePickup"); + let idle = gltf.named_animations.get("PieceIdle"); player .start_with_transition( animation.expect("Pickup Animation").clone(), @@ -590,11 +582,7 @@ fn put_down( children.iter_descendants(entity).for_each(|child| { if let Ok(mut player) = players.get_mut(child) { info!("Putting down {:?}", entity); - let animation = match piece { - game::Piece::Queen => gltf.named_animations.get("QueenPutDown"), - game::Piece::Drone => gltf.named_animations.get("DronePutDown"), - game::Piece::Pawn => gltf.named_animations.get("PawnPutDown"), - }; + let animation = gltf.named_animations.get("PiecePutDown"); player .start_with_transition( animation.expect("PutDown Animation").clone(), diff --git a/src/game.rs b/src/game.rs index 5e859c3..6d1a453 100644 --- a/src/game.rs +++ b/src/game.rs @@ -507,6 +507,6 @@ fn asserts( ); } if cameras.iter().len() != 1 { - panic!("There should be 2 cameras in this state, but there is only {}", cameras.iter().len()); + panic!("There should be 1 cameras in this state, but there is only {}", cameras.iter().len()); } } \ No newline at end of file