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

Timestamp:

11/12/08 01:47:27 (16 years ago)

Author:

mattausch

Message:

worked on filtering now trying to reduce flickering (have to reorder ssao function quite much

File:

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

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

@@ -301 +301 @@
 void CreateAnimation();
 
-
-// the new and the old viewProjection matrix of the current camera
+SceneQuery *GetOrCreateSceneQuery();
+
+
+// new view projection matrix of the camera
 static Matrix4x4 viewProjMat = IdentityMatrix();
+// the old view projection matrix of the camera
 static Matrix4x4 oldViewProjMat = IdentityMatrix();
 
@@ -463 +466 @@
         //-- load some dynamic stuff
 
-        LoadModel("fisch.dem", dynamicObjects);
-        //LoadModel("hbuddha.dem", dynamicObjects);
+        //LoadModel("fisch.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -482 +485 @@
                 offs.y = RandomValue(.0f, 50.0f);
 
-                transl = TranslationMatrix(sceneCenter + offs);
+                Vector3 newPos = sceneCenter + offs;
+
+                transl = TranslationMatrix(newPos);
                 Transform3 *transform = resourceManager->CreateTransform(transl);
 
@@ -912 +917 @@
         buddha->GetTransform()->SetMatrix(trafo);
 
+        /*for (int i = 0; i < 10; ++ i)
+        {
+                SceneEntity *ent = dynamicObjects[i];
+                Vector3 newPos = ent->GetWorldCenter();
+
+                if (GetOrCreateSceneQuery()->CalcIntersection(newPos))
+                {
+                        Matrix4x4 mat = TranslationMatrix(newPos - ent->GetCenter());// + Vector3(0, 0, ent->GetBoundingBox().Size(2) * 0.5f));
+                        ent->GetTransform()->SetMatrix(mat);
+                }
+        }*/
+
         Matrix4x4 rotMatrix = RotationZMatrix(M_PI * 1e-3f);
-
         dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+
 
 
@@ -2007 +2024 @@
 
 
+SceneQuery *GetOrCreateSceneQuery()
+{
+        if (!sceneQuery)
+                sceneQuery = new SceneQuery(bvh->GetBox(), traverser, &renderState);
+
+        return sceneQuery;
+}
+
+
 void PlaceViewer(const Vector3 &oldPos)
 {
-        if (!sceneQuery)
-        {
-                sceneQuery = new SceneQuery(bvh->GetBox(), traverser, &renderState);
-        }
-
         Vector3 playerPos = camera->GetPosition();
-        bool validIntersect = sceneQuery->CalcIntersection(playerPos);
+        bool validIntersect = GetOrCreateSceneQuery()->CalcIntersection(playerPos);
 
         if (validIntersect)