From e0b94b334ce23b77cc8b9dd08bee2871abec637b Mon Sep 17 00:00:00 2001 From: austin Date: Sun, 28 Jul 2024 17:47:54 -0400 Subject: [PATCH] first person hand bone alignment work --- assets/Data/creatures/human.json | 4 ++-- docs/src/progress/currenttarget.md | 1 - docs/src/progress/renderertodo.md | 2 +- src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index b196c938..50ea5e8b 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -238,10 +238,10 @@ "equipPointId" : "handRight", "bone" : "Hand.R", "firstPersonBone" : "hand.R", - "offsetVectorFirstPerson" : [0,0,0], + "offsetVectorFirstPerson" : [-0.05,0.04,-0.09], "offsetVectorThirdPerson" : [0.02,-0.06,0], "offsetRotationThirdPerson" : [-0.334,0.145,-0.28,0.89], - "offsetRotationFirstPerson" : [0.923,-0.143,-0.232,0.24], + "offsetRotationFirstPerson" : [0.02,-0.977,-0.211,-0.005], "canBlock" : true, "equipClassWhitelist" : [ "tool", diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 779e9f92..25a47f35 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -11,4 +11,3 @@ option to load all data cells in scene on initializing a scene (thereby loading spawn points into memory) + bug fixes - fix client-attached models to viewmodel drawing on previous frame diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 27db4fea..f7973102 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -474,7 +474,7 @@ Creature data validation Unify animation format data on disk Leverage animation masks to block while moving Remove Airplane movement system - +Fix client-attached models to viewmodel drawing on previous frame # TODO diff --git a/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java b/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java index 4112ffec..75a7736d 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java +++ b/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java @@ -265,7 +265,7 @@ public class ImGuiEntityMacros { ImGui.text("Bone (First Person): " + point.getFirstPersonBone()); //offsets - ImGui.text("[Third Person] Offset: " + AttachUtils.getEquipPointRotationOffset(point.getOffsetRotationThirdPerson())); + ImGui.text("[Third Person] Offset: " + AttachUtils.getEquipPointVectorOffset(point.getOffsetVectorThirdPerson())); if(ImGui.sliderFloat3("[Third Person] Offset", vectorValuesThirdPerson, MINIMUM_OFFSET, MAXIMUM_OFFSET)){ Vector3d offset = new Vector3d(vectorValuesThirdPerson[0],vectorValuesThirdPerson[1],vectorValuesThirdPerson[2]); List newValues = new LinkedList(); @@ -278,7 +278,7 @@ public class ImGuiEntityMacros { AttachUtils.setVectorOffset(equippedEntity, AttachUtils.getEquipPointVectorOffset(point.getOffsetVectorThirdPerson())); } } - ImGui.text("[First Person] Offset: " + AttachUtils.getEquipPointRotationOffset(point.getOffsetRotationFirstPerson())); + ImGui.text("[First Person] Offset: " + AttachUtils.getEquipPointVectorOffset(point.getOffsetVectorFirstPerson())); if(ImGui.sliderFloat3("[First Person] Offset", vectorValuesFirstPerson, MINIMUM_OFFSET, MAXIMUM_OFFSET)){ Vector3d offset = new Vector3d(vectorValuesFirstPerson[0],vectorValuesFirstPerson[1],vectorValuesFirstPerson[2]); List newValues = new LinkedList();