Changeset 3359 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

04/17/09 09:09:14 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (4 diffs)

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

@@ -646 +646 @@
         // sibenik positions
         VertexArray positions;
-        //positions.push_back(Vector3(6.07307, 8.20723, 6.7));
-        positions.push_back(Vector3(6.07307, 8.20723, 6.62));
+        
+        /*positions.push_back(Vector3(6.07307, 8.20723, 6.62));
         positions.push_back(Vector3(-17.1935, 11.1687, 8.8781));
-        positions.push_back(Vector3(1.50032, 31.1943, 19.1f));
+        positions.push_back(Vector3(1.50032, 31.1943, 19.1f));*/
+
+        positions.push_back(Vector3(6.07307, 8.20723, 4.6f));
+        positions.push_back(Vector3(-17.1935, 11.1687, 6.8f));
+        positions.push_back(Vector3(1.50032, 31.1943, 17.6f));
 
 #endif
@@ -671 +675 @@
         }
 
-        const float rotAngle = M_PI / 180.0f;
-        const Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
+        const float rotAngle = M_PI / 2.0f;
+        const Matrix4x4 rotMatrix = RotationXMatrix(rotAngle);
+        const Matrix4x4 scaleMatrix = ScaleMatrix(14, 14, 14);
+
         // hack: second buddha
-        //dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
-
-        
+        dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[0]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[0]->GetTransform()->MultMatrix(scaleMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
+        dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
+
+        cout << "dynamic objects: " << (int)dynamicObjects.size() << endl;
+
+        // hack
         resourceManager->mUseNormalMapping = false;
         resourceManager->mUseSpecialColors = false;
@@ -1146 +1159 @@
 void MainLoop() 
 {       
-        if (buddha)
+        for (size_t i = 0; i < dynamicObjects.size(); ++ i)
+                dynamicObjects[i]->GetTransform()->InitFrame();
+
+        if (0)//buddha)
         {
                 Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
@@ -1180 +1196 @@
                 dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
-                const float rotAngle2 = 0.6f * M_PI / 180.0f;
+                const float rotAngle2 = 0.0033f * M_PI;
 
                 Matrix4x4 rotMatrix2 = RotationZMatrix(rotAngle);