Changeset 1845 for GTP/trunk/Lib

Timestamp:

12/04/06 23:32:28 (18 years ago)

Author:

mattausch

Message:

improved object pvs

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• Pvs.h (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (1 diff)
• ViewCellsManager.cpp (modified) (2 diffs)
• ViewCellsManager.h (modified) (3 diffs)
• VspTree.cpp (modified) (6 diffs)
• VspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

@@ -2354 +2354 @@
 
 
-void HierarchyManager::CompressObjectSpace()
+int HierarchyManager::CompressObjectSpace()
 {
         //mBvHierarchy->Compress();
-        mVspTree->CompressObjects();
+        return mVspTree->CompressObjects();
+}
+
 
 void HierarchyManager::CreateUniqueObjectIds()

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

@@ -292 +292 @@
         void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
-        void CompressObjectSpace();
+        int CompressObjectSpace();
         void CreateUniqueObjectIds();
 

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

@@ -889 +889 @@
                         Intersectable *obj = entry.mObject;
 
-                        cout << (int)obj << " ";
+                        cout << obj << " ";
                 }
                 

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -206 +206 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor2.exe"
+                                OutputFile="../bin/release/Preprocessor.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release"

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -4605 +4605 @@
         cout << ss << endl;
         
-
         if (0) CompressViewCells();
         
@@ -6162 +6161 @@
 
 
+void VspOspViewCellsManager::CompressViewCells()
+{
+        ViewCellsManager::CompressViewCells();
+        return;
+        ////////////
+        //-- compression
+
+        if (ViewCellsTreeConstructed() && mCompressViewCells)
+        {
+                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
+                cout << "compressing in the objects" << endl;
+                cout << "number of entries before compress: " << pvsEntries << endl;
+                Debug << "number of entries before compress: " << pvsEntries << endl;
+
+                pvsEntries = mHierarchyManager->CompressObjectSpace();
+                
+                Debug << "number of entries after compress: " << pvsEntries << endl;
+                cout << "number of entries after compress: " << pvsEntries << endl;
+        }
+}
+
+
 ViewCellsManager *VspOspViewCellsManager::LoadViewCells(const string &filename, 
                                                                                                                 ObjectContainer *objects,

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

@@ -467 +467 @@
                                                                   const ViewCellContainer &viewCells) const;
 
-        void CompressViewCells();
+        virtual void CompressViewCells();
+
         /////////////////////////////
         // static members
@@ -1163 +1164 @@
         void CollectViewCells();
 
+        virtual void CompressViewCells();
+
         /** Prepare view cells for use after loading them from disc.
         */
@@ -1183 +1186 @@
         /////////////////////////////////////////
 
-    /** collect objects intersecting a given spatial box */
-  virtual void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
+    /** collect objects intersecting a given spatial box 
+        */
+        virtual void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
         HierarchyManager *mHierarchyManager;

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

@@ -3389 +3389 @@
 
 
-void VspTree::CompressObjects(VspLeaf *leaf)
+int VspTree::CompressObjects(VspLeaf *leaf)
 {
         bool compressed = true;
 
-        Intersectable::NewMail(2);
-
         while (compressed)
         {
+                BvhNode::NewMail(2);
+
                 ObjectPvsIterator oit = leaf->GetViewCell()->GetPvs().GetIterator();
                 vector<BvhNode *> parents;
@@ -3414 +3414 @@
                                 if (!parent->Mailed())
                                 {
+                                        if (parent->Mailed(1))
+                                                cout << "error!!" << endl;
                                         parent->Mail();
                                 }
@@ -3422 +3424 @@
                                         parents.push_back(parent);
                                         parent->Mail(1);
+                
                                         compressed = true;
                                 }
@@ -3439 +3442 @@
 
                                 // add only entries that cannot be exchaned with the parent
-                                if (parent->Mailed(1))
+                                if (!parent->Mailed(1))
                                 {
                                         newPvs.AddSampleDirty(obj, entry.mData.mSumPdf);
@@ -3448 +3451 @@
                 // add parents
                 vector<BvhNode *>::const_iterator bit, bit_end = parents.end();
+
                 for (bit = parents.begin(); bit != bit_end; ++ bit)
                 {
@@ -3453 +3457 @@
                 }
 
+                //cout << "size " << newPvs.GetSize() << endl;
                 leaf->GetViewCell()->SetPvs(newPvs);
         }
-}
-
-
-void VspTree::CompressObjects()
+
+        return leaf->GetViewCell()->GetPvs().GetSize();
+}
+
+
+int VspTree::CompressObjects()
 {
         vector<VspLeaf *> leaves;
         CollectLeaves(leaves);
 
+        int numEntries = 0;
+
         vector<VspLeaf *>::const_iterator lit, lit_end = leaves.end();
 
         for (lit = leaves.begin(); lit != lit_end; ++ lit)
         {
-                CompressObjects(*lit);
-        }
-}
-
-}
+                numEntries += CompressObjects(*lit);
+        }
+
+        return numEntries;
+}
+
+}

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

@@ -1028 +1028 @@
                                         AxisAlignedBox3 *forcedBoundingBox);
 
-        void CompressObjects();
-
-        void CompressObjects(VspLeaf *leaf);
+        int CompressObjects();
+
+        int CompressObjects(VspLeaf *leaf);
 
 protected: