Changeset 1982 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/15/07 18:33:00 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (5 diffs)
• GvsPreprocessor.h (modified) (2 diffs)
• TestPreprocessor.vcproj (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• ViewCellsManager.h (modified) (6 diffs)

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

@@ -28 +28 @@
 GvsPreprocessor::GvsPreprocessor(): 
 Preprocessor(), 
-//mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
-mSamplingType(SamplingStrategy::DIRECTION_BOX_BASED_DISTRIBUTION)
+mSamplingType(SamplingStrategy::DIRECTION_BOX_BASED_DISTRIBUTION),
+mNumViewCells(0),
+mCurrentViewCell(NULL)
 {
         Environment::GetSingleton()->GetIntValue("GvsPreprocessor.totalSamples", mTotalSamples);
@@ -55 +56 @@
                 mOnlyRandomSampling = false;
 
-        //mGvsStatsStream.open("gvspreprocessor.log");
         mGvsStats.Reset();
+}
+
+
+bool GvsPreprocessor::NextViewCell()
+{
+        if (mViewCellsManager->GetNumViewCells() == mNumViewCells)
+                return false; // no more view cells
+
+        mCurrentViewCell = mViewCellsManager->GetViewCell(mNumViewCells);
+        mViewCellsManager->CreateMesh(mCurrentViewCell);
+
+        ++ mNumViewCells;
+    
+        return true;
 }
 
@@ -350 +364 @@
 
 
-/*Vector3 GvsPreprocessor::GetPassingPoint(const VssRay &currentRay,
-                                                                                 const Triangle3 &hitTriangle,
-                                                                                 const VssRay &oldRay) const
-{
-        //-- intersect triangle plane with plane spanned by current samples
-        Plane3 plane(currentRay.GetOrigin(), currentRay.GetTermination(), oldRay.GetTermination());
-        Plane3 triPlane(hitTriangle.GetNormal(), hitTriangle.mVertices[0]);
-
-        SimpleRay intersectLine = GetPlaneIntersection(plane, triPlane);
-
-        // Evaluate new hitpoint just outside the triangle
-        const float factor = 0.95f;
-        const float t = triPlane.FindT(intersectLine);
-        const Vector3 newPoint = intersectLine.mOrigin + t * factor * intersectLine.mDirection;
-
-        return newPoint;
-}*/
-
-
 Vector3 GvsPreprocessor::GetPassingPoint(const VssRay &currentRay,
                                                                                  const Triangle3 &occluder,
@@ -532 +527 @@
         
         return castSamples;
+}
+
+
+void GvsPreprocessor::VisualizeViewCells()
+{
+        char str[64]; sprintf(str, "tmp/pass%06d_%04d-", mNumViewCells, mPass);
+                        
+        // visualization
+        if (mGvsStats.mPassContribution > 0)
+        {
+                const bool exportRays = true;
+                const bool exportPvs = true;
+
+                mViewCellsManager->ExportSingleViewCells(mObjects, 
+                                                                                                 10, 
+                                                                                                 false, 
+                                                                                                 exportPvs, 
+                                                                                                 exportRays, 
+                                                                                                 1000, 
+                                                                                                 str);
+        }
+
+        // remove pass samples
+        ViewCellContainer::const_iterator vit, vit_end = mViewCellsManager->GetViewCells().end();
+
+        for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit)
+        {
+                (*vit)->DelRayRefs();
+        }
+}
+
+
+void GvsPreprocessor::PerViewCellComputation()
+{
+        const int maxViewCells = 5;
+
+        while (NextViewCell() && mNumViewCells < maxViewCells)
+        {
+                cout << "processing view cell " << mNumViewCells << endl;
+
+                while (mGvsStats.mTotalSamples < mTotalSamples) 
+                {
+                        ++ mPass;
+
+                        mGvsStats.mTotalSamples += Pass();
+                                
+                        ////////
+                        //-- stats
+
+                        cout << "\nPass " << mPass << " #samples: " << mGvsStats.mTotalSamples 
+                                 << " of " << mTotalSamples << endl;
+
+                        mGvsStats.mPass = mPass;
+                        mGvsStats.Stop();
+                        mGvsStats.Print(mGvsStatsStream);
+                        //mViewCellsManager->PrintPvsStatistics(mGvsStats);
+
+                        if (GVS_DEBUG)
+                                VisualizeViewCells();
+                }
+
+                // ComputeRenderError();
+        }
+}
+
+
+void GvsPreprocessor::GlobalComputation()
+{
+        while (mGvsStats.mTotalSamples < mTotalSamples) 
+        {
+                ++ mPass;
+
+                mGvsStats.mTotalSamples += Pass();
+                                
+                ////////
+                //-- stats
+
+                cout << "\nPass " << mPass << " #samples: " << mGvsStats.mTotalSamples 
+                         << " of " << mTotalSamples << endl;
+
+                mGvsStats.mPass = mPass;
+                mGvsStats.Stop();
+                mGvsStats.Print(mGvsStatsStream);
+                //mViewCellsManager->PrintPvsStatistics(mGvsStats);
+
+                if (GVS_DEBUG)
+                        VisualizeViewCells();
+        }
 }
 
@@ -564 +647 @@
         mGvsStats.Print(mGvsStatsStream);
 
-        while (mGvsStats.mTotalSamples < mTotalSamples) 
-        {
-                ++ mPass;
-
-                mGvsStats.mTotalSamples += Pass();
-                                
-                ////////
-                //-- stats
-
-                cout << "\nPass " << mPass << " #samples: " << mGvsStats.mTotalSamples << " of " << mTotalSamples << endl;
-                mGvsStats.mPass = mPass;
-                mGvsStats.Stop();
-                mGvsStats.Print(mGvsStatsStream);
-                //mViewCellsManager->PrintPvsStatistics(mGvsStats);
-
-                if (GVS_DEBUG)
-                {
-                        char str[64]; sprintf(str, "tmp/pass%04d-", mPass);
-                
-                        // visualization
-                        if (mGvsStats.mPassContribution > 0)
-                        {
-                                const bool exportRays = true;
-                                const bool exportPvs = true;
-
-                                mViewCellsManager->ExportSingleViewCells(mObjects, 
-                                                                                                                 10, 
-                                                                                                                 false, 
-                                                                                                                 exportPvs, 
-                                                                                                                 exportRays, 
-                                                                                                                 1000, 
-                                                                                                                 str);
-                        }
-
-                        // remove pass samples
-                        ViewCellContainer::const_iterator vit, vit_end = mViewCellsManager->GetViewCells().end();
-                        for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit)
-                        {
-                                (*vit)->DelRayRefs();
-                        }
-                }
-
-                // ComputeRenderError();
+        if (mPerViewCell)
+        {
+                PerViewCellComputation();
+        }
+        else
+        {
+                GlobalComputation();
         }
 

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

@@ -172 +172 @@
                                                         const VssRay &oldRay) const;
 
+        bool NextViewCell();
+
+        void GlobalComputation();
+
+        void PerViewCellComputation();
+
+        void VisualizeViewCells();
+
+
         //////////////////////
 
@@ -203 +212 @@
 
         ViewCell *mCurrentViewCell;
+
+        int mNumViewCells;
 };
 

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

@@ -194 +194 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;TRY_GLOBAL_LINES"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT"
                                 RuntimeLibrary="2"
                                 RuntimeTypeInfo="TRUE"

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

@@ -2282 +2282 @@
 
 
+int ViewCellsManager::GetNumViewCells() const
+{
+        return (int)mViewCells.size();
+}
+
+
 float ViewCellsManager::ComputeSampleContribution(VssRay &ray,
                                                                                                   const bool addRays,

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

@@ -171 +171 @@
                                                    const VssRayContainer &sampleRays) = 0;
 
-  /** 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);
 
         /** type of the view cell container.
@@ -185 +186 @@
                 @param filename file to load
                 @return true on success
-    */
-    virtual bool LoadViewCellsGeometry(const string filename, const bool extrudeBaseTriangle);
+        */
+        virtual bool LoadViewCellsGeometry(const string filename, const bool extrudeBaseTriangle);
         
         /** Merges two view cells.
@@ -210 +211 @@
         ViewCell *ExtrudeViewCell(const Triangle3 &baseTri, const float height) const;
 
-
-  virtual Intersectable *
-  GetIntersectable(const VssRay &ray, const bool isTermination) const;
+        virtual Intersectable *GetIntersectable(const VssRay &ray, const bool isTermination) const;
 
         /** Sets maximal number of samples used for the 
@@ -272 +271 @@
         virtual ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const = 0;
   
+        ViewCell *GetViewCell(const int idx) const {return mViewCells[idx];}
+
         virtual void PrintPvsStatistics(ostream &s);
 
@@ -324 +325 @@
         virtual bool GetViewPoint(Vector3 &viewPoint) const;
   
-  virtual bool GetViewPoint(Vector3 &viewPoint, const Vector3 &params) const;
+        virtual bool GetViewPoint(Vector3 &viewPoint, const Vector3 &params) const;
 
         /** Returns true if this view point is in the valid view space.
@@ -489 +490 @@
 
         virtual void CompressViewCells();
+
+        int GetNumViewCells() const;
 
         /////////////////////////////