Changeset 3078 for GTP

Timestamp:

10/29/08 10:19:11 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Matrix4x4.cpp (modified) (2 diffs)
• MotionPath.cpp (modified) (5 diffs)
• MotionPath.h (modified) (1 diff)
• chcdemo.cpp (modified) (11 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Matrix4x4.cpp

@@ -1 +1 @@
 #include "Matrix4x4.h"
 #include "Vector3.h"
-
-// standard headers
 #include "AxisAlignedBox3.h"
-#include <iomanip>
+
 
 using namespace std;
+
 
 namespace CHCDemoEngine 
@@ -625 +624 @@
                 for (int j = 0; j < 4; j++) { // x
                         //  x  y 
-                        s << setprecision(4) << setw(10) << M.x[j][i];
+                        s << M.x[j][i];
                 }
                 s << '\n';

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/MotionPath.cpp

@@ -1 +1 @@
 #include "MotionPath.h"
+#include "Matrix4x4.h"
 
 
@@ -7 +8 @@
 
 MotionPath::MotionPath(const VertexArray &vertices):
-mVertices(vertices), mCurrentVertexIdx(0)
+mVertices(vertices), mCurrentVertexIdx(0), mT(.0f)
 {
 }
@@ -14 +15 @@
 void MotionPath::Move(float velocity)
 {
+        mT += velocity;
+
+        if (mT >= 1.0f)
+        {
+                mCurrentVertexIdx = (mCurrentVertexIdx + 1) % (int)mVertices.size();
+                mT -= 1.0f;
+        }
 }
 
@@ -19 +27 @@
 Vector3 MotionPath::GetCurrentPosition() const
 {
-        return mT * mVertices[mCurrentVertexIdx] + (1.0f - mT) * mVertices[(mCurrentVertexIdx + 1) % mVertices.size()];
+        return (1.0f - mT) * mVertices[mCurrentVertexIdx] + mT * mVertices[(mCurrentVertexIdx + 1) % mVertices.size()];
 }
 
@@ -32 +40 @@
 {
         mCurrentVertexIdx = 0;
+        mT = 0;
+}
+
+
+Matrix4x4 MotionPath::GetOrientation()
+{
+        Vector3 dir = mVertices[(mCurrentVertexIdx + 1) % mVertices.size()] - mVertices[mCurrentVertexIdx];
+        Vector3 ndir = -Normalize(dir);
+
+        float pitch = -atan2(ndir.x, ndir.y);
+        float yaw = atan2(ndir.z, sqrt((ndir.x * ndir.x) + (ndir.y * ndir.y)));
+
+        
+        Matrix4x4 roty = RotationYMatrix(pitch);
+        Matrix4x4 rotx = RotationXMatrix(yaw);
+
+        return roty * rotx;
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/MotionPath.h

@@ -34 +34 @@
         void Reset();
 
+        Matrix4x4 GetOrientation();
+
 
 protected:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -54 +54 @@
 #include "Texture.h"
 #include "ShaderManager.h"
+#include "MotionPath.h"
 
 
@@ -103 +104 @@
 SkyPreetham *preetham = NULL;
 
+MotionPath *motionPath = NULL;
 
 
@@ -142 +144 @@
 
 int shadowSize = 2048;
-
 /// the hud font
 glfont::GLFont myfont;
@@ -276 +277 @@
 /// Creates the traversal method (vfc, stopandwait, chc, chc++)
 RenderTraverser *CreateTraverser(PerspectiveCamera *cam);
-
 /// place the viewer on the floor plane
 void PlaceViewer(const Vector3 &oldPos);
@@ -293 +293 @@
 inline float KeyShift() { return keyForwardMotion * elapsedTime * 1e-3f; }
 
+void CreateAnimation();
+
+
 // the new and the old viewProjection matrix of the current camera
 static Matrix4x4 viewProjMat = IdentityMatrix();
@@ -455 +458 @@
         //-- load some dynamic stuff
 
-        /*LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -479 +482 @@
         }
 
-*/
+
         ///////////
         //-- load the associated static bvh
@@ -512 +515 @@
         const float turbitiy = 5.0f;
         preetham = new SkyPreetham(turbitiy, skyDome);
+
+        CreateAnimation();
 
 
@@ -870 +875 @@
 void MainLoop() 
 {       
-        /*Vector3 offs = Vector3::ZERO();
-        offs.x = RandomValue(-.1f, .1f);
-        offs.y = RandomValue(-.1f, .1f);
-        //offs.x = RandomValue(.0f, .01f);
-        //offs.y = RandomValue(.0f, .01f);
-
-        Matrix4x4 mat = TranslationMatrix(offs);
-        buddha->GetTransform()->MultMatrix(mat);
-*/
+        motionPath->Move(0.3f);
+
+        Vector3 planepos = motionPath->GetCurrentPosition();
+
+        Matrix4x4 mat = TranslationMatrix(planepos);
+        buddha->GetTransform()->SetMatrix(mat);
+
         Vector3 oldPos = camera->GetPosition();
 
@@ -1673 +1676 @@
         DEL_PTR(shadowMap);
         DEL_PTR(shadowTraverser);
+        DEL_PTR(motionPath);
 
         ResourceManager::DelSingleton();
@@ -2044 +2048 @@
         }
 }
+
+
+void CreateAnimation()
+{
+        const float radius = 5.0f;
+        const Vector3 center(483.398f, 242.364f, 186.078f);
+
+        VertexArray vertices;
+
+        for (int i = 0; i < 360; ++ i)
+        {
+                float angle = (float)i * M_PI / 180.0f;
+
+                Vector3 offs = Vector3(cos(angle) * radius, sin(angle) * radius, 0);
+                vertices.push_back(center + offs);
+        }
+
+        motionPath = new MotionPath(vertices);
+}