Changeset 3280 for GTP

Timestamp:

01/15/09 18:28:11 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (1 diff)
• src/BvhConstructor.cpp (modified) (3 diffs)
• src/BvhConstructor.h (modified) (1 diff)
• toto.txt (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -66 +66 @@
 camPosition=483.398f 242.364f 186.078f
 # pompeii view point
-#camPosition=1300.0f -2500.0f 10.0f
+camPosition=1300.0f -2500.0f 10.0f
 # pompeii problematic
 #camPosition=627.003 -1725.33 25.2

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

@@ -39 +39 @@
 mMaxTriangles(1),
 mNumNodes(0),
-mSplitType(SAH)
+//mSplitType(SAH)
+mSplitType(SAH_OR_SIZE)
 {
 }
@@ -282 +283 @@
         return k;
 }
+
+
+int BvhConstructor::SortTrianglesSurfaceArea(BvhLeaf *leaf, float sa)
+{
+        int i = leaf->mFirst;
+        int j = leaf->mLast;
+
+        while(1) 
+        {
+                while ((i <= j) && (mEntities[i]->GetWorldBoundingBox().SurfaceArea() < sa)) 
+                        ++ i;
+
+                while ((i <= j) && (sa < mEntities[j]->GetWorldBoundingBox().SurfaceArea()))
+                        -- j;
+
+                if (i < j) 
+                {
+                        swap(mEntities[i], mEntities[j]);
+                        ++ i;
+                        -- j;
+                }
+                else
+                        break;
+        }
+
+        return j;
+}
+
 
 
@@ -333 +362 @@
                 }
                 break;
+        case SAH_OR_SIZE: 
+                {
+                        // split by size instead
+                        const float saThreshold = 0.2f * leaf->GetBox().SurfaceArea();
+                        split = SortTrianglesSurfaceArea(leaf, saThreshold);
+
+                        if ((split == leaf->mLast) || (split == leaf->mFirst - 1)) 
+                        {
+                                // use SAH
+                                float cost;
+                                pos = SelectPlaneSah(leaf, axis, cost);
+
+                                if (pos != MAX_FLOAT)
+                                        split = SortTriangles(leaf, axis, pos);
+                                else
+                                        split = SortTrianglesObjectMedian(leaf, axis, pos);
+                        }
+                        else
+                        {
+                                // note: no position is computed!!
+                                //OUT1("sorted by size");
+                        }
+                }
+                break;
         default:
                 cerr << "should not come here" << endl;

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

@@ -23 +23 @@
         /** Types of split heuristics.
         */      
-        enum {SPATIAL_MEDIAN, OBJECT_MEDIAN, SAH};      
+        enum {SPATIAL_MEDIAN, OBJECT_MEDIAN, SAH, SAH_OR_SIZE}; 
 
 protected:

GTP/trunk/App/Demos/Vis/FriendlyCulling/toto.txt

@@ -194 +194 @@
 
 fix shadows
+
+find out ssao artifacts on edges (near edge no ambient occlusion)