first person hand bone alignment work
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit

This commit is contained in:
austin 2024-07-28 17:47:54 -04:00
parent 6ea1daa747
commit e0b94b334c
4 changed files with 5 additions and 6 deletions

View File

@ -238,10 +238,10 @@
"equipPointId" : "handRight", "equipPointId" : "handRight",
"bone" : "Hand.R", "bone" : "Hand.R",
"firstPersonBone" : "hand.R", "firstPersonBone" : "hand.R",
"offsetVectorFirstPerson" : [0,0,0], "offsetVectorFirstPerson" : [-0.05,0.04,-0.09],
"offsetVectorThirdPerson" : [0.02,-0.06,0], "offsetVectorThirdPerson" : [0.02,-0.06,0],
"offsetRotationThirdPerson" : [-0.334,0.145,-0.28,0.89], "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, "canBlock" : true,
"equipClassWhitelist" : [ "equipClassWhitelist" : [
"tool", "tool",

View File

@ -11,4 +11,3 @@
option to load all data cells in scene on initializing a scene (thereby loading spawn points into memory) option to load all data cells in scene on initializing a scene (thereby loading spawn points into memory)
+ bug fixes + bug fixes
fix client-attached models to viewmodel drawing on previous frame

View File

@ -474,7 +474,7 @@ Creature data validation
Unify animation format data on disk Unify animation format data on disk
Leverage animation masks to block while moving Leverage animation masks to block while moving
Remove Airplane movement system Remove Airplane movement system
Fix client-attached models to viewmodel drawing on previous frame
# TODO # TODO

View File

@ -265,7 +265,7 @@ public class ImGuiEntityMacros {
ImGui.text("Bone (First Person): " + point.getFirstPersonBone()); ImGui.text("Bone (First Person): " + point.getFirstPersonBone());
//offsets //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)){ if(ImGui.sliderFloat3("[Third Person] Offset", vectorValuesThirdPerson, MINIMUM_OFFSET, MAXIMUM_OFFSET)){
Vector3d offset = new Vector3d(vectorValuesThirdPerson[0],vectorValuesThirdPerson[1],vectorValuesThirdPerson[2]); Vector3d offset = new Vector3d(vectorValuesThirdPerson[0],vectorValuesThirdPerson[1],vectorValuesThirdPerson[2]);
List<Float> newValues = new LinkedList<Float>(); List<Float> newValues = new LinkedList<Float>();
@ -278,7 +278,7 @@ public class ImGuiEntityMacros {
AttachUtils.setVectorOffset(equippedEntity, AttachUtils.getEquipPointVectorOffset(point.getOffsetVectorThirdPerson())); 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)){ if(ImGui.sliderFloat3("[First Person] Offset", vectorValuesFirstPerson, MINIMUM_OFFSET, MAXIMUM_OFFSET)){
Vector3d offset = new Vector3d(vectorValuesFirstPerson[0],vectorValuesFirstPerson[1],vectorValuesFirstPerson[2]); Vector3d offset = new Vector3d(vectorValuesFirstPerson[0],vectorValuesFirstPerson[1],vectorValuesFirstPerson[2]);
List<Float> newValues = new LinkedList<Float>(); List<Float> newValues = new LinkedList<Float>();