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

Timestamp:

04/20/09 09:11:32 (15 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -149 +149 @@
 
 bool useSkylightForIllum = true;
-
 bool showFPS = true;
-
 static int globalVisibleId = 0;
-
 PerfTimer applicationTimer;
 
@@ -203 +200 @@
 // ssao parameters
 float ssaoKernelRadius = 1e-8f;
-float ssaoSampleIntensity = 0.2f;
+float ssaoSampleIntensity = .2f;
 float ssaoFilterRadius = 3.0f;
 float ssaoTempCohFactor = 255.0;
@@ -647 +644 @@
         
         // for buddha (lowres)
-        /*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));
 
         // for happy buddha
@@ -658 +655 @@
         // for dragon
         //positions.push_back(Vector3(6.07307, 8.20723, 5.0f));
-        positions.push_back(Vector3(0, 0, -0.8));
+        //positions.push_back(Vector3(0, 0, -0.8));
 
 #endif
@@ -666 +663 @@
         
         //LoadModel("hbuddha.dem", dynamicObjects);
-        LoadModel("horse.dem", dynamicObjects);
-        //LoadModel("happy.dem", dynamicObjects);
+        //LoadModel("horse.dem", dynamicObjects);
+        LoadModel("happy.dem", dynamicObjects);
         //LoadModel("dragon.dem", dynamicObjects);
         //LoadModel("torus.dem", dynamicObjects);
@@ -681 +678 @@
         }
 
+        /*
         const float rotAngle = M_PI / 2.0f;
         const Matrix4x4 rotMatrix = RotationXMatrix(rotAngle);
@@ -689 +687 @@
         dynamicObjects[0]->GetTransform()->MultMatrix(scaleMatrix);
 
-        //dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
-        //dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
-
-        //dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
-        //dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[1]->GetTransform()->MultMatrix(scaleMatrix);
+
+        dynamicObjects[2]->GetTransform()->MultMatrix(rotMatrix);
+        dynamicObjects[2]->GetTransform()->MultMatrix(scaleMatrix);
 
         cout << "dynamic objects: " << (int)dynamicObjects.size() << endl;
-
+        */
         CreateAnimation(positions[0]);
+
 #endif
 
@@ -827 +826 @@
         // buffer holding the difference vector to the old frame
         fbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        //fbo->AddColorBuffer(ColorBufferObject::RGB_UBYTE, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_NEAREST);
@@ -1172 +1172 @@
                 dynamicObjects[i]->GetTransform()->InitFrame();
 
-        if (0)//buddha)
+        if (buddha)
         {
                 Matrix4x4 oldTrafo = buddha->GetTransform()->GetMatrix();
@@ -1194 +1194 @@
 #endif
 
-#if 0
+#if 1
                 /////////////////////////
                 //-- update animations
 
                 //const float rotAngle = M_PI * 1e-3f;
-                //const float rotAngle = 0.3f * M_PI / 180.0f;
-                const float rotAngle = 0.6f * M_PI / 180.0f;
+                const float rotAngle = 0.3f * M_PI / 180.0f;
+                //const float rotAngle = 0.6f * M_PI / 180.0f;
 
                 Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
@@ -1206 +1206 @@
                 dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
+                // hack: second buddha
                 const float rotAngle2 = 0.0033f * M_PI;
-
                 Matrix4x4 rotMatrix2 = RotationZMatrix(rotAngle);
-                // hack: second buddha
                 //dynamicObjects[3]->GetTransform()->MultMatrix(rotMatrix2);
-
 
                 //const float moveSpeed = 5e-3f;