Changeset 3268 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

01/11/09 22:54:05 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• BvhConstructor.cpp (modified) (2 diffs)
• SceneEntity.cpp (modified) (2 diffs)
• SkyPreetham.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)

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

@@ -130 +130 @@
                 // no split could be achieved => just halve number of objects
                 split = (leaf->mLast + leaf->mFirst) / 2;
-                cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                //cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << endl;
         }
 
@@ -185 +185 @@
         BvhLeaf *l = new BvhLeaf(NULL);
         
-        l->mBox = SceneEntity::ComputeBoundingBox(mEntities + mFirst, mFirst - mLast + 1);
-
         l->mFirst = mFirst;
         l->mLast = mLast;
+
+        cout << "constructing bvh from "  << l->mFirst << " to " << l->mLast << endl;
+
+        l->mBox = SceneEntity::ComputeBoundingBox(mEntities + mFirst, mLast - mFirst + 1);
         l->mArea = l->mBox.SurfaceArea();
         
-        cout << "constructing bvh from "  << l->mFirst << " to " << l->mLast << endl;
-
         root = SubdivideLeaf(l, 0);
 

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

@@ -187 +187 @@
         AxisAlignedBox3 box;
         
-        if (!numEntities)
+        if (numEntities <= 0)
         {       // no box => just initialize
                 box.Initialize();
@@ -209 +209 @@
         AxisAlignedBox3 box;
         
-        if (!entities.empty())
+        if (entities.empty())
         {       // no box => just initialize
                 box.Initialize();

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

@@ -109 +109 @@
 
         // scale the sky dome so no intersection with the scene is visible
-        //const float scaleFactor = 80.0f;
-        const float scaleFactor = 500.0f;
+        const float scaleFactor = 80.0f;
+        //const float scaleFactor = 500.0f;
 
         position.z -= 3.0f * scaleFactor;

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

@@ -587 +587 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        LoadModel("procedural_pompeii_area6_hires/pompeii.dem", dynamicObjects);
-
+        //LoadModel("procedural_pompeii_area6_hires/pompeii.dem", dynamicObjects);
+/*
         AxisAlignedBox3 box;
         box.Initialize();
@@ -603 +603 @@
 
         cout << "pompeii bb:\n" << box << endl;
-
+*/
 #if 0
         const Vector3 sceneCenter(470.398f, 240.364f, 181.7f);
@@ -645 +645 @@
 
         BvhFactory bvhFactory;
-        //bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#if 1
         bvh = bvhFactory.Create(staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#else
+        bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+#endif
 
         if (!bvh)