Changeset 2332 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

Timestamp:

04/23/07 16:19:30 (17 years ago)

Author:

mattausch

Message:

implemented part of rendering estimation of wimmer et al. for view space / object space subdivision.
warning: not working with undersampling estimation + local visibility based subdivision.

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

@@ -45 +45 @@
 
 
-#define WORK_WITH_VIEWCELLS 0
 
 /** View space partition statistics.
@@ -573 +572 @@
                 float mBackPvs;
 
+                float mFrontTriangles;
+                float mBackTriangles;
+                
                 float mCorrectedFrontRenderCost;
                 float mCorrectedBackRenderCost;
@@ -733 +735 @@
         void SetViewCellsTree(ViewCellsTree *vt) { mViewCellsTree = vt; }
 
-#if WORK_WITH_VIEWCELLS
-        /** Remove the references of the parent view cell from the kd nodes associated with
-                the objects.
-        */
-        void RemoveParentViewCellReferences(ViewCell *parent) const;
-
-        /** Adds references to the view cell to the kd nodes associated with the objects.
-        */
-        void AddViewCellReferences(ViewCell *vc) const;
-#endif
-
-        VspNode *SubdivideAndCopy(SplitQueue &tQueue, SubdivisionCandidate *splitCandidate);
 
         PerfTimer mSortTimer;
@@ -1075 +1065 @@
                                                                 ViewCell *back) const;
 
-        void CreateViewCell(VspTraversalData &tData, const bool updatePvs);
+        void CreateViewCell(VspTraversalData &tData, 
+                                                const bool updatePvs,
+                                                const float renderCost,
+                                                const int pvs);
 
         /** Collect split candidates which are affected by the last split
@@ -1113 +1106 @@
         */
         void Initialise(const VssRayContainer &rays,
-                                        AxisAlignedBox3 *forcedBoundingBox);
+                                        AxisAlignedBox3 *forcedBoundingBox,
+                                        const ObjectContainer &objects);
 
         int CompressObjects();
 
         int CompressObjects(VspLeaf *leaf);
-
-        void TraverseRayPacket();
 
 #ifdef USE_SSE
@@ -1125 +1117 @@
         struct RayPacket
         {
-                union { float ox[4]; __m128 ox4; };
-                union { float oy[4]; __m128 oy4; };
-                union { float oz[4]; __m128 oz4; };
-                union { float dx[4]; __m128 dx4; };
-                union { float dy[4]; __m128 dy4; };
-                union { float dz[4]; __m128 dz4; };
+                union { float mOriginX[4]; __m128 mOriginX4; };
+                union { float mOriginY[4]; __m128 mOriginY4; };
+                union { float mOriginZ[4]; __m128 mOriginZ4; };
+
+                union { float mTerminationX[4]; __m128 mTerminationX4; };
+                union { float mTerminationY[4]; __m128 mTerminationY4; };
+                union { float mTerminationZ[4]; __m128 mTerminationZ4; };
+
+                ViewCellContainer mViewCells[4];
         };
+
+        struct PacketTraversalData
+        {
+                VspNode *mNode;
+
+                union { float mExitPointX[4]; __m128 mExitPointX4; };
+                union { float mExitPointY[4]; __m128 mExitPointY4; };
+                union { float mExitPointZ[4]; __m128 mExitPointZ4; };
+
+                union { float mMaxT[4]; __m128 mMaxT4; };
+                union { float mMask[4]; __m128 mMask4; };
+
+                PacketTraversalData () {}
+                PacketTraversalData (VspNode *n, 
+                                                         const __m128 &px, const __m128 &py, const __m128 &pz, 
+                                                         const __m128 &maxt,
+                                                         const __m128 &mask):
+                mNode(n), 
+                mExitPointX4(px), mExitPointY4(py), mExitPointZ4(pz),
+                mMaxT4(maxt),
+                mMask4(mask)
+                {}
+        };
+
+        
+        int TraverseRayPacket(RayPacket &rp,
+                                                  const bool useMailboxing);
+
 #endif
 
@@ -1141 +1164 @@
         HierarchyManager *mHierarchyManager;
         BvHierarchy *mBvHierarchy;
-
-        //OspTree *mOspTree;
-        //bool mUseKdPvsForHeuristics;
         
         ViewCellsManager *mViewCellsManager;