From 5d08b027e64e81c444c2e21ff260fc2cdd0e4883 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 11 Aug 2020 19:22:12 -0400 Subject: [PATCH] Remove Pitch Edge-Case --- .../com/thebrokenrail/gestus/emote/Emote.java | 2 +- .../data/gestus/emotes/builtin/aim.emote | 2 +- .../data/gestus/emotes/builtin/hit.emote | 14 ++++++------ .../data/gestus/emotes/builtin/ride.emote | 2 +- .../data/gestus/emotes/builtin/shield.emote | 2 +- .../data/gestus/emotes/builtin/sprint.emote | 18 +++++++-------- .../data/gestus/emotes/builtin/trident.emote | 2 +- .../data/gestus/emotes/builtin/walk.emote | 22 +++++++++---------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/thebrokenrail/gestus/emote/Emote.java b/src/main/java/com/thebrokenrail/gestus/emote/Emote.java index 4ce5aaa..a9b8791 100644 --- a/src/main/java/com/thebrokenrail/gestus/emote/Emote.java +++ b/src/main/java/com/thebrokenrail/gestus/emote/Emote.java @@ -70,7 +70,7 @@ public class Emote { String rollStr = lineParts[++i]; float yaw = Float.parseFloat(yawStr); - float pitch = -Float.parseFloat(pitchStr); + float pitch = Float.parseFloat(pitchStr); float roll = Float.parseFloat(rollStr); map.put(selectedPart, new EulerAngle(pitch, yaw, roll)); diff --git a/src/main/resources/data/gestus/emotes/builtin/aim.emote b/src/main/resources/data/gestus/emotes/builtin/aim.emote index 7e14163..334570a 100644 --- a/src/main/resources/data/gestus/emotes/builtin/aim.emote +++ b/src/main/resources/data/gestus/emotes/builtin/aim.emote @@ -1 +1 @@ -main_arm 0 90 0 off_arm 40 90 0 \ No newline at end of file +main_arm 0 -90 0 off_arm 40 -90 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/hit.emote b/src/main/resources/data/gestus/emotes/builtin/hit.emote index f057d2a..1fec505 100644 --- a/src/main/resources/data/gestus/emotes/builtin/hit.emote +++ b/src/main/resources/data/gestus/emotes/builtin/hit.emote @@ -1,9 +1,9 @@ main_arm 0 0 0 -main_arm -8.5 17 0 -main_arm -17 34 0 -main_arm -25.5 51 0 -main_arm -34 68 0 -main_arm -25.5 51 0 -main_arm -17 34 0 -main_arm -8.5 17 0 +main_arm -8.5 -17 0 +main_arm -17 -34 0 +main_arm -25.5 -51 0 +main_arm -34 -68 0 +main_arm -25.5 -51 0 +main_arm -17 -34 0 +main_arm -8.5 -17 0 main_arm 0 0 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/ride.emote b/src/main/resources/data/gestus/emotes/builtin/ride.emote index 94640c4..39a2dd2 100644 --- a/src/main/resources/data/gestus/emotes/builtin/ride.emote +++ b/src/main/resources/data/gestus/emotes/builtin/ride.emote @@ -1 +1 @@ -right_leg 24 71 0 left_leg -24 71 0 \ No newline at end of file +right_leg 24 -71 0 left_leg -24 -71 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/shield.emote b/src/main/resources/data/gestus/emotes/builtin/shield.emote index 691e6a4..da9a0aa 100644 --- a/src/main/resources/data/gestus/emotes/builtin/shield.emote +++ b/src/main/resources/data/gestus/emotes/builtin/shield.emote @@ -1 +1 @@ -main_arm -42 90 0 \ No newline at end of file +main_arm -42 -90 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/sprint.emote b/src/main/resources/data/gestus/emotes/builtin/sprint.emote index ed4d5e3..be92b89 100644 --- a/src/main/resources/data/gestus/emotes/builtin/sprint.emote +++ b/src/main/resources/data/gestus/emotes/builtin/sprint.emote @@ -1,13 +1,4 @@ right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 -right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 -right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 -right_arm 0 42 0 left_arm 0 -42 0 left_leg 0 42 0 right_leg 0 -42 0 -right_arm 0 56 0 left_arm 0 -56 0 left_leg 0 56 0 right_leg 0 -56 0 -right_arm 0 56 0 left_arm 0 -56 0 left_leg 0 56 0 right_leg 0 -56 0 -right_arm 0 42 0 left_arm 0 -42 0 left_leg 0 42 0 right_leg 0 -42 0 -right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 -right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 -right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 right_arm 0 -14 0 left_arm 0 14 0 left_leg 0 -14 0 right_leg 0 14 0 right_arm 0 -28 0 left_arm 0 28 0 left_leg 0 -28 0 right_leg 0 28 0 right_arm 0 -42 0 left_arm 0 42 0 left_leg 0 -42 0 right_leg 0 42 0 @@ -16,4 +7,13 @@ right_arm 0 -56 0 left_arm 0 56 0 left_leg 0 -56 0 right_leg 0 56 0 right_arm 0 -42 0 left_arm 0 42 0 left_leg 0 -42 0 right_leg 0 42 0 right_arm 0 -28 0 left_arm 0 28 0 left_leg 0 -28 0 right_leg 0 28 0 right_arm 0 -14 0 left_arm 0 14 0 left_leg 0 -14 0 right_leg 0 14 0 +right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 +right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 +right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 +right_arm 0 42 0 left_arm 0 -42 0 left_leg 0 42 0 right_leg 0 -42 0 +right_arm 0 56 0 left_arm 0 -56 0 left_leg 0 56 0 right_leg 0 -56 0 +right_arm 0 56 0 left_arm 0 -56 0 left_leg 0 56 0 right_leg 0 -56 0 +right_arm 0 42 0 left_arm 0 -42 0 left_leg 0 42 0 right_leg 0 -42 0 +right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 +right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/trident.emote b/src/main/resources/data/gestus/emotes/builtin/trident.emote index 51e2368..e16282e 100644 --- a/src/main/resources/data/gestus/emotes/builtin/trident.emote +++ b/src/main/resources/data/gestus/emotes/builtin/trident.emote @@ -1 +1 @@ -main_arm 0 180 0 \ No newline at end of file +main_arm 0 -180 0 \ No newline at end of file diff --git a/src/main/resources/data/gestus/emotes/builtin/walk.emote b/src/main/resources/data/gestus/emotes/builtin/walk.emote index 391be6d..6c5e30b 100644 --- a/src/main/resources/data/gestus/emotes/builtin/walk.emote +++ b/src/main/resources/data/gestus/emotes/builtin/walk.emote @@ -1,15 +1,4 @@ right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 -right_arm 0 7 0 left_arm 0 -7 0 left_leg 0 7 0 right_leg 0 -7 0 -right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 -right_arm 0 21 0 left_arm 0 -21 0 left_leg 0 21 0 right_leg 0 -21 0 -right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 -right_arm 0 35 0 left_arm 0 -35 0 left_leg 0 35 0 right_leg 0 -35 0 -right_arm 0 35 0 left_arm 0 -35 0 left_leg 0 35 0 right_leg 0 -35 0 -right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 -right_arm 0 21 0 left_arm 0 -21 0 left_leg 0 21 0 right_leg 0 -21 0 -right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 -right_arm 0 7 0 left_arm 0 -7 0 left_leg 0 7 0 right_leg 0 -7 0 -right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 right_arm 0 -7 0 left_arm 0 7 0 left_leg 0 -7 0 right_leg 0 7 0 right_arm 0 -14 0 left_arm 0 14 0 left_leg 0 -14 0 right_leg 0 14 0 right_arm 0 -21 0 left_arm 0 21 0 left_leg 0 -21 0 right_leg 0 21 0 @@ -20,4 +9,15 @@ right_arm 0 -28 0 left_arm 0 28 0 left_leg 0 -28 0 right_leg 0 28 0 right_arm 0 -21 0 left_arm 0 21 0 left_leg 0 -21 0 right_leg 0 21 0 right_arm 0 -14 0 left_arm 0 14 0 left_leg 0 -14 0 right_leg 0 14 0 right_arm 0 -7 0 left_arm 0 7 0 left_leg 0 -7 0 right_leg 0 7 0 +right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 +right_arm 0 7 0 left_arm 0 -7 0 left_leg 0 7 0 right_leg 0 -7 0 +right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 +right_arm 0 21 0 left_arm 0 -21 0 left_leg 0 21 0 right_leg 0 -21 0 +right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 +right_arm 0 35 0 left_arm 0 -35 0 left_leg 0 35 0 right_leg 0 -35 0 +right_arm 0 35 0 left_arm 0 -35 0 left_leg 0 35 0 right_leg 0 -35 0 +right_arm 0 28 0 left_arm 0 -28 0 left_leg 0 28 0 right_leg 0 -28 0 +right_arm 0 21 0 left_arm 0 -21 0 left_leg 0 21 0 right_leg 0 -21 0 +right_arm 0 14 0 left_arm 0 -14 0 left_leg 0 14 0 right_leg 0 -14 0 +right_arm 0 7 0 left_arm 0 -7 0 left_leg 0 7 0 right_leg 0 -7 0 right_arm 0 0 0 left_arm 0 0 0 left_leg 0 0 0 right_leg 0 0 0 \ No newline at end of file