Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/com/sekwah/sekcphysics/ragdoll/parts/trackers/TrackerTriangle.java
sekwah41 · Sep 22, 2017 · 8debdc7 · 8debdc7
2 parents 579e595 + 5e542ff
commit 8debdc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/sekwah/sekcphysics/ragdoll/parts/trackers/TrackerVertex.java b/src/main/java/com/sekwah/sekcphysics/ragdoll/parts/trackers/TrackerVertex.java
@@ -44,15 +44,15 @@ public void calcPosition() {
 
         this.updateLastPos();
 
-        PointF constraintVert = new PointF((float) (anchor.posX - pointsTo.posX), (float) (anchor.posY - pointsTo.posY),
-                (float) (anchor.posZ - pointsTo.posZ));
+        PointF constraintVert = new PointF((float) (pointsTo.posX - anchor.posX), (float) (pointsTo.posY - anchor.posY),
+                (float) (pointsTo.posZ - anchor.posZ));
 
         // TODO need to flip these around, they are getting the location right but the opposite side then rotating backwards casing it to be flipped
 
 
         this.rotation.y = basicRotation(constraintVert.x, constraintVert.z);
 
-        this.rotation.x = (float) (Math.PI * -0.5) + basicRotation(-constraintVert.y, (float) Math.sqrt(constraintVert.x * constraintVert.x + constraintVert.z * constraintVert.z));
+        this.rotation.x = (float) (Math.PI * 0.5) + basicRotation(-constraintVert.y, (float) Math.sqrt(constraintVert.x * constraintVert.x + constraintVert.z * constraintVert.z));
 
         //this.rotation.x = (float) (Math.PI) / 2 + basicRotation(-constraintVert.y, (float) Math.sqrt(Math.pow(constraintVert.x,2) + Math.pow(constraintVert.z,2)));
 

diff --git a/src/main/resources/assets/sekcphysics/ragdolldata/minecraft.json b/src/main/resources/assets/sekcphysics/ragdolldata/minecraft.json
@@ -67,11 +67,11 @@
       },
       "triangleTrackers" : {
         "bipedBody":{
-          "tracker" : "body",
-          "rotOffX" : 180
+          "tracker" : "body"
         },
         "bipedHead":{
-          "tracker" : "head"
+          "tracker" : "head",
+          "rotOffX" : 180
         }
       }
     }