Changeset 425 for trunk/VUT

Timestamp:

11/21/05 18:51:12 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (4 diffs)
• src/Exporter.h (modified) (1 diff)
• src/SamplingPreprocessor.cpp (modified) (1 diff)
• src/VspKdTree.cpp (modified) (7 diffs)
• src/VspKdTree.h (modified) (2 diffs)
• src/X3dExporter.cpp (modified) (5 diffs)
• src/X3dExporter.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -137 +137 @@
         maxRayCandidates 100
         
+        # factors for evaluating split plane costs
+        Factor {
+                verticalSplits 1.0
+                largestPolyArea 1.0
+                blockedRays 1.0
+                leastRaySplits 1.0
+                balancedRays 1.0
+                pvsFactor 1.0
+                leastSplits 1.0
+                balancedPolys 1.0
+                balancedViewCells 1.0
+        }
+        
         Termination {
                 # parameters used for autopartition
@@ -146 +159 @@
                 maxRayContribution 0.005
                 #maxAccRayLength 100
-                
+                # used for pvs criterium
+                ct_div_ci 0.0
+        
                 # axis aligned splits
                 AxisAligned {
@@ -203 +218 @@
 
         Construction {
-                samples 100000
-        }
-        
-        Termination {
-                maxDepth        40
-                minPvs          5
+                samples 200000
+        }
+        
+        Termination {
+                maxDepth        20
+                minPvs          200
                 minRays         100
                 minSize         0.001
@@ -215 +230 @@
         }
         
-        maxTotalMemory  400
-        maxStaticMemory 200
+        maxTotalMemory  600
+        maxStaticMemory 600
 
         splitType regular

trunk/VUT/GtpVisibilityPreprocessor/src/Exporter.h

@@ -49 +49 @@
 
   virtual bool
-  ExportVspKdTree(const VspKdTree &tree) = 0;
+  ExportVspKdTree(const VspKdTree &tree, const int maxPvs = 0) = 0;
 
   virtual bool

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -677 +677 @@
                 Exporter *exporter = Exporter::GetExporter("vspkdtree.x3d"); 
                 exporter->SetWireframe();
-                exporter->ExportVspKdTree(*mVspKdTree);
+                exporter->ExportVspKdTree(*mVspKdTree, 300);
                 delete exporter;
         }

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -172 +172 @@
 
 
-/*********************************************************/
-/*            class VspKdTreeLeaf implementation         */
-/*********************************************************/
+/**************************************************************/
+/*              class VspKdTreeLeaf implementation            */
+/**************************************************************/
 VspKdTreeLeaf::VspKdTreeLeaf(VspKdTreeInterior *p,      const int nRays):
 VspKdTreeNode(p), mRays(), mPvsSize(0), mValidPvs(false) 
@@ -488 +488 @@
                 if (lastMem / 10 != ((int)mem) / 10) 
                 {
-                        cout << mem << " MB" << endl;
+                        Debug << mem << " MB" << endl;
                 }
                 lastMem = (int)mem;
@@ -569 +569 @@
         }
 
-        if (costRatio > mTermMaxCostRatio) 
-        {
-                cout << "Too big cost ratio " << costRatio << endl;
+        if (0 && costRatio > mTermMaxCostRatio) 
+        {
+                Debug << "Too big cost ratio " << costRatio << endl;
                 return -1;
         }
@@ -588 +588 @@
 
                                                         
-
-float
-VspKdTree::EvalCostRatio(VspKdTreeLeaf *leaf,
-                                                 const int axis,
-                                                 const float position,
-                                                 int &raysBack,
-                                                 int &raysFront,
-                                                 int &pvsBack,
-                                                 int &pvsFront)
+float VspKdTree::EvalCostRatio(VspKdTreeLeaf *leaf,
+                                                           const int axis,
+                                                           const float position,
+                                                           int &raysBack,
+                                                           int &raysFront,
+                                                           int &pvsBack,
+                                                           int &pvsFront)
 {
         raysBack = 0;
@@ -632 +630 @@
         }       
 
-        AxisAlignedBox3 box = GetBBox(leaf);
-        
-        float minBox = box.Min(axis);
-        float maxBox = box.Max(axis);
-        float sizeBox = maxBox - minBox;
+        float ratio = 0;
+        
+        if (1)
+        {
+                const float sum = pvsBack + pvsFront;
+                const float oldCost = (float)pvsSize * 2;
+
+                return sum / oldCost;
+        }
+        else {
+                AxisAlignedBox3 box = GetBBox(leaf);
+        
+                float minBox = box.Min(axis);
+                float maxBox = box.Max(axis);
+                float sizeBox = maxBox - minBox;
                 
-        //              float sum = raysBack*(position - minBox) + raysFront*(maxBox - position);
-        float sum = pvsBack * (position - minBox) + pvsFront * (maxBox - position);
-
-        newCost = mCtDivCi + sum  / sizeBox;
-        
-        //      cout<<axis<<" "<<pvsSize<<" "<<pvsBack<<" "<<pvsFront<<endl;
-        //  float oldCost = leaf->mRays.size();
-        float oldCost = (float)pvsSize;
-        
-        float ratio = newCost / oldCost;
-        //      cout<<"ratio="<<ratio<<endl;
+                // float sum = raysBack*(position - minBox) + raysFront*(maxBox - position);
+                float sum = pvsBack * (position - minBox) + pvsFront * (maxBox - position);
+
+                newCost = mCtDivCi + sum  / sizeBox;
+        
+                //Debug << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
+                //  float oldCost = leaf->mRays.size();
+                float oldCost = (float)pvsSize;
+                
+                float ratio = newCost / oldCost;
+        
+        }
+        
         return ratio;
 }
@@ -927 +937 @@
         
         // select subdivision axis
-        int axis = SelectPlane(leaf, box, position, raysBack, raysFront, pvsBack, pvsFront);
+        const int axis = SelectPlane(leaf, box, position, raysBack, raysFront, pvsBack, pvsFront);
 
         Debug << "rays back=" << raysBack << " rays front=" << raysFront << " pvs back=" << pvsBack << " pvs front=" << pvsFront << endl;
@@ -1684 +1694 @@
         return mStat.rays * (sizeof(VssRay))/(1024.0f * 1024.0f);
 }
+
+int VspKdTree::ComputePvsSize(VspKdTreeNode *node, const RayInfoContainer &globalRays) const
+{
+        int pvsSize = 0;
+
+        const AxisAlignedBox3 box = GetBBox(node);
+
+        RayInfoContainer::const_iterator it, it_end = globalRays.end();
+
+        for (it = globalRays.begin(); it != globalRays.end(); ++ it)
+                ;//pvsSize += box.GetMinMaxT((*it).mRay, NULL, NULL);
+
+        return pvsSize;
+}

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -503 +503 @@
                                          SimpleRayContainer &rays);
 
+        /** Collapses this subtree and releases the memory.
+                @returns number of collapsed rays.
+        */
         int CollapseSubtree(VspKdTreeNode *sroot, const int time);
         
@@ -509 +512 @@
         bool TerminationCriteriaMet(const VspKdTreeLeaf *leaf, 
                                                                 const AxisAlignedBox3 &box) const;
+
+        /** Computes PVS size of this node given a global ray set.
+                @returns PVS size of the intersection of this node bounding box with the rays.
+        */
+        int ComputePvsSize(VspKdTreeNode *node, const RayInfoContainer &globalRays) const;
 
 protected:

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -583 +583 @@
 }
 
-bool X3dExporter::ExportVspKdTree(const VspKdTree &tree)
-{
-         /*if (mExportRayDensity) {      
-         return ExportKdTreeRayDensity(tree); }*/
+bool X3dExporter::ExportVspKdTree(const VspKdTree &tree, const int maxPvs)
+{
+         //if (mExportRayDensity) {      
+         //return ExportKdTreeRayDensity(tree); }
 
         stack<VspKdTreeNode *> tStack;
@@ -592 +592 @@
         tStack.push(tree.GetRoot());
 
-        Mesh *mesh = new Mesh;
-  
+        //Mesh *mesh = new Mesh;
+  
+        if (maxPvs > 0)
+                mUseForcedMaterial = true;
+
         while (!tStack.empty()) 
         {
@@ -601 +604 @@
                 AxisAlignedBox3 box = tree.GetBBox(node);
 
+                Mesh *mesh = new Mesh;
+
                 // add 6 vertices of the box
                 int index = (int)mesh->mVertices.size();
-   
+
                 for (int i=0; i < 8; ++ i) 
                 {
@@ -619 +624 @@
                 mesh->AddFace(new Face(index + 2, index + 3, index + 7, index + 6) );
 
+                if (maxPvs > 0)
+                {
+            mForcedMaterial.mDiffuseColor.b = 1.0f;
+                        const float importance = maxPvs;
+                        //float importance = (float)(*it)->GetPvs().GetSize() / (float)maxPvs;
+
+                        mForcedMaterial.mDiffuseColor.r = importance;
+                        mForcedMaterial.mDiffuseColor.g = 1.0f - mForcedMaterial.mDiffuseColor.r;
+                }
+
+                ExportMesh(mesh);
+                DEL_PTR(mesh);
+
         if (!node->IsLeaf()) 
                 {
@@ -627 +645 @@
         }
   
-        ExportMesh(mesh);
-        DEL_PTR(mesh);
+        //ExportMesh(mesh);
+        //DEL_PTR(mesh);
 
         return true;

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.h

@@ -40 +40 @@
   
   bool 
-  ExportVspKdTree(const VspKdTree &tree);
+  ExportVspKdTree(const VspKdTree &tree, const int maxPvs);
 
   bool ExportBspTree(const BspTree &tree);