car can now turn!

TomDDH · Feb 7, 2013 · 74d2e05 · 74d2e05
1 parent de01bcc
commit 74d2e05
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/build/cannon.js b/build/cannon.js
@@ -5681,12 +5681,17 @@ CANNON.HingeConstraint = function(bodyA, pivotA, axisA, bodyB, pivotB, axisB, ma
     // Update 
     this.update = function(){
         // Update world positions of pivots
+        /*
         bodyB.position.vsub(bodyA.position,normal.ni);
         normal.ni.normalize();
+        */
+       normal.ni.set(1,0,0);
+       t1.ni.set(0,1,0);
+       t2.ni.set(0,0,1);
         bodyA.quaternion.vmult(pivotA,normal.ri);
         bodyB.quaternion.vmult(pivotB,normal.rj);
 
-        normal.ni.tangents(t1.ni,t2.ni);
+        //normal.ni.tangents(t1.ni,t2.ni);
         normal.ri.copy(t1.ri);
         normal.rj.copy(t1.rj);
         normal.ri.copy(t2.ri);

diff --git a/build/cannon.min.js b/build/cannon.min.js
diff --git a/demos/rotational.html b/demos/rotational.html
@@ -28,11 +28,11 @@
 
         demo.addScene("car",function(){
             var world = demo.getWorld();
-            world.gravity.set(0,0,-5);
+            world.gravity.set(0,0,-20);
 
             var groundMaterial = new CANNON.Material("groundMaterial");
             var wheelMaterial = new CANNON.Material("wheelMaterial");
-            var wheelGroundContactMaterial = new CANNON.ContactMaterial(groundMaterial,wheelMaterial, 0.1, 0.3);
+            var wheelGroundContactMaterial = new CANNON.ContactMaterial(groundMaterial,wheelMaterial, 0.5, 0.3);
             world.addContactMaterial(wheelGroundContactMaterial);
 
             var wheelShape =      new CANNON.Sphere(1.2);
@@ -60,8 +60,8 @@
             var leftFrontAxis =  new CANNON.Vec3(0,1,0);
             var rightFrontAxis = new CANNON.Vec3(0,-1,0);
             if(true){
-                leftFrontAxis =  new CANNON.Vec3(-0.3,0.7,0);
-                rightFrontAxis = new CANNON.Vec3(0.3,-0.7,0);
+                leftFrontAxis =  new CANNON.Vec3(0.3,0.7,0);
+                rightFrontAxis = new CANNON.Vec3(-0.3,-0.7,0);
                 leftFrontAxis.normalize();
                 rightFrontAxis.normalize();
             }
@@ -92,7 +92,7 @@
             var frontRightHinge = constraints[3];
             frontLeftHinge.enableMotor();
             frontRightHinge.enableMotor();
-            var v = -8;
+            var v = -14;
             frontLeftHinge.motorTargetVelocity = v;
             frontRightHinge.motorTargetVelocity = -v;
 

diff --git a/src/constraints/HingeConstraint.js b/src/constraints/HingeConstraint.js
@@ -64,12 +64,17 @@ CANNON.HingeConstraint = function(bodyA, pivotA, axisA, bodyB, pivotB, axisB, ma
     // Update 
     this.update = function(){
         // Update world positions of pivots
+        /*
         bodyB.position.vsub(bodyA.position,normal.ni);
         normal.ni.normalize();
+        */
+       normal.ni.set(1,0,0);
+       t1.ni.set(0,1,0);
+       t2.ni.set(0,0,1);
         bodyA.quaternion.vmult(pivotA,normal.ri);
         bodyB.quaternion.vmult(pivotB,normal.rj);
 
-        normal.ni.tangents(t1.ni,t2.ni);
+        //normal.ni.tangents(t1.ni,t2.ni);
         normal.ri.copy(t1.ri);
         normal.rj.copy(t1.rj);
         normal.ri.copy(t2.ri);