diff --git a/src/entity/block_entity/sign.rs b/src/entity/block_entity/sign.rs index e56d1fe..abd2611 100644 --- a/src/entity/block_entity/sign.rs +++ b/src/entity/block_entity/sign.rs @@ -120,8 +120,8 @@ impl ecs::System for SignRenderer { let mut verts = vec![]; // Backboard model::append_box(&mut verts, -0.5, -4.0/16.0, -0.5/16.0, 1.0, 8.0/16.0, 1.0/16.0, [ - rel!(2.0, 0.0, 24.0, 2.0), // Up rel!(26.0, 0.0, 24.0, 2.0), // Down + rel!(2.0, 0.0, 24.0, 2.0), // Up rel!(2.0, 2.0, 24.0, 12.0), // North rel!(26.0, 2.0, 24.0, 12.0), // South rel!(0.0, 2.0, 2.0, 12.0), // West @@ -129,8 +129,8 @@ impl ecs::System for SignRenderer { ]); if info.has_stand { model::append_box(&mut verts, -0.5/16.0, -0.25-9.0/16.0, -0.5/16.0, 1.0/16.0, 9.0/16.0, 1.0/16.0, [ - rel!(2.0, 14.0, 2.0, 2.0), // Up rel!(4.0, 14.0, 2.0, 2.0), // Down + rel!(2.0, 14.0, 2.0, 2.0), // Up rel!(2.0, 16.0, 2.0, 12.0), // North rel!(6.0, 16.0, 2.0, 12.0), // South rel!(0.0, 16.0, 2.0, 12.0), // West diff --git a/src/entity/player.rs b/src/entity/player.rs index 1ab1290..563fedd 100644 --- a/src/entity/player.rs +++ b/src/entity/player.rs @@ -315,16 +315,16 @@ impl ecs::System for PlayerRenderer { let mut head_verts = vec![]; if player_model.has_head { model::append_box(&mut head_verts, -4.0/16.0, 0.0, -4.0/16.0, 8.0/16.0, 8.0/16.0, 8.0/16.0, [ - srel!(8.0, 0.0, 8.0, 8.0), // Up srel!(16.0, 0.0, 8.0, 8.0), // Down + srel!(8.0, 0.0, 8.0, 8.0), // Up srel!(8.0, 8.0, 8.0, 8.0), // North srel!(24.0, 8.0, 8.0, 8.0), // South srel!(16.0, 8.0, 8.0, 8.0), // West srel!(0.0, 8.0, 8.0, 8.0), // East ]); model::append_box(&mut head_verts, -4.2/16.0, -0.2, -4.2/16.0, 8.4/16.0, 8.4/16.0, 8.4/16.0, [ - srel!((8.0 + 32.0), 0.0, 8.0, 8.0), // Up srel!((16.0 + 32.0), 0.0, 8.0, 8.0), // Down + srel!((8.0 + 32.0), 0.0, 8.0, 8.0), // Up srel!((8.0 + 32.0), 8.0, 8.0, 8.0), // North srel!((24.0 + 32.0), 8.0, 8.0, 8.0), // South srel!((16.0 + 32.0), 8.0, 8.0, 8.0), // West @@ -335,16 +335,16 @@ impl ecs::System for PlayerRenderer { // TODO: Cape let mut body_verts = vec![]; model::append_box(&mut body_verts, -4.0/16.0, -6.0/16.0, -2.0/16.0, 8.0/16.0, 12.0/16.0, 4.0/16.0, [ - srel!(20.0, 16.0, 8.0, 4.0), // Up srel!(28.0, 16.0, 8.0, 4.0), // Down + srel!(20.0, 16.0, 8.0, 4.0), // Up srel!(20.0, 20.0, 8.0, 12.0), // North srel!(32.0, 20.0, 8.0, 12.0), // South srel!(16.0, 20.0, 4.0, 12.0), // West srel!(28.0, 20.0, 4.0, 12.0), // East ]); model::append_box(&mut body_verts, -4.2/16.0, -6.2/16.0, -2.2/16.0, 8.4/16.0, 12.4/16.0, 4.4/16.0, [ - srel!(20.0, 16.0 + 16.0, 8.0, 4.0), // Up srel!(28.0, 16.0 + 16.0, 8.0, 4.0), // Down + srel!(20.0, 16.0 + 16.0, 8.0, 4.0), // Up srel!(20.0, 20.0 + 16.0, 8.0, 12.0), // North srel!(32.0, 20.0 + 16.0, 8.0, 12.0), // South srel!(16.0, 20.0 + 16.0, 4.0, 12.0), // West @@ -361,8 +361,8 @@ impl ecs::System for PlayerRenderer { ].into_iter().enumerate() { let (ox, oy) = (offsets[0], offsets[1]); model::append_box(&mut part_verts[i], -2.0/16.0, -12.0/16.0, -2.0/16.0, 4.0/16.0, 12.0/16.0, 4.0/16.0, [ - srel!(ox + 4.0, oy + 0.0, 4.0, 4.0), // Up srel!(ox + 8.0, oy + 0.0, 4.0, 4.0), // Down + srel!(ox + 4.0, oy + 0.0, 4.0, 4.0), // Up srel!(ox + 4.0, oy + 4.0, 4.0, 12.0), // North srel!(ox + 12.0, oy + 4.0, 4.0, 12.0), // South srel!(ox + 0.0, oy + 4.0, 4.0, 12.0), // West @@ -370,8 +370,8 @@ impl ecs::System for PlayerRenderer { ]); let (ox, oy) = (offsets[2], offsets[3]); model::append_box(&mut part_verts[i], -2.2/16.0, -12.2/16.0, -2.2/16.0, 4.4/16.0, 12.4/16.0, 4.4/16.0, [ - srel!(ox + 4.0, oy + 0.0, 4.0, 4.0), // Up srel!(ox + 8.0, oy + 0.0, 4.0, 4.0), // Down + srel!(ox + 4.0, oy + 0.0, 4.0, 4.0), // Up srel!(ox + 4.0, oy + 4.0, 4.0, 12.0), // North srel!(ox + 12.0, oy + 4.0, 4.0, 12.0), // South srel!(ox + 0.0, oy + 4.0, 4.0, 12.0), // West