Changeset 1842

Timestamp:

12/03/06 20:55:53 (17 years ago)

Author:

mattausch

Message:

fixed compress

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (2 diffs)
• Plane3.h (modified) (1 diff)
• Pvs.h (modified) (2 diffs)
• QtPreprocessorThread.h (modified) (2 diffs)
• TestPreprocessor.vcproj (modified) (3 diffs)
• ViewCell.cpp (modified) (6 diffs)
• ViewCell.h (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (6 diffs)
• main.cpp (modified) (1 diff)

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

@@ -667 +667 @@
         {
                 cout << "bvh local termination criteria met:" << endl;
-                cout << "objects: " << tData.mNode->mObjects.size() << " " << mTermMinObjects << endl;
+                cout << "objects: " << (int)tData.mNode->mObjects.size() << " " << mTermMinObjects << endl;
         }
 #endif

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

@@ -1780 +1780 @@
 
 
-void HierarchyManager::ComputePvs(const ObjectPvs &pvs, float &rc, int &pvsEntries)
+void HierarchyManager::ComputePvs(const ObjectPvs &pvs, 
+                                                                  float &rc, 
+                                                                  int &pvsEntries)
 {
         BvhNode::NewMail();
@@ -1788 +1790 @@
         while (pit.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit.Next();
-
+                const ObjectPvsEntry &entry = pit.Next();
+
+                if (entry.mObject->Type() != Intersectable::BVH_INTERSECTABLE)
+                        cout << "error " << entry.mObject->Type() << endl;
+
+                BvhNode *intersect = dynamic_cast<BvhNode *>(entry.mObject);
                 BvhNode *activeNode;
-                BvhNode *intersect = dynamic_cast<BvhNode *>(entry.mObject);
 
                 // hack for choosing which node to account for
                 if (intersect->IsLeaf())
                 {
-                        activeNode = dynamic_cast<BvhLeaf *>(intersect)->GetActiveNode();
+                        activeNode = 
+                                dynamic_cast<BvhLeaf *>(intersect)->GetActiveNode();
                 }
                 else

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

@@ -69 +69 @@
   friend SimpleRay GetPlaneIntersection(const Plane3 &plane1, const Plane3 &plane2);
 
-  friend ostream &operator<<(ostream &s, const Plane3 p) {
+  friend ostream &operator<<(ostream &s, const Plane3 &p) {
     s<<p.mNormal<<" "<<p.mD;
     return s;

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

@@ -868 +868 @@
 
 
+////////////
+//-- typedefs
+
+typedef PvsEntry<Intersectable *, PvsData> ObjectPvsEntry;
+typedef std::vector<ObjectPvsEntry> ObjectPvsEntries;
+typedef Pvs<ViewCell *, MailablePvsData> ViewCellPvs;
+typedef PvsIterator<Intersectable *, PvsData> ObjectPvsIterator;
+
+
 class ObjectPvs: public Pvs<Intersectable *, PvsData>
 {
@@ -876 +885 @@
         */
         float EvalPvsCost() const;
+
+        friend ostream &operator<<(ostream &s, const ObjectPvs &p) 
+        {
+                ObjectPvsIterator pit = p.GetIterator();
+
+                while (pit.HasMoreEntries())
+                {               
+                        const ObjectPvsEntry &entry = pit.Next();
+                        Intersectable *obj = entry.mObject;
+
+                        cout << (int)obj << " ";
+                }
+                
+                return s;
+        }
+
 };
 
 
-////////////
-//-- typedefs
-
-typedef PvsEntry<Intersectable *, PvsData> ObjectPvsEntry;
-typedef std::vector<ObjectPvsEntry> ObjectPvsEntries;
-typedef Pvs<ViewCell *, MailablePvsData> ViewCellPvs;
-typedef PvsIterator<Intersectable *, PvsData> ObjectPvsIterator;
+
 }
 

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

@@ -2 +2 @@
 #define __QT_PREPROCESSOR_THREAD_H
 
-
+#ifndef NO_QT
 #include <QThread>
 #include "PreprocessorThread.h"
@@ -29 +29 @@
 
 }
-
 #endif
+#endif

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

@@ -21 +21 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\include;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NO_QT"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -35 +35 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib glew32.lib"
-                                OutputFile="$(OutDir)/Preprocessor.exe2"
+                                OutputFile="$(OutDir)/Preprocessor.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="..\include;..\src\GL;"..\lib\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib"
@@ -79 +79 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\MultiLevelRayTracing"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT"
                                 RuntimeLibrary="2"
                                 RuntimeTypeInfo="TRUE"

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

@@ -1488 +1488 @@
                 }
 
+                /*cout << "***************\nbefore pulling up:\n";
+                for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                {
+                        cout << "vc:\n" << (*it)->GetPvs() << endl;
+                }*/
+
                 // compress root node
                 PullUpVisibility(interior);
+
+                /*cout << "after pulling up:\n";
+                cout << "interior:\n" << interior->GetPvs() << endl;
+
+                for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                {
+                        cout << "vc:\n" << (*it)->GetPvs() << endl;
+                }*/
         }
 }
@@ -1650 +1664 @@
 void ViewCellsTree::PullUpVisibility(ViewCellInterior *interior)
 {
-        Intersectable::NewMail((int)interior->mChildren.size());
+        const int mail = (int)interior->mChildren.size();
+        Intersectable::NewMail(mail);
 
         ViewCellContainer::const_iterator cit, cit_end = interior->mChildren.end();
 
-        // mail all objects in the leaf sets
+    // mail all objects in the leaf sets
         // we are interested in the objects which are present in all leaves
         // => count how often an object is part of a child set
@@ -1660 +1675 @@
         {
                 ViewCell *vc = *cit;
-
                 ObjectPvsIterator pit = vc->GetPvs().GetIterator();
 
                 while (pit.HasMoreEntries())
                 {               
-                        ObjectPvsEntry entry = pit.Next();
+                        const ObjectPvsEntry &entry = pit.Next();
                         Intersectable *obj = entry.mObject;
-
-                        if ((cit == interior->mChildren.begin()) && !obj->Mailed())
-                        {
-                                obj->Mail();
-                        }
-
-                        int incm = obj->IncMail();
-                }
-        }
-
-        interior->GetPvs().Clear();
+                        obj->Mail();
+                }
+        }
+
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+
+                ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                while (pit.HasMoreEntries())
+                {               
+                        const ObjectPvsEntry &entry = pit.Next();
+                        Intersectable *obj = entry.mObject;
+
+                        obj->IncMail();
+                }
+        }
+
+        // reset pvs
+    interior->GetPvs().Clear(false);
                 
         // only the objects which are present in all leaf pvs 
@@ -1692 +1716 @@
                         ObjectPvsEntry entry = pit.Next();
 
-                        if (entry.mObject->Mailed((int)interior->mChildren.size()))
+                        if (entry.mObject->Mailed(mail))
                         {       
                                 interior->GetPvs().AddSample(entry.mObject, entry.mData.mSumPdf);
@@ -1699 +1723 @@
         }
 
-        // delete all the objects from the leaf sets which were moved to parent pvs
-        ObjectPvsIterator pit = interior->GetPvs().GetIterator();
-
-        while (pit.HasMoreEntries())
-        {               
-                ObjectPvsEntry entry = pit.Next();
-
-                for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
-                {
-                        if (!(*cit)->GetPvs().RemoveSample(entry.mObject, Limits::Infinity))
+        // delete entries which are pulled up
+        // note: could be inefficent, rather gather unmailed pvs and reassign
+        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
+        {
+                ViewCell *vc = *cit;
+                ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                ObjectPvs newPvs;
+
+                while (pit.HasMoreEntries())
+                {               
+                        const ObjectPvsEntry &entry = pit.Next();
+                        Intersectable *obj = entry.mObject;
+
+                        /*if (obj->Mailed(mail))
                         {
-                                Debug << "should not come here!" << endl;
+                                vc->GetPvs().RemoveSample(entry.mObject, Limits::Infinity))
+                        }*/
+                        if (!obj->Mailed(mail))
+                        {
+                                newPvs.AddSampleDirty(obj, entry.mData.mSumPdf);
                         }
                 }
+
+                vc->SetPvs(newPvs);
         }
 }
@@ -2465 +2500 @@
 
 
+
 /**************************************************************************/
 /*                     MergeCandidate implementation                      */

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

@@ -228 +228 @@
         */
         bool AddPvsSample(Intersectable *sample, const float pdf, float &contribution);
-  
-        /// Rays piercing this view cell.
-        //RayContainer mPiercingRays;
 
         /** if this is a view cell correspending to a leaf in a hierarchy.
@@ -705 +702 @@
                                          const ViewCellsTreeStats &vcStats);
 
+        
 
         //////////////////////////////////////
@@ -721 +719 @@
         /// if merged view cells are refined.
         bool mRefineViewCells;
-        /// weights between variance and render cost increase (must be between zero and one)
+        /// weights between variance and render cost increase in the range [0 .. 1].
         float mRenderCostWeight;
 

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

@@ -32 +32 @@
 
 // $$JB HACK
-#define USE_KD_PVS 1
+#define USE_KD_PVS 0
 
 #define KD_PVS_AREA (1e-5f)
@@ -4588 +4588 @@
         {
                 int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
+                cout << "number of entries before compress: " << pvsEntries << endl;
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
@@ -4593 +4595 @@
 
                 pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
                 Debug << "number of entries after compress: " << pvsEntries << endl;
+                cout << "number of entries after compress: " << pvsEntries << endl;
         }
 
@@ -5432 +5436 @@
         if (!ViewCellsConstructed())
         {
-                Debug << "postprocess error: no view cells constructed" << endl;
+                Debug << "post process error: no view cells constructed" << endl;
                 return 0;
         }
@@ -5502 +5506 @@
         {
                 int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
+                cout << "number of entries before compress: " << pvsEntries << endl;
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
@@ -5507 +5513 @@
 
                 pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
+                
                 Debug << "number of entries after compress: " << pvsEntries << endl;
+                cout << "number of entries after compress: " << pvsEntries << endl;
         }
 

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

@@ -37 +37 @@
 #include "GlRenderer.h"
 
-//#if USE_QT
+#ifndef NO_QT
 #include "QtPreprocessorThread.h"
 #include "QtGlRenderer.h"
 #include "QtGlViewer.h"
-//#endif
+#endif
 
 #define USE_EXE_PATH false