repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 18da91b21a3cf5362e64026115a280678c7b8fc0:
path_to: 
revision_to: 

commit 18da91b21a3cf5362e64026115a280678c7b8fc0
Author: James Baicoianu 
Date:   Thu Apr 21 00:23:35 2016 -0700

    Fix object rotation

diff --git a/scripts/object.js b/scripts/object.js

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -36,9 +36,8 @@ elation.require(['engine.things.generic'], function() {
         var speed = (rotate_speed * Math.PI/180);
         var axisparts = rotate_axis.split(' ');
         var axis = new THREE.Vector3().set(axisparts[0], axisparts[1], axisparts[2]);
-        var q = new THREE.Quaternion().setFromAxisAngle(axis, speed);
-        var vel = new THREE.Euler().setFromQuaternion(q);
-        this.objects.dynamics.setAngularVelocity(vel);
+        axis.multiplyScalar(speed);
+        this.objects.dynamics.setAngularVelocity(axis);
       }

       if (this.properties.collision_id) {

-----END OF PAGE-----