提交: 43740aa7143d09fb7e81aba0b7a19f18aae0bf8a - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• 修订版: 43740aa7143d09fb7e81aba0b7a19f18aae0bf8a (tree)
• 时间: 2003-12-03 05:08:09
• 作者: mojomonkey <mojomonkey@75d0...>
• Commiter: mojomonkey

Log Message

added quaternion to matrix code.
Allow spatial to be rotated via quaternions.

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@160 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

更改概述

• modified: src/com/jme/math/Quaternion.java
• modified: src/com/jme/renderer/LWJGLRenderer.java
• modified: src/com/jme/scene/Spatial.java
• modified: src/com/jme/test/util/TestTimer.java

差异

--- a/src/com/jme/math/Quaternion.java
+++ b/src/com/jme/math/Quaternion.java
@@ -41,7 +41,7 @@ package com.jme.math;
  * {x y z w}.
  * 
  * @author Mark Powell
- * @version $Id: Quaternion.java,v 1.1 2003-11-24 15:07:44 mojomonkey Exp $
+ * @version $Id: Quaternion.java,v 1.2 2003-12-02 20:08:09 mojomonkey Exp $
  */
 public class Quaternion {
     public float x, y, z, w;
@@ -217,6 +217,33 @@ public class Quaternion {
         }
 
     }
+    
+    /**
+     * 
+     * <code>toRotationMatrix</code> converts this quaternion to a rotational
+     * matrix.
+     * @return the rotation matrix representation of this quaternion.
+     */
+    public Matrix3f toRotationMatrix( ) {
+        
+        Matrix3f matrix = new Matrix3f();
+        matrix.set(0, 0, (1.0f - 2.0f * (y * y + z * z)));
+        matrix.set(0, 1, (2.0f * (x * y - w * z)));
+        matrix.set(0, 2, (2.0f * (x * z + w * y)));
+        
+        // Second row
+        matrix.set(1, 0, (2.0f * (x * y + w * z)));
+        matrix.set(1, 1, (1.0f - 2.0f * (x * x + z * z)));
+        matrix.set(1, 2, (2.0f * (y * z - w * x)));
+       
+        // Third row
+        matrix.set(2, 0, (2.0f * (x * z - w * y)));
+        matrix.set(2, 1, (2.0f * (y * z + w * x)));
+        matrix.set(2, 2, (1.0f - 2.0f * (x * x + y * y)));
+        
+        return matrix;
+            
+    }
 
     /**
      * <code>fromAngleAxis</code> sets this quaternion to the values

--- a/src/com/jme/renderer/LWJGLRenderer.java
+++ b/src/com/jme/renderer/LWJGLRenderer.java
@@ -74,7 +74,7 @@ import com.jme.util.LoggingSystem;
  * <code>Renderer</code> interface using the LWJGL API.
  * @see com.jme.renderer.Renderer
  * @author Mark Powell
- * @version $Id: LWJGLRenderer.java,v 1.6 2003-12-01 13:18:58 mojomonkey Exp $
+ * @version $Id: LWJGLRenderer.java,v 1.7 2003-12-02 20:08:09 mojomonkey Exp $
  */
 public class LWJGLRenderer implements Renderer {
     //clear color
@@ -689,6 +689,7 @@ public class LWJGLRenderer implements Renderer {
         Matrix3f rotation = t.getWorldRotation();
         Vector3f translation = t.getWorldTranslation();
         float scale = t.getWorldScale();
+        
         float[] modelToWorld =
             {
                 scale * rotation.get(0, 0),

--- a/src/com/jme/scene/Spatial.java
+++ b/src/com/jme/scene/Spatial.java
@@ -34,6 +34,7 @@ package com.jme.scene;
 import java.io.Serializable;
 
 import com.jme.math.Matrix3f;
+import com.jme.math.Quaternion;
 import com.jme.math.Vector3f;
 import com.jme.renderer.Camera;
 import com.jme.renderer.Renderer;
@@ -45,7 +46,7 @@ import com.jme.scene.state.RenderState;
  * transforms. All other nodes, such as <code>Node</code> and 
  * <code>Geometry</code> are subclasses of <code>Spatial</code>.
  * @author Mark Powell
- * @version $Id: Spatial.java,v 1.4 2003-10-23 21:24:18 mojomonkey Exp $
+ * @version $Id: Spatial.java,v 1.5 2003-12-02 20:08:09 mojomonkey Exp $
  */
 public abstract class Spatial implements Serializable {
     //rotation matrices
@@ -308,6 +309,16 @@ public abstract class Spatial implements Serializable {
     public void setLocalRotation(Matrix3f localRotation) {
         this.localRotation = localRotation;
     }
+    
+    /**
+     * 
+     * <code>setLocalRotation</code> sets the local rotation of this node, using
+     * a quaterion to build the matrix.
+     * @param quaternion the quaternion that defines the matrix.
+     */
+    public void setLocalRotation(Quaternion quaternion) {
+        this.localRotation = quaternion.toRotationMatrix();
+    }
 
     /**
      * <code>getLocalScale</code> retrieves the local scale of this node.

--- a/src/com/jme/test/util/TestTimer.java
+++ b/src/com/jme/test/util/TestTimer.java
@@ -37,6 +37,7 @@ import com.jme.input.FirstPersonController;
 import com.jme.input.InputController;
 import com.jme.light.DirectionalLight;
 import com.jme.light.SpotLight;
+import com.jme.math.Quaternion;
 import com.jme.math.Vector3f;
 import com.jme.renderer.Camera;
 import com.jme.renderer.ColorRGBA;
@@ -59,7 +60,7 @@ import com.jme.util.Timer;
 /**
  * <code>TestLightState</code>
  * @author Mark Powell
- * @version $Id: TestTimer.java,v 1.3 2003-12-01 13:18:58 mojomonkey Exp $
+ * @version $Id: TestTimer.java,v 1.4 2003-12-02 20:08:09 mojomonkey Exp $
  */
 public class TestTimer extends AbstractGame {
     private TriMesh t;
@@ -70,6 +71,9 @@ public class TestTimer extends AbstractGame {
     private InputController input;
     private Thread thread;
     private Timer timer;
+    private Quaternion rotQuat;
+    private float angle = 0;
+    private Vector3f axis;
 
     /**
      * Entry point for the test, 
@@ -93,9 +97,18 @@ public class TestTimer extends AbstractGame {
      * @see com.jme.app.AbstractGame#update()
      */
     protected void update() {
+        if(timer.getTimePerFrame() < 1) {
+            angle = angle + (timer.getTimePerFrame() * 1);
+            if(angle > 360) {
+                angle = 0;
+            }
+        }
+        rotQuat.fromAngleAxis(angle, axis);
         timer.update();
         input.update(timer.getTimePerFrame());
         text.print("Frame Rate: " + timer.getFrameRate());
+        scene.setLocalRotation(rotQuat);
+        scene.updateGeometricState(0.0f, true);
         
        
     }
@@ -136,7 +149,7 @@ public class TestTimer extends AbstractGame {
         ColorRGBA blackColor = new ColorRGBA(0, 0, 0, 1);
         display.getRenderer().setBackgroundColor(blackColor);
         cam.setFrustum(1.0f, 1000.0f, -0.55f, 0.55f, 0.4125f, -0.4125f);
-        Vector3f loc = new Vector3f(0.0f, 0.0f, 4.0f);
+        Vector3f loc = new Vector3f(0.0f, 0.0f, 75.0f);
         Vector3f left = new Vector3f(-1.0f, 0.0f, 0.0f);
         Vector3f up = new Vector3f(0.0f, 1.0f, 0.0f);
         Vector3f dir = new Vector3f(0.0f, 0f, -1.0f);
@@ -149,6 +162,8 @@ public class TestTimer extends AbstractGame {
         timer = Timer.getTimer("LWJGL");
         
         display.getRenderer().setCullingMode(Renderer.CULL_BACK);
+        rotQuat = new Quaternion();
+        axis = new Vector3f(1,1,1);
 
     }