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

Timestamp:

02/17/09 19:21:52 (15 years ago)

Author:

mattausch

Message:

surpressed blur, worked on object placing in sibenik (why performance worse than vienna??)

File:

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

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

@@ -286 +286 @@
 float viewCellsScaleFactor = 1.0f;
 
+float maxConvergence = 2000.0f;
+
+
 
 //////////////
@@ -377 +380 @@
 inline float KeyShift() { return keyForwardMotion * elapsedTime * 1e-3f; }
 
-void CreateAnimation();
+void CreateAnimation(const Vector3 &pos);
 
 SceneQuery *GetOrCreateSceneQuery();
@@ -390 +393 @@
 
 void LoadOrUpdatePVSs(const Vector3 &pos);
+
+void CreateNewInstance(SceneEntity *parent, const Vector3 &pos);
+
+
+/////////////
 
 string envFileName = "default.env";
@@ -626 +634 @@
 
 #if 1
-        const Vector3 sceneCenter(470.398f, 240.364f, 181.7f);
+
+#if 0
+        VertexArray positions;
+        positions.push_back(Vector3(478.398f, 268.0f, 181.3));
+        positions.push_back(Vector3(470.461, 268.543, 181.7));
+        positions.push_back(Vector3(499.648, 264.358, 181.7));
+        positions.push_back(Vector3(487.913, 285.162, 181.7));
+
+#else
+
+        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(-17.1935, 11.1687, 8.8781));
+        //positions.push_back(Vector3(499.648, 264.358, 181.7));
+        //positions.push_back(Vector3(487.913, 285.162, 181.7));
+
+#endif
+
         //const Vector3 sceneCenter(470.398f, 240.364f, 180.3);
-        Matrix4x4 transl = TranslationMatrix(sceneCenter);
+        Matrix4x4 transl = TranslationMatrix(positions[0]);
         
         LoadModel("hbuddha.dem", dynamicObjects);
@@ -635 +661 @@
         buddha->GetTransform()->SetMatrix(transl);
 
-        for (int i = 0; i < 10; ++ i)
-        {
-                SceneEntity *ent = new SceneEntity(*buddha);
-                resourceManager->AddSceneEntity(ent);
-
-                Vector3 offs = Vector3::ZERO();
-
-                offs.x = RandomValue(.0f, 50.0f);
-                offs.y = RandomValue(.0f, 50.0f);
-
-                Vector3 newPos = sceneCenter + offs;
-
-                transl = TranslationMatrix(newPos);
-                Transform3 *transform = resourceManager->CreateTransform(transl);
-
-                ent->SetTransform(transform);
-                dynamicObjects.push_back(ent);
-        }
+        
+        for (size_t i = 1; i < positions.size(); ++ i)
+        {
+                CreateNewInstance(buddha, positions[i]);
+        }
+
 #endif
 
@@ -706 +720 @@
         preetham = new SkyPreetham(turbitity, skyDome);
 
-        CreateAnimation();
+        CreateAnimation(positions[0]);
 
 
@@ -1151 +1165 @@
 
                 //const float rotAngle = M_PI * 1e-3f;
-                const float rotAngle = 0.3f * M_PI / 180.0f;
-                //const float rotAngle = 1.0f * 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);
+                // hack: second buddha
                 dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
-                const float moveSpeed = 5e-3f;
+                //const float moveSpeed = 5e-3f;
+                const float moveSpeed = 1e-1f;
                 motionPath->Move(moveSpeed);
         }
@@ -1412 +1428 @@
                 deferredShader->SetUseToneMapping(useHDR);
                 deferredShader->SetUseAntiAliasing(useAntiAliasing);
+                deferredShader->SetMaxConvergence(maxConvergence);
 
 
@@ -1582 +1599 @@
                 traverser->SetUseOptimization(useOptimization);
                 break;*/
+        case 'o':
+        case 'O':
+                if (maxConvergence > 100.0f)
+                        maxConvergence = 1.0f;
+                else 
+                        maxConvergence = 5000.0f;
+
+                cout << "max convergence: " << maxConvergence << endl;
+
+                break;
         case 'l':
         case 'L':
@@ -2595 +2622 @@
 
 
-void CreateAnimation()
-{
-        const float radius = 5.0f;
-        //const Vector3 center(480.398f, 268.364f, 181.3);
-        const Vector3 center(480.398f, 269.364f, 181.3);
+void CreateAnimation(const Vector3 &pos)
+{
+        //const float b = 5.0f; const float a = 1.5f;
+        const float a = 5.0f; const float b = 1.5f;
 
         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);
+        for (int i = 0; i < 360; ++ i)
+        {
+                const float angle = (float)i * M_PI / 180.0f;
+
+                Vector3 offs = Vector3(cos(angle) * a, sin(angle) * b, 0);
+                vertices.push_back(pos + offs);
+        }
+
+        /*for (int i = 0; i < 5; ++ i)
+        {
+                Vector3 offs = Vector3(i, 0, 0);
+                vertices.push_back(center + offs);
+        }
+        
+        for (int i = 0; i < 5; ++ i)
+        {
+                Vector3 offs = Vector3(4 - i, 0, 0);
                 vertices.push_back(center + offs);
         }*/
 
-        for (int i = 0; i < 5; ++ i)
-        {
-                Vector3 offs = Vector3(i, 0, 0);
-                vertices.push_back(center + offs);
-        }
-
-        
-        for (int i = 0; i < 5; ++ i)
-        {
-                Vector3 offs = Vector3(4 -i, 0, 0);
-                vertices.push_back(center + offs);
-        }
-
         motionPath = new MotionPath(vertices);
 }
+
 
 /** This function returns the number of visible pixels of a
@@ -2805 +2831 @@
         if (viewCellsTree) UpdatePvs(pos);
 }
+
+
+void CreateNewInstance(SceneEntity *parent, const Vector3 &pos)
+{
+        SceneEntity *ent = new SceneEntity(*parent);
+        resourceManager->AddSceneEntity(ent);
+
+        Matrix4x4 transl = TranslationMatrix(pos);
+        Transform3 *transform = resourceManager->CreateTransform(transl);
+
+        ent->SetTransform(transform);
+        dynamicObjects.push_back(ent);
+        //Debug << "positions: " << newPos << endl;
+}