diff --git a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java index 121b906c5..43bba3885 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java @@ -54,21 +54,20 @@ public class AK47ItemModel extends GeoModel { double zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.11f * (float) p); + gun.setPosX(1.96f * (float) p); - gun.setPosY(0.89f * (float) p - (float) (0.6f * zp)); + gun.setPosY(0.25f * (float) p - (float) (0.6f * zp)); - gun.setPosZ(4.4f * (float) p + (float) (0.5f * zp)); + gun.setPosZ(2.5f * (float) p + (float) (0.5f * zp)); gun.setScaleZ(1f - (0.2f * (float) p)); scope.setScaleZ(1f - (0.4f * (float) p)); - gun.setRotZ(-0.087f * (float) p + (float) (0.05f * zp)); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - if (gun.getPosY() > 0.5) { + if (gun.getPosX() > 1.8) { holo.setScaleX(1); holo.setScaleY(1); } else { diff --git a/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java b/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java index 7f9e1d5be..2912fc6b2 100644 --- a/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/RpgItemModel.java @@ -3,6 +3,7 @@ package net.mcreator.target.client.model.item; import net.mcreator.target.item.gun.RpgItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -121,5 +122,12 @@ public class RpgItemModel extends GeoModel { move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java b/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java index 3e04a3b45..99b03fc91 100644 --- a/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/RpkItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.RpkItem; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -152,5 +153,12 @@ public class RpkItemModel extends GeoModel { move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java index c2a170104..a9262b948 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.SvdItem; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -159,5 +160,13 @@ public class SvdItemModel extends GeoModel { move.setRotZ(3.7f * (float) yaw + 2.7f * (float) m); move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/resources/assets/target/animations/ak.animation.json b/src/main/resources/assets/target/animations/ak.animation.json index 7ecb0cdd3..08f8af0bc 100644 --- a/src/main/resources/assets/target/animations/ak.animation.json +++ b/src/main/resources/assets/target/animations/ak.animation.json @@ -46,18 +46,16 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 0] - }, "0.4": { - "vector": [0, 0, -1], - "easing": "easeInOutSine" + "vector": [0, 0, 0] }, "0.5": { - "vector": [1, -1, 1] + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" }, "0.6": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeOutSine" } } } @@ -283,109 +281,6 @@ } } }, - "animation.ak47.hit": { - "animation_length": 0.6, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-147.50541, 34.52809, 101.28078], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [-13.26827, 5.92455, 35.88217], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [3.36, -2.44, -4.42] - }, - "0.2": { - "vector": [8.55, -0.7, -9.85], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [0.97, 0.75, -3.12], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [112.5, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 15, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [135, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-4.29, 19.16875, -9.15] - }, - "0.3": { - "vector": [-6, 16, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - } - } - }, "animation.ak47.fire": { "animation_length": 0.05, "override_previous_animation": true @@ -714,50 +609,51 @@ }, "camera": { "rotation": { - "0.3": { + "0.0": { "vector": [0, 0, 0] }, "0.4": { - "vector": [1, 0, 1], + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, "0.5": { - "vector": [-0.5, 0, -1], - "easing": "easeInElastic" + "vector": [1, 1, -1.5], + "easing": "easeInSine" }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "0.6": { + "vector": [-0.5, -0.5, 1.5] }, - "1.0": { - "vector": [0, 0, 0] + "0.8": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" }, "1.2": { - "vector": [0, 0, 1], - "easing": "easeInElastic" + "vector": [-0.5, 0, 1.5], + "easing": "linear" }, "1.3": { - "vector": [-1, 0, -2], - "easing": "easeInElastic" + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" }, "1.5": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" }, "1.8": { - "vector": [0, 0, 0] + "vector": [0.2, 0, 1.5] }, "1.9": { - "vector": [0, 2, 1], - "easing": "easeInElastic" + "vector": [1, 2, 1.8] }, "2.0": { - "vector": [-1, -1, -2], - "easing": "easeInElastic" + "vector": [-1.5, -3, -1.5] }, "2.2": { + "vector": [0.2, 1.5, 1.5] + }, + "2.5": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeInElastic" } } } @@ -969,35 +865,39 @@ }, "camera": { "rotation": { - "0.3": { + "0.0": { "vector": [0, 0, 0] }, "0.4": { - "vector": [1, 0, 1], + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, "0.5": { - "vector": [-0.5, 0, -1], - "easing": "easeInElastic" + "vector": [1, 1, -1.5], + "easing": "easeInSine" }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "0.6": { + "vector": [-0.5, -0.5, 1.5] }, - "1.0": { - "vector": [0, 0, 0] + "0.8": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" }, "1.2": { - "vector": [0, 0, 1], - "easing": "easeInElastic" + "vector": [-0.5, 0, 1.5], + "easing": "linear" }, "1.3": { - "vector": [-1, 0, -2], - "easing": "easeInElastic" + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" }, "1.5": { + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" + }, + "1.8": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeInElastic" } } } diff --git a/src/main/resources/assets/target/animations/rpg.animation.json b/src/main/resources/assets/target/animations/rpg.animation.json index c2ceb2dcd..e246dee25 100644 --- a/src/main/resources/assets/target/animations/rpg.animation.json +++ b/src/main/resources/assets/target/animations/rpg.animation.json @@ -58,6 +58,24 @@ "position": { "vector": [0, 0, 0] } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -116,24 +134,31 @@ "position": { "vector": [0, 0, 0] } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.5, -0.5, 0.5] + }, + "0.2": { + "vector": [0.5, 0, -0.5] + }, + "0.4": { + "vector": [-0.5, 0.5, 0.5] + }, + "0.6": { + "vector": [0.5, 0, -0.5] + }, + "0.8": { + "vector": [-0.5, -0.5, 0.5] + } + } } } }, "animation.rpg.fire": { "animation_length": 0.1 }, - "animation.rpg.fire2": { - "animation_length": 0.1 - }, - "animation.rpg.fire3": { - "animation_length": 0.1 - }, - "animation.rpg.fire4": { - "animation_length": 0.1 - }, - "animation.rpg.fire5": { - "animation_length": 0.1 - }, "animation.rpg.reload": { "animation_length": 4.5, "bones": { @@ -147,50 +172,50 @@ "easing": "easeInSine" }, "0.7": { - "vector": [-74.37268, -49.19257, 10.03368], + "vector": [-44.37268, -49.19257, 10.03368], "easing": "easeOutSine" }, "1.3": { - "vector": [-65.23038, -50.18962, 14.42416], + "vector": [-27.73038, -42.18962, 6.42416], "easing": "easeInSine" }, - "1.6": { - "vector": [-65.84962, -50.52197, 15.88766], + "1.8": { + "vector": [-28.34962, -39.52197, 9.88766], "easing": "easeOutSine" }, - "1.9": { - "vector": [-70.12808, -50.32256, 15.00956], + "2.0": { + "vector": [-33.12808, -39.32256, 10.00956], "easing": "easeInElastic", "easingArgs": [2] }, "2.2": { - "vector": [-74.87712, -50.12315, 14.13146] + "vector": [-33.87712, -43.87315, 14.13146] }, "2.5": { - "vector": [-69.76903, -49.92374, 13.25337], + "vector": [-35.01903, -45.92374, 13.25337], "easing": "easeInElastic" }, "3.0": { - "vector": [-71.8616, -49.59139, 11.78987] + "vector": [-46.8616, -49.59139, 11.78987] }, "3.2": { - "vector": [-69.19624, -57.02503, 6.84315] + "vector": [-44.19624, -57.02503, 6.84315] }, "3.4": { - "vector": [-69.47501, -56.94619, 6.41633] + "vector": [-36.97501, -56.94619, 6.41633] }, "3.5": { - "vector": [-76.47794, -38.26735, 14.07344] + "vector": [-38.97794, -38.26735, 14.07344] }, "3.6": { - "vector": [-74.37268, -49.19257, 10.03368] + "vector": [-36.87268, -49.19257, 10.03368] }, - "4.1": { - "vector": [16.6001, -11.50887, 2.34743] + "4.0": { + "vector": [25.6001, -5.50887, 2.34743] }, - "4.5": { + "4.4": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutSine" } }, "position": { @@ -198,25 +223,25 @@ "vector": [0, 0, 0] }, "0.7": { - "vector": [-3.1, -8.7, -4.8], + "vector": [-3.1, -8.7, -3.8], "easing": "easeInOutSine" }, "1.3": { "vector": [-2.3, -8.7, -3.45] }, - "1.6": { - "vector": [-2, -8.1, -3] + "1.8": { + "vector": [-2, -8.1, -1] }, - "1.9": { - "vector": [-2.56, -8.69, -1.05], + "2.0": { + "vector": [-2.56, -8.69, 0.95], "easing": "easeInElastic", "easingArgs": [2] }, "2.2": { - "vector": [-2.66, -9.19, -0.86] + "vector": [-2.66, -9.19, 1.14] }, "2.5": { - "vector": [-2.75, -8.48, -0.68], + "vector": [-1.85, -7.78, -1.08], "easing": "easeInElastic" }, "2.8": { @@ -228,12 +253,15 @@ "3.6": { "vector": [-3.1, -8.7, 0] }, - "3.9": { + "3.8": { "vector": [-3.07, -10.12, 0] }, - "4.5": { + "4.0": { + "vector": [-1.7, -5.79, 0] + }, + "4.4": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutSine" } } }, @@ -254,23 +282,25 @@ "1.3": { "vector": [-4.12077, -31.60552, 16.4981] }, - "1.7": { - "vector": [12.4128, -27.92521, 19.50269] + "1.6": { + "vector": [-12.2, -20.4, 5.1] + }, + "1.8": { + "vector": [-17.5872, -12.92521, -2.49731] + }, + "1.9": { + "vector": [-5.5872, -9.92521, -12.49731], + "easing": "easeInOutSine" }, "2.0": { - "vector": [12.4128, -27.92521, 19.50269], + "vector": [-17.5872, -9.92521, -23.49731], "easing": "easeInOutSine" }, - "2.1": { - "vector": [12.4128, -27.92521, 19.50269], - "easing": "easeInOutSine" + "2.3": { + "vector": [-17.5872, -12.92521, 23.50269] }, - "2.2": { - "vector": [12.58795, -39.90252, 20.26197] - }, - "2.4": { - "vector": [12.34021, -24.93133, 19.29786], - "easing": "easeInOutSine" + "2.5": { + "vector": [-17.5872, -12.92521, -2.49731] }, "2.8": { "vector": [11.41661, -4.9823, 17.59188], @@ -315,25 +345,33 @@ "vector": [-0.9, 6.4, -17.3] }, "1.1": { - "vector": [-1.24, 5.52, -26.26] + "vector": [-1.24, 3.52, -20.76] }, "1.3": { - "vector": [0.94, 3.13, -27.38] + "vector": [-0.26, 3.13, -23.58] + }, + "1.6": { + "vector": [-0.28, 1.61, -24.25453] }, "1.7": { - "vector": [-1.8, 3.8, -26.6] + "vector": [-0.29, 1.11, -24.73328] + }, + "1.8": { + "vector": [-0.3, 0.6, -23.47969] + }, + "1.9": { + "vector": [1.8, 4.1, -15.64609], + "easing": "easeInOutSine" }, "2.0": { - "vector": [-1.8, 3.8, -13.3], + "vector": [1.8, 4.1, -14.19141], "easing": "easeInOutSine" }, - "2.1": { - "vector": [-1.8, 3.8, -13.3], - "easing": "easeInOutSine" + "2.3": { + "vector": [-0.3, 0.6, -22.8] }, - "2.4": { - "vector": [-1.8, 3.8, -21.2], - "easing": "easeInOutSine" + "2.5": { + "vector": [-0.3, 0.6, -22.8] }, "2.8": { "vector": [1.2, 3.8, -15.6], @@ -365,12 +403,15 @@ "vector": [0, 0, 0] }, "1.0": { - "vector": [107.53342, 40.96166, 36.36963], + "vector": [50.03342, 40.96166, 36.36963], "easing": "easeInOutSine" }, "1.6": { "vector": [0, 0, 0], "easing": "easeInOutSine" + }, + "2.0": { + "vector": [0, 0, 0] } }, "position": { @@ -378,12 +419,15 @@ "vector": [0, 0, 0] }, "1.0": { - "vector": [4.75, -9.25, 5.7], + "vector": [4.75, -9.25, 8.7], "easing": "easeInOutSine" }, "1.6": { - "vector": [0, 0, 0], + "vector": [-0.2, 0, 3], "easing": "easeInOutSine" + }, + "2.0": { + "vector": [0, 0, 0] } } }, @@ -517,6 +561,62 @@ "vector": [1, 1, 1] } } + }, + "camera": { + "rotation": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [1, 0, -3] + }, + "0.8": { + "vector": [0.8, 0, -1.5] + }, + "1.1": { + "vector": [0.5, 0, -1.5] + }, + "1.5": { + "vector": [-1, 0, -2.8] + }, + "1.8": { + "vector": [0.43, -1.5, -1.5] + }, + "1.9": { + "vector": [-0.8, 2.5, 1.5] + }, + "2.2": { + "vector": [-0.8, 0, -0.75] + }, + "2.6": { + "vector": [0.43, -1.5, -1.5] + }, + "2.7": { + "vector": [-0.8, 2.5, 1.5] + }, + "3.0": { + "vector": [-0.8, 0, -0.75] + }, + "3.2": { + "vector": [-0.36, 0, 0.67] + }, + "3.3": { + "vector": [-0.32, 0.5, -0.45] + }, + "3.4": { + "vector": [-0.05, -0.33, 0.3] + }, + "3.6": { + "vector": [0.5, -2, -2] + }, + "4.0": { + "vector": [1, -0.59, -0.59] + }, + "4.5": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } } diff --git a/src/main/resources/assets/target/animations/rpk.animation.json b/src/main/resources/assets/target/animations/rpk.animation.json index 0abf846e8..ffad76a92 100644 --- a/src/main/resources/assets/target/animations/rpk.animation.json +++ b/src/main/resources/assets/target/animations/rpk.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -237,6 +255,25 @@ "vector": [2.5, -3, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.5, -0.5, 0.5] + }, + "0.2": { + "vector": [0.5, 0, -0.5] + }, + "0.4": { + "vector": [-0.5, 0.5, 0.5] + }, + "0.6": { + "vector": [0.5, 0, -0.5] + }, + "0.8": { + "vector": [-0.5, -0.5, 0.5] + } + } } } }, @@ -244,8 +281,8 @@ "animation_length": 0.05, "override_previous_animation": true }, - "animation.ak47.reload2": { - "animation_length": 3.3, + "animation.ak47.reload": { + "animation_length": 4.2, "override_previous_animation": true, "bones": { "0": { @@ -255,7 +292,7 @@ }, "0.4": { "vector": [-17.28398, -2.37555, -14.63743], - "easing": "easeOutQuad" + "easing": "easeInElastic" }, "0.5": { "vector": [-20.19064, -3.0059, -16.54165] @@ -299,6 +336,478 @@ "easing": "easeInElastic", "easingArgs": [1] }, + "2.9": { + "vector": [-9.48193, -0.91778, 0.31667], + "easing": "easeInElastic" + }, + "3.2": { + "vector": [-6.50386, 0.57584, 8.3899] + }, + "3.4": { + "vector": [-6.41457, 1.87406, -2.05028] + }, + "3.6": { + "vector": [-2.45848, 0.88846, -2.411] + }, + "3.7": { + "vector": [0, 0, 0] + }, + "4.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0.9, 0.3], + "easing": "easeInElastic" + }, + "0.5": { + "vector": [0, 1, 0.3] + }, + "0.6": { + "vector": [0.5, 0.7, 0.1] + }, + "0.7": { + "vector": [0.3, 1, 0.2] + }, + "0.9": { + "vector": [0.4, 0.8, 0.1] + }, + "1.1": { + "vector": [0.5, 1.02, 0.2] + }, + "1.4": { + "vector": [0.4, 1.2, 0.2], + "easing": "easeInElastic" + }, + "1.5": { + "vector": [0.5, 1.1, 0.2] + }, + "1.6": { + "vector": [0.5, 1.1, 0.3] + }, + "1.8": { + "vector": [0.45703, 1.3, 0.3] + }, + "1.9": { + "vector": [0.5, 1.6, 0.3] + }, + "2.0": { + "vector": [0.6, 1, 0.3] + }, + "2.3": { + "vector": [0.7, 0.8, 0.3] + }, + "2.4": { + "vector": [0.3, 1.5, 0.3], + "easing": "easeInElastic", + "easingArgs": [1] + }, + "2.6": { + "vector": [0.1, 0.74, 0.4], + "easing": "easeInElastic" + }, + "2.9": { + "vector": [0, 0, 0.25], + "easing": "easeInElastic" + }, + "3.2": { + "vector": [0, 0, -0.05] + }, + "3.3": { + "vector": [-0.2, 0, 0] + }, + "3.4": { + "vector": [-0.2, 0, 1] + }, + "3.5": { + "vector": [0, 0, 0.65] + }, + "3.6": { + "vector": [0, 0, -0.85] + }, + "3.7": { + "vector": [0, 0, -0.35] + }, + "3.8": { + "vector": [0, 0, 0.23] + }, + "4.0": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [-9, 0, 0], + "easing": "easeInSine" + }, + "0.7": { + "vector": [39.37235, -2.62403, -2.08221] + }, + "1.2": { + "vector": [29.37235, -2.62403, -2.08221] + }, + "1.4": { + "vector": [20.37235, -2.62403, -2.08221] + }, + "1.6": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "1.7": { + "vector": [-9, 0, 0] + }, + "1.8": { + "vector": [7, 0, 0], + "easing": "easeInOutSine" + }, + "1.9": { + "vector": [0, 0, 0] + }, + "2.3": { + "vector": [0, 0, 0] + }, + "2.4": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, 0], + "easing": "easeInSine" + }, + "0.7": { + "vector": [0, -12.67, 2.9] + }, + "1.2": { + "vector": [4, -7.27, 4.1] + }, + "1.4": { + "vector": [1, -4.87, -0.1], + "easing": "easeInSine" + }, + "1.5": { + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0, -0.45625, -0.1], + "easing": "easeInOutQuad" + }, + "1.8": { + "vector": [0, -0.3, 0] + }, + "1.9": { + "vector": [0, -0.1, 0] + }, + "2.3": { + "vector": [0, -0.1, 0] + }, + "2.4": { + "vector": [0, 0, 0], + "easing": "easeInQuad" + } + } + }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [11.03847, -21.81212, -4.69866] + }, + "0.6": { + "vector": [11.03847, -21.81212, -4.69866] + }, + "0.7": { + "vector": [21.40451, 5.32565, 33.55057] + }, + "2.0": { + "vector": [21.40451, 5.32565, 33.55057] + }, + "2.2": { + "vector": [37.59332, -33.68004, 59.98843], + "easing": "easeInElastic" + }, + "2.4": { + "vector": [36.94932, -8.97856, 56.05321], + "easing": "easeInElastic" + }, + "2.5": { + "vector": [36.94932, -8.97856, 56.05321], + "easing": "easeInElastic" + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + }, + "position": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [1.03, 0.2, 4.67] + }, + "0.3": { + "vector": [-0.7, 0.3, 5.8] + }, + "0.6": { + "vector": [-0.7, 0.3, 5.8] + }, + "0.7": { + "vector": [-0.7, -1.2, 5] + }, + "2.0": { + "vector": [-0.7, -1.2, 5] + }, + "2.2": { + "vector": [-2.96, -1.79, 6.99], + "easing": "easeInElastic" + }, + "2.4": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "2.5": { + "vector": [-2.86, -1.59, 7.89], + "easing": "easeInElastic" + }, + "2.7": { + "vector": [0.03, -2, 3.17] + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } + }, + "holo": { + "position": { + "vector": [0, 0, -251] + } + }, + "bolt": { + "position": { + "3.2": { + "vector": [0, 0, 0] + }, + "3.3": { + "vector": [0, 0, 4], + "easing": "easeInCubic" + }, + "3.4": { + "vector": [0, 0, 4], + "easing": "easeInCubic" + }, + "3.6": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "Righthand": { + "rotation": { + "3.0": { + "vector": [0, 0, 0] + }, + "3.1": { + "vector": [8.28212, 20.95701, 9.9358] + }, + "3.2": { + "vector": [-1.95978, 11.17581, -2.65919] + }, + "3.3": { + "vector": [-1.95978, 11.17581, -2.65919] + }, + "3.4": { + "vector": [-1.95978, 11.17581, -2.65919] + }, + "3.5": { + "vector": [-1.95978, 11.17581, -2.65919] + }, + "3.8": { + "vector": [19.28212, 20.95701, 9.9358] + }, + "3.9": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "3.0": { + "vector": [0, 0, 0] + }, + "3.1": { + "vector": [1.6, 2.9, 0] + }, + "3.2": { + "vector": [0.5, 1.9, -5.3] + }, + "3.3": { + "vector": [0.5, 1.9, -1] + }, + "3.4": { + "vector": [0.5, 1.9, -1] + }, + "3.5": { + "vector": [0.5, 1.9, -1] + }, + "3.7": { + "vector": [0.5, 3.5, -5.1] + }, + "3.8": { + "vector": [1.6, 2.9, 0] + }, + "3.9": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1, 1, -1.5], + "easing": "easeInSine" + }, + "0.7": { + "vector": [-0.5, -0.5, 1.5] + }, + "0.9": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" + }, + "1.2": { + "vector": [-0.01, 0, 0.2] + }, + "1.9": { + "vector": [-0.5, 0, 1.5], + "easing": "linear" + }, + "2.0": { + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" + }, + "2.2": { + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [-1, 0.36, 0.39] + }, + "2.4": { + "vector": [1, -0.62, -1.5] + }, + "2.5": { + "vector": [-0.54, 0.36, 1] + }, + "2.7": { + "vector": [0.4, -0.22, -0.5] + }, + "3.2": { + "vector": [0.2, 0, 1.5] + }, + "3.3": { + "vector": [1, 2, 1.8] + }, + "3.4": { + "vector": [-1.5, -3, -1.5] + }, + "3.6": { + "vector": [0.2, 1.5, 1.5] + }, + "3.9": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + } + } + }, + "animation.ak47.reload2": { + "animation_length": 3.3, + "override_previous_animation": true, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [-17.28398, -2.37555, -14.63743], + "easing": "easeInElastic" + }, + "0.5": { + "vector": [-20.19064, -3.0059, -16.54165] + }, + "0.6": { + "vector": [-11.19064, -3.0059, -16.54165] + }, + "0.8": { + "vector": [-19.01737, -3.98795, -19.38168] + }, + "1.0": { + "vector": [-23.01737, -3.98795, -19.38168] + }, + "1.2": { + "vector": [-21.10053, -3.28577, -20.388] + }, + "1.4": { + "vector": [-19.67234, -5.99485, -27.70851], + "easing": "easeInElastic" + }, + "1.5": { + "vector": [-17.23236, -7.16186, -31.56072] + }, + "1.6": { + "vector": [-21.10765, -7.85482, -32.38361] + }, + "1.7": { + "vector": [-22.46727, -6.79785, -29.55227] + }, + "1.9": { + "vector": [-29.6749, -6.03012, -27.69384] + }, + "2.1": { + "vector": [-21.16155, -3.88618, -22.06856] + }, + "2.3": { + "vector": [-20.35191, -7.08161, -30.52207] + }, + "2.4": { + "vector": [-25.35191, -7.08161, -30.52207], + "easing": "easeInElastic", + "easingArgs": [1] + }, "2.9": { "vector": [-4.53295, -0.14832, 1.2287] }, @@ -474,10 +983,10 @@ "0.7": { "vector": [21.40451, 5.32565, 33.55057] }, - "2.0": { + "2.1": { "vector": [21.40451, 5.32565, 33.55057] }, - "2.2": { + "2.3": { "vector": [37.59332, -33.68004, 59.98843], "easing": "easeInElastic" }, @@ -510,10 +1019,10 @@ "0.7": { "vector": [-0.7, -1.2, 5] }, - "2.0": { + "2.1": { "vector": [-0.7, -1.2, 5] }, - "2.2": { + "2.3": { "vector": [-2.96, -1.79, 6.99], "easing": "easeInElastic" }, @@ -538,158 +1047,60 @@ "position": { "vector": [0, 0, -251] } - } - } - }, - "animation.ak47.reload": { - "animation_length": 4.2, - "override_previous_animation": true, - "bones": { - "0": { + }, + "camera": { "rotation": { - "0.0": [0, 0, 0], - "0.4": [-17.28398, -2.37555, -14.63743], - "0.5": [-20.19064, -3.0059, -16.54165], - "0.6": [-11.19064, -3.0059, -16.54165], - "0.8": [-19.01737, -3.98795, -19.38168], - "1.0": [-23.01737, -3.98795, -19.38168], - "1.2": [-21.10053, -3.28577, -20.388], - "1.4": [-19.67234, -5.99485, -27.70851], - "1.5": [-17.23236, -7.16186, -31.56072], - "1.6": [-21.10765, -7.85482, -32.38361], - "1.7": [-22.46727, -6.79785, -29.55227], - "1.9": [-24.6749, -6.03012, -27.69384], - "2.1": [-21.16155, -3.88618, -22.06856], - "2.3": [-20.35191, -7.08161, -30.52207], - "2.4": [-25.35191, -7.08161, -30.52207], - "2.9": [-9.48193, -0.91778, 0.31667], - "3.2": [-6.50386, 0.57584, 8.3899], - "3.4": [-6.41457, 1.87406, -2.05028], - "3.6": [-2.45848, 0.88846, -2.411], - "3.7": [0, 0, 0], - "4.0": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.4": [0, 0.9, 0.3], - "0.5": [0, 1, 0.3], - "0.6": [0.5, 0.7, 0.1], - "0.7": [0.3, 1, 0.2], - "0.9": [0.4, 0.8, 0.1], - "1.1": [0.5, 1.02, 0.2], - "1.4": [0.4, 1.2, 0.2], - "1.5": [0.5, 1.1, 0.2], - "1.6": [0.5, 1.1, 0.3], - "1.8": [0.45703, 1.3, 0.3], - "1.9": [0.5, 1.6, 0.3], - "2.0": [0.6, 1, 0.3], - "2.3": [0.7, 0.8, 0.3], - "2.4": [0.3, 1.5, 0.3], - "2.6": [0.1, 0.74, 0.4], - "2.9": [0, 0, 0.25], - "3.2": [0, 0, -0.05], - "3.3": [-0.2, 0, 0.2], - "3.4": [-0.2, 0, 1], - "3.5": [0, 0, -0.15], - "3.7": [0, 0, -0.35], - "3.8": [0, 0, 0.23], - "4.0": [0, 0, 0] - } - }, - "magazine": { - "rotation": { - "0.0": [0, 0, 0], - "0.3": [0, 0, 0], - "0.5": [-9, 0, 0], - "0.7": [39.37235, -2.62403, -2.08221], - "1.2": [29.37235, -2.62403, -2.08221], - "1.4": [20.37235, -2.62403, -2.08221], - "1.6": [-12.62765, -2.62403, -2.08221], - "1.7": [-9, 0, 0], - "1.8": [7, 0, 0], - "1.9": [0, 0, 0], - "2.3": [0, 0, 0], - "2.4": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.3": [0, 0, 0], - "0.5": [0, 0, 0], - "0.7": [0, -12.67, 2.9], - "1.2": [4, -7.27, 4.1], - "1.4": [1, -4.87, -0.1], - "1.5": [0, -2.27, -0.9], - "1.7": [0, -0.45625, -0.1], - "1.8": [0, -0.3, 0], - "1.9": [0, -0.1, 0], - "2.3": [0, -0.1, 0], - "2.4": [0, 0, 0] - } - }, - "Lefthand": { - "rotation": { - "0.0": [0, 0, 0], - "0.3": [11.03847, -21.81212, -4.69866], - "0.6": [11.03847, -21.81212, -4.69866], - "0.7": [21.40451, 5.32565, 33.55057], - "2.0": [21.40451, 5.32565, 33.55057], - "2.2": [37.59332, -33.68004, 59.98843], - "2.4": [36.94932, -8.97856, 56.05321], - "2.5": [36.94932, -8.97856, 56.05321], - "2.9": [0, 0, 0] - }, - "position": { - "0.1": [0, 0, 0], - "0.2": [1.03, 0.2, 4.67], - "0.3": [-0.7, 0.3, 5.8], - "0.6": [-0.7, 0.3, 5.8], - "0.7": [-0.7, -1.2, 5], - "2.0": [-0.7, -1.2, 5], - "2.2": [-2.96, -1.79, 6.99], - "2.4": [-2.86, -1.59, 7.89], - "2.5": [-2.86, -1.59, 7.89], - "2.7": [0.03, -2, 3.17], - "2.9": [0, 0, 0] - } - }, - "holo": { - "position": [0, 0, -251] - }, - "bolt": { - "position": { - "3.2": [0, 0, 0], - "3.3": [0, 0, 4], - "3.4": [0, 0, 4], - "3.6": [0, 0, 0] - } - }, - "Righthand": { - "rotation": { - "3.0": [0, 0, 0], - "3.1": [8.28212, 20.95701, 9.9358], - "3.2": [-1.95978, 11.17581, -2.65919], - "3.3": [-1.95978, 11.17581, -2.65919], - "3.4": [-1.95978, 11.17581, -2.65919], - "3.7": [19.28212, 20.95701, 9.9358], - "3.8": [0, 0, 0] - }, - "position": { - "3.0": [0, 0, 0], - "3.1": [1.6, 2.9, 0], - "3.2": [0.5, 1.9, -5.3], - "3.3": [0.5, 1.9, -1], - "3.4": [0.5, 1.9, -1], - "3.5": [0.5, 3.5, -5.1], - "3.7": [1.6, 2.9, 0], - "3.8": [0, 0, 0] - } - }, - "bullet": { - "position": { - "0.0": [0, 0, 0], - "0.1": [0, -0.25, 0], - "0.9": [0, -0.25, 0], - "1.0": [0, 0, 0] + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1, 1, -1.5], + "easing": "easeInSine" + }, + "0.7": { + "vector": [-0.5, -0.5, 1.5] + }, + "0.9": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" + }, + "1.2": { + "vector": [-0.01, 0, 0.2] + }, + "1.9": { + "vector": [-0.5, 0, 1.5], + "easing": "linear" + }, + "2.0": { + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" + }, + "2.2": { + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [-1, 0.36, 0.39] + }, + "2.4": { + "vector": [1, -0.62, -1.5] + }, + "2.5": { + "vector": [-0.54, 0.36, 1] + }, + "2.7": { + "vector": [0.4, -0.22, -0.5] + }, + "3.0": { + "vector": [0, 0, 0] + } } } } diff --git a/src/main/resources/assets/target/animations/sks.animation.json b/src/main/resources/assets/target/animations/sks.animation.json index a2b9aa940..dadc01ba3 100644 --- a/src/main/resources/assets/target/animations/sks.animation.json +++ b/src/main/resources/assets/target/animations/sks.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -53,16 +71,13 @@ "vector": [-14.82442, -57.81517, 38.62375] }, "0.2": { - "vector": [-16.82442, -57.81517, 38.62375], - "easing": "easeInSine" + "vector": [-16.82442, -57.81517, 38.62375] }, "0.4": { - "vector": [-14.82442, -57.81517, 38.62375], - "easing": "easeOutSine" + "vector": [-14.82442, -57.81517, 38.62375] }, "0.6": { - "vector": [-12.82442, -57.81517, 38.62375], - "easing": "easeInSine" + "vector": [-12.82442, -57.81517, 38.62375] }, "0.8": { "vector": [-14.82442, -57.81517, 38.62375] @@ -73,16 +88,13 @@ "vector": [2.5, -3, 0] }, "0.2": { - "vector": [0.75, -2.5, 0], - "easing": "easeInSine" + "vector": [0.75, -2.5, 0] }, "0.4": { - "vector": [-0.5, -3, 0], - "easing": "easeOutSine" + "vector": [-0.5, -3, 0] }, "0.6": { - "vector": [0.75, -2.5, 0], - "easing": "easeInSine" + "vector": [0.75, -2.5, 0] }, "0.8": { "vector": [2.5, -3, 0] @@ -256,6 +268,84 @@ } } }, + "bolt": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "1.8": { + "vector": [0, 0, 0] + }, + "1.9": { + "vector": [0, 0, 3.05], + "easing": "easeInQuad" + }, + "2.1": { + "vector": [0, 0, 0] + }, + "2.4": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [-9, 0, 0] + }, + "0.6": { + "vector": [19.37235, -2.62403, -2.08221] + }, + "0.9": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "1.2": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "1.3": { + "vector": [3, 0, 0] + }, + "1.4": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [0, -11.07, 3.1] + }, + "0.9": { + "vector": [0, -6.87, -2.9], + "easing": "easeInSine" + }, + "1.1": { + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" + }, + "1.3": { + "vector": [0, 0.16406, 0], + "easing": "easeInOutQuad" + }, + "1.4": { + "vector": [0, 0, 0] + } + } + }, "Lefthand": { "rotation": { "0.0": { @@ -337,84 +427,6 @@ } } }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-9, 0, 0] - }, - "0.6": { - "vector": [19.37235, -2.62403, -2.08221] - }, - "0.9": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.3": { - "vector": [3, 0, 0] - }, - "1.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, -11.07, 3.1] - }, - "0.9": { - "vector": [0, -6.87, -2.9], - "easing": "easeInSine" - }, - "1.1": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" - }, - "1.3": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" - }, - "1.4": { - "vector": [0, 0, 0] - } - } - }, - "bolt": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.8": { - "vector": [0, 0, 0] - }, - "1.9": { - "vector": [0, 0, 3.05], - "easing": "easeInQuad" - }, - "2.1": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - } - }, "bullet": { "position": { "0.0": { @@ -433,50 +445,51 @@ }, "camera": { "rotation": { - "0.3": { + "0.0": { "vector": [0, 0, 0] }, "0.4": { - "vector": [1, 0, 1], + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, "0.5": { - "vector": [-0.5, 0, -1], - "easing": "easeInElastic" + "vector": [1, 1, -1.5], + "easing": "easeInSine" }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "0.6": { + "vector": [-0.5, -0.5, 1.5] }, - "1.0": { - "vector": [0, 0, 0] + "0.8": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" }, "1.2": { - "vector": [0, 0, 1], - "easing": "easeInElastic" + "vector": [-0.5, 0, 1.5], + "easing": "linear" }, "1.3": { - "vector": [-1, 0, -2], - "easing": "easeInElastic" + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" }, "1.5": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" }, "1.8": { - "vector": [0, 0, 0] + "vector": [0.2, 0, 1.5] }, "1.9": { - "vector": [0, 2, 1], - "easing": "easeInElastic" + "vector": [1, 2, 1.8] }, "2.0": { - "vector": [-1, -1, -2], - "easing": "easeInElastic" + "vector": [-1.5, -3, -1.5] }, "2.2": { + "vector": [0.2, 1.5, 1.5] + }, + "2.5": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeInElastic" } } } @@ -559,52 +572,6 @@ } } }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [13, -5, 13] - }, - "0.3": { - "vector": [0, -4, 0], - "easing": "easeInSine" - }, - "1.4": { - "vector": [0, -4, 0] - }, - "1.5": { - "vector": [13, -5, 13] - }, - "1.7": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.4, -0.4, 2] - }, - "0.3": { - "vector": [-0.7, -1.7, 5.3], - "easing": "easeInSine" - }, - "1.4": { - "vector": [-0.7, -1.7, 5.3] - }, - "1.5": { - "vector": [-1.4, -0.4, 2] - }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - } - }, "magazine": { "rotation": { "0.0": { @@ -663,37 +630,87 @@ } } }, + "Lefthand": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [13, -5, 13] + }, + "0.3": { + "vector": [0, -4, 0], + "easing": "easeInSine" + }, + "1.4": { + "vector": [0, -4, 0] + }, + "1.5": { + "vector": [13, -5, 13] + }, + "1.7": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [-1.4, -0.4, 2] + }, + "0.3": { + "vector": [-0.7, -1.7, 5.3], + "easing": "easeInSine" + }, + "1.4": { + "vector": [-0.7, -1.7, 5.3] + }, + "1.5": { + "vector": [-1.4, -0.4, 2] + }, + "1.8": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, "camera": { "rotation": { - "0.3": { + "0.0": { "vector": [0, 0, 0] }, "0.4": { - "vector": [1, 0, 1], + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, "0.5": { - "vector": [-0.5, 0, -1], - "easing": "easeInElastic" + "vector": [1, 1, -1.5], + "easing": "easeInSine" }, - "0.7": { - "vector": [0, 0, 0], - "easing": "easeOutBack" + "0.6": { + "vector": [-0.5, -0.5, 1.5] }, - "1.0": { - "vector": [0, 0, 0] + "0.8": { + "vector": [0.2, 0, 1.2], + "easing": "easeOutSine" }, "1.2": { - "vector": [0, 0, 1], - "easing": "easeInElastic" + "vector": [-0.5, 0, 1.5], + "easing": "linear" }, "1.3": { - "vector": [-1, 0, -2], - "easing": "easeInElastic" + "vector": [1.5, -0.7, 0.93], + "easing": "easeInSine" }, "1.5": { + "vector": [-0.4, 0.4, -0.6], + "easing": "easeOutSine" + }, + "1.8": { "vector": [0, 0, 0], - "easing": "easeOutBack" + "easing": "easeInElastic" } } } diff --git a/src/main/resources/assets/target/animations/svd.animation.json b/src/main/resources/assets/target/animations/svd.animation.json index 9814e8f85..3c64fed12 100644 --- a/src/main/resources/assets/target/animations/svd.animation.json +++ b/src/main/resources/assets/target/animations/svd.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.6": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -88,6 +106,25 @@ "vector": [2.5, -3, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [-0.5, -0.5, 0.5] + }, + "0.2": { + "vector": [0.5, 0, -0.5] + }, + "0.4": { + "vector": [-0.5, 0.5, 0.5] + }, + "0.6": { + "vector": [0.5, 0, -0.5] + }, + "0.8": { + "vector": [-0.5, -0.5, 0.5] + } + } } } }, @@ -95,6 +132,413 @@ "animation_length": 0.05, "override_previous_animation": true }, + "animation.svd.reload": { + "animation_length": 3.5, + "override_previous_animation": true, + "bones": { + "0": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [-6.75, 17, 57.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [-8.75, 17, 62.5], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [-3.72, 17, 62.43], + "easing": "easeInElastic" + }, + "0.8": { + "vector": [-8.75, 17, 62.5], + "easing": "easeInElastic" + }, + "1.0": { + "vector": [-6.5, 17, 62.5] + }, + "1.5": { + "vector": [-8.25, 17, 62.5], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [-11.25, 17, 60] + }, + "1.8": { + "vector": [-12.25, 17, 58.75] + }, + "2.0": { + "vector": [-11.25, 17, 60] + }, + "2.1": { + "vector": [-11.25, 17, 60] + }, + "2.2": { + "vector": [-14.25, 24, 52], + "easing": "easeInElastic" + }, + "2.3": { + "vector": [-11.25, 18, 53] + }, + "2.6": { + "vector": [-11.25, 17, 60], + "easing": "easeOutSine" + }, + "3.2": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [-0.4, -0.42, 0], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "1.2": { + "vector": [-0.08203, 0.09797, 0], + "easing": "easeInElastic" + }, + "1.5": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [0, 0.18, 0] + }, + "1.8": { + "vector": [0.33594, 0.46906, 0] + }, + "1.9": { + "vector": [-0.3, -0.32, 0], + "easing": "easeInOutSine" + }, + "2.1": { + "vector": [-0.22, -0.24, 0] + }, + "2.2": { + "vector": [-0.14, -0.45, 1.3] + }, + "2.4": { + "vector": [-0.14, -0.25, 0] + }, + "2.5": { + "vector": [-0.06, -0.01, 0.3] + }, + "3.0": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "Lefthand": { + "rotation": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, -51], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [0, 0, -51], + "easing": "linear" + }, + "2.5": { + "vector": [0, 0, -51], + "easing": "easeOutSine" + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + }, + "position": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [1.5, 7, -0.6], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1.5, 7, -0.6], + "easing": "linear" + }, + "2.5": { + "vector": [1.5, 7, -0.6], + "easing": "easeOutSine" + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [37.37235, -2.62403, -53.08221], + "easing": "easeInSine" + }, + "1.3": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "1.6": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "1.7": { + "vector": [3, 0, 0] + }, + "1.8": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [6.5, -29.97, -0.9], + "easing": "easeInSine" + }, + "1.3": { + "vector": [0, -9.27, -0.9], + "easing": "easeInSine" + }, + "1.5": { + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0, 0.16406, 0], + "easing": "easeInOutQuad" + }, + "1.8": { + "vector": [0, 0, 0] + } + } + }, + "Righthand": { + "rotation": { + "0.2": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [6, 9, -9.25], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [6, 9, -9.25], + "easing": "easeInOutSine" + }, + "1.0": { + "vector": [6, 15, -9.25], + "easing": "easeInOutSine" + }, + "1.9": { + "vector": [6, 15, -9.25], + "easing": "easeInOutSine" + }, + "2.0": { + "vector": [-1.5, 10.75, -20.46] + }, + "2.1": { + "vector": [-9, 20.5, -1.67] + }, + "2.2": { + "vector": [-9, 20.5, -1.67] + }, + "2.3": { + "vector": [-9, 20.5, -1.67] + }, + "2.4": { + "vector": [-2.92, 6.66, -15.54] + }, + "2.7": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + }, + "position": { + "0.2": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [1.9, 0.5, -6.1], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [1.9, 0.5, -6.1], + "easing": "easeInOutSine" + }, + "1.0": { + "vector": [2.9, -0.6, -4.8], + "easing": "easeInOutSine" + }, + "1.9": { + "vector": [2.9, -0.6, -4.8], + "easing": "easeInOutSine" + }, + "2.1": { + "vector": [0.22484, 0.97688, -4.16], + "easing": "easeInSine" + }, + "2.2": { + "vector": [0.22, 0.98, -2.26] + }, + "2.3": { + "vector": [0.22, 0.98, -2.26] + }, + "2.4": { + "vector": [0.07, -0.78, -1.64] + }, + "2.7": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "bone35": { + "rotation": { + "2.1": { + "vector": [0, 0, 0] + }, + "2.2": { + "vector": [0, 0, 0], + "easing": "easeInSine" + }, + "2.3": { + "vector": [0, 0, 0] + }, + "2.4": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + }, + "position": { + "2.1": { + "vector": [0, 0, 0] + }, + "2.2": { + "vector": [0, 0, 1.5], + "easing": "easeInSine" + }, + "2.3": { + "vector": [0, 0, 1.5] + }, + "2.4": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "bullet": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [0, -1, 0] + }, + "1.0": { + "vector": [0, -1, 0] + }, + "1.1": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, -1.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1, -1, 1.5], + "easing": "easeInSine" + }, + "0.7": { + "vector": [-0.5, 0.5, -1.5] + }, + "0.9": { + "vector": [0.2, 0, -1.2], + "easing": "easeOutSine" + }, + "1.2": { + "vector": [-0.01, 0, -0.2] + }, + "1.6": { + "vector": [-0.5, 0, -1.5], + "easing": "linear" + }, + "1.7": { + "vector": [1.5, 0.7, -0.93], + "easing": "easeInSine" + }, + "1.9": { + "vector": [-0.4, -0.4, 0.6], + "easing": "easeOutSine" + }, + "2.0": { + "vector": [0.2, 0, -1.5] + }, + "2.1": { + "vector": [1, -2, -1.8] + }, + "2.2": { + "vector": [-1.5, 3, 1.5] + }, + "2.4": { + "vector": [0.2, -1.5, -1.5] + }, + "2.7": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + } + }, + "sound_effects": { + "0.0": { + "effect": "svd_reload_empty" + } + } + }, "animation.svd.reload2": { "animation_length": 2.7, "override_previous_animation": true, @@ -341,6 +785,52 @@ "easing": "easeInElastic" } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, -1.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1, -1, 1.5], + "easing": "easeInSine" + }, + "0.7": { + "vector": [-0.5, 0.5, -1.5] + }, + "0.9": { + "vector": [0.2, 0, -1.2], + "easing": "easeOutSine" + }, + "1.2": { + "vector": [-0.01, 0, -0.2] + }, + "1.6": { + "vector": [-0.5, 0, -1.5], + "easing": "linear" + }, + "1.7": { + "vector": [1.5, 0.7, -0.93], + "easing": "easeInSine" + }, + "1.9": { + "vector": [-0.4, -0.4, 0.6], + "easing": "easeOutSine" + }, + "2.0": { + "vector": [0.2, 0, -1.5] + }, + "2.4": { + "vector": [0, 0, 0] + } + } } }, "sound_effects": { @@ -348,362 +838,6 @@ "effect": "svd_reload_normal" } } - }, - "animation.svd.reload": { - "animation_length": 3.5, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-6.75, 17, 57.5], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-3.72, 17, 62.43], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" - }, - "1.0": { - "vector": [-6.5, 17, 62.5] - }, - "1.5": { - "vector": [-8.25, 17, 62.5], - "easing": "easeInElastic" - }, - "1.7": { - "vector": [-11.25, 17, 60] - }, - "1.8": { - "vector": [-12.25, 17, 58.75] - }, - "2.0": { - "vector": [-11.25, 17, 60] - }, - "2.1": { - "vector": [-11.25, 17, 60] - }, - "2.2": { - "vector": [-11.25, 21, 56] - }, - "2.3": { - "vector": [-11.25, 18, 53] - }, - "2.5": { - "vector": [-11.25, 17, 60] - }, - "3.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" - }, - "0.7": { - "vector": [-0.4, -0.42, 0], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" - }, - "1.2": { - "vector": [-0.08203, 0.09797, 0], - "easing": "easeInElastic" - }, - "1.5": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" - }, - "1.7": { - "vector": [0, 0.18, 0] - }, - "1.8": { - "vector": [0.33594, 0.46906, 0] - }, - "1.9": { - "vector": [-0.3, -0.32, 0], - "easing": "easeInOutSine" - }, - "2.1": { - "vector": [-0.22, -0.24, 0] - }, - "2.2": { - "vector": [-0.14, -0.45, 1.1] - }, - "2.3": { - "vector": [-0.14, -0.45, 1.1] - }, - "2.4": { - "vector": [-0.06, -0.01, -0.4] - }, - "3.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "Lefthand": { - "rotation": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, -51], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [0, 0, -51], - "easing": "linear" - }, - "2.5": { - "vector": [0, 0, -51], - "easing": "easeOutSine" - }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.1": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [1.5, 7, -0.6], - "easing": "easeInElastic" - }, - "0.6": { - "vector": [1.5, 7, -0.6], - "easing": "linear" - }, - "2.5": { - "vector": [1.5, 7, -0.6], - "easing": "easeOutSine" - }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - }, - "0.9": { - "vector": [37.37235, -2.62403, -53.08221], - "easing": "easeInSine" - }, - "1.3": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.6": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.7": { - "vector": [3, 0, 0] - }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - }, - "0.9": { - "vector": [6.5, -29.97, -0.9], - "easing": "easeInSine" - }, - "1.3": { - "vector": [0, -9.27, -0.9], - "easing": "easeInSine" - }, - "1.5": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" - }, - "1.7": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" - }, - "1.8": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [6, 9, -9.25], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [6, 9, -9.25], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" - }, - "2.0": { - "vector": [-1.5, 10.75, -20.46] - }, - "2.1": { - "vector": [-9, 20.5, -1.67] - }, - "2.2": { - "vector": [-9, 20.5, -1.67] - }, - "2.3": { - "vector": [-9, 20.5, -1.67] - }, - "2.4": { - "vector": [-9, 20.5, -1.67] - }, - "2.6": { - "vector": [-2.92, 6.66, -15.54] - }, - "3.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [1.9, 0.5, -6.1], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [1.9, 0.5, -6.1], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "2.1": { - "vector": [0.22484, 0.97688, -4.16], - "easing": "easeInSine" - }, - "2.2": { - "vector": [0.22, 0.98, -2.26] - }, - "2.3": { - "vector": [0.22, 0.98, -2.26] - }, - "2.4": { - "vector": [0.22484, 0.97688, -5.06], - "easing": "linear" - }, - "2.6": { - "vector": [0.07, -0.78, -1.64] - }, - "3.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "bone35": { - "rotation": { - "2.1": { - "vector": [0, 0, 0] - }, - "2.2": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "2.3": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "2.1": { - "vector": [0, 0, 0] - }, - "2.2": { - "vector": [0, 0, 1.5], - "easing": "easeInSine" - }, - "2.3": { - "vector": [0, 0, 1.5] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "bullet": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, -1, 0] - }, - "1.0": { - "vector": [0, -1, 0] - }, - "1.1": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "svd_reload_empty" - } - } } }, "geckolib_format_version": 2 diff --git a/src/main/resources/assets/target/geo/rpg.geo.json b/src/main/resources/assets/target/geo/rpg.geo.json index 3e0704e8b..b2f78c59f 100644 --- a/src/main/resources/assets/target/geo/rpg.geo.json +++ b/src/main/resources/assets/target/geo/rpg.geo.json @@ -11,6 +11,10 @@ "visible_bounds_offset": [0, 2, 0] }, "bones": [ + { + "name": "camera", + "pivot": [3.27141, 3.46276, 7.77702] + }, { "name": "root", "pivot": [0, 0, 0] diff --git a/src/main/resources/assets/target/geo/rpk.geo.json b/src/main/resources/assets/target/geo/rpk.geo.json index 99daa8f12..5adb1d30b 100644 --- a/src/main/resources/assets/target/geo/rpk.geo.json +++ b/src/main/resources/assets/target/geo/rpk.geo.json @@ -7,10 +7,14 @@ "texture_width": 128, "texture_height": 128, "visible_bounds_width": 43, - "visible_bounds_height": 13, - "visible_bounds_offset": [0, 3.5, 0] + "visible_bounds_height": 6, + "visible_bounds_offset": [0, 0, 0] }, "bones": [ + { + "name": "camera", + "pivot": [2.57141, 4.96276, 6.77702] + }, { "name": "root", "pivot": [0, 0, 0] @@ -1371,6 +1375,8 @@ { "origin": [0.38563, 4.17874, -0.99492], "size": [0.23009, 0.19554, 0.89945], + "pivot": [0.7693, 4.73666, 0.25223], + "rotation": [0, 0, 0], "uv": { "north": {"uv": [32, 83], "uv_size": [0.25, 0.25]}, "east": {"uv": [63, 32], "uv_size": [1, 0.25]}, @@ -2448,6 +2454,8 @@ { "origin": [0.4112, 4.30727, 1.25598], "size": [0.17896, 0.06398, 0.56388], + "pivot": [0.7096, 4.74121, 1.53792], + "rotation": [0, 0, 0], "uv": { "north": {"uv": [82, 41], "uv_size": [0.25, 0.25]}, "east": {"uv": [69, 67], "uv_size": [0.5, 0.25]}, @@ -2740,6 +2748,8 @@ { "origin": [0.40135, 4.25778, 0.75598], "size": [0.19864, 0.07101, 0.56953], + "pivot": [0.73259, 4.73946, 1.56893], + "rotation": [0, 0, 0], "uv": { "north": {"uv": [82, 50], "uv_size": [0.25, 0.25]}, "east": {"uv": [16, 70], "uv_size": [0.5, 0.25]}, @@ -10903,49 +10913,6 @@ } ] }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0.47939, 1.74351, -1.31168], - "cubes": [ - { - "origin": [0.30036, 1.56448, -1.97461], - "size": [0.35805, 0.35805, 1.07423], - "uv": { - "north": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]}, - "down": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]} - } - }, - { - "origin": [0.34656, 1.61068, -2.52224], - "size": [0.26565, 0.26565, 1.76047], - "uv": { - "north": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [64.75, 84.25], "uv_size": [0.75, 3.25]}, - "down": {"uv": [64.75, 84.25], "uv_size": [0.75, 3.25]} - } - }, - { - "origin": [0.30036, 1.56448, -0.80798], - "size": [0.35805, 0.35805, 0.0924], - "uv": { - "north": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]}, - "down": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]} - } - } - ] - }, { "name": "Righthand", "parent": "0", diff --git a/src/main/resources/assets/target/geo/svd.geo.json b/src/main/resources/assets/target/geo/svd.geo.json index 99f600d0d..c3a3cb5f9 100644 --- a/src/main/resources/assets/target/geo/svd.geo.json +++ b/src/main/resources/assets/target/geo/svd.geo.json @@ -11,6 +11,10 @@ "visible_bounds_offset": [0, -0.5, 0] }, "bones": [ + { + "name": "camera", + "pivot": [2.57141, 4.96276, 6.77702] + }, { "name": "root", "pivot": [0, 0, 0] diff --git a/src/main/resources/assets/target/models/displaysettings/ak47.item.json b/src/main/resources/assets/target/models/displaysettings/ak47.item.json index da2b943a7..099dbc417 100644 --- a/src/main/resources/assets/target/models/displaysettings/ak47.item.json +++ b/src/main/resources/assets/target/models/displaysettings/ak47.item.json @@ -6,98 +6,18 @@ 128 ], "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 0.5, - 0.75 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - 0.5, - 0.75 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, "firstperson_righthand": { - "rotation": [ - 0, - 0, - 5 - ], "translation": [ - 1.75, - -12.75, - -18.25 - ], - "scale": [ - 4, - 4, - 4 + -6.5, + 3.5, + 4.25 ] }, "firstperson_lefthand": { - "translation": [ - -1, - 3, - 2.5 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "gui": { - "rotation": [ - 30, - -145, - 0 - ], - "translation": [ 0, - 0.25, - 0 - ], - "scale": [ - 3.5, - 3.5, - 3.5 - ] - }, - "fixed": { - "rotation": [ 0, - 90, 0 - ], - "translation": [ - 0.5, - -0.25, - -1.5 - ], - "scale": [ - 1.1, - 1.1, - 1.1 ] } }