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

Timestamp:

01/14/08 18:25:44 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• CombinedPreprocessor.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (4 diffs)
• GlRenderer.h (modified) (4 diffs)
• Preprocessor.cpp (modified) (3 diffs)
• Preprocessor.h (modified) (2 diffs)
• Preprocessor.vcproj (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (4 diffs)
• QtInterface/QtGlViewer.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)
• VssRay.cpp (modified) (2 diffs)
• VssRay.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -67 +67 @@
 
   int lastEvaluation = 0;
-  //  int totalVssRays = 0;
+ 
   mPass = 0;
   

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

@@ -14 +14 @@
 #include "KdTree.h"
 #include "SamplingStrategy.h"
+#include "Preprocessor.h"
 
 
@@ -145 +146 @@
 void GlRenderer::RenderIntersectable(Intersectable *object)
 {
-        if (!object)
+        if (!object || (object->mRenderedFrame == mCurrentFrame))
                 return;
 
-        if (object->mRenderedFrame == mCurrentFrame)
-                return;
-
         object->mRenderedFrame = mCurrentFrame;
-
-        //if (object->Mailed()) return;
-        //object->Mail();
 
         glPushAttrib(GL_CURRENT_BIT);
@@ -205 +200 @@
 
 
-void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType, int showDistribution)
-{
+void GlRenderer::RenderRays(const VssRayContainer &rays, int colorType, int showDistribution, int maxAge)
+{
+        float importance;
+
+        glBegin(GL_LINES);
+
         VssRayContainer::const_iterator it = rays.begin(), it_end = rays.end();
-
-        glBegin(GL_LINES);
-        
-        float importance;
 
         for (; it != it_end; ++it) 
@@ -221 +216 @@
                         ((ray->mDistribution == SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION) && ((showDistribution & 2) == 0)) ||
                         ((ray->mDistribution == SamplingStrategy::OBJECT_DIRECTION_BASED_DISTRIBUTION) && ((showDistribution & 4) == 0)) ||
-                        ((ray->mDistribution == SamplingStrategy::MUTATION_BASED_DISTRIBUTION) && ((showDistribution & 8) == 0)))
+                        ((ray->mDistribution == SamplingStrategy::MUTATION_BASED_DISTRIBUTION) && ((showDistribution & 8) == 0)) ||
+                        ((mViewCellsManager->GetPreprocessor()->mPass - ray->mPass) >= maxAge))
                 {
                         continue;

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

@@ -30 +30 @@
 
 struct VssRayContainer;
-
-  struct GLUquadric;
-  
-struct PvsRenderStatistics {
-  
+struct GLUquadric;
+
+
+struct PvsRenderStatistics 
+{ 
   float maxError;
   float sumError;
@@ -43 +43 @@
   PvsRenderStatistics() { Reset(); }
   
-  void Reset() {
+  void Reset() 
+  {
         maxError = 0.0f;
         sumError = 0.0f;
@@ -58 +59 @@
 };
 
-        struct PvsCache {
-                
-                PvsCache():mViewCell(NULL), mUnfilteredPvsSize(0) {}
-
-                void Reset()
-                { 
-                        mViewCell = NULL; mPvs.Clear(); 
-                        filteredBoxes.clear(); 
-                        mUnfilteredPvsSize = 0;
-                }
-                
-                ViewCell *mViewCell;
-                ObjectPvs mPvs;
-                int mUnfilteredPvsSize;
-                vector<AxisAlignedBox3> filteredBoxes;
-        };
+
+struct PvsCache 
+{
+
+        PvsCache():mViewCell(NULL), mUnfilteredPvsSize(0) {}
+
+        void Reset()
+        { 
+                mViewCell = NULL; mPvs.Clear(); 
+                filteredBoxes.clear(); 
+                mUnfilteredPvsSize = 0;
+        }
+
+        ViewCell *mViewCell;
+        ObjectPvs mPvs;
+        int mUnfilteredPvsSize;
+        vector<AxisAlignedBox3> filteredBoxes;
+};
 
 
@@ -129 +132 @@
 
   void
-  RenderRays(const VssRayContainer &rays, int colorType = 0, int showDistribution = 15);
+  RenderRays(const VssRayContainer &rays, int colorType = 0, int showDistribution = 15, int maxAge = 9999999);
 
   void

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

@@ -670 +670 @@
                 cout << "loading objects from " << buf << endl;
 
-                // load objects which will be used as pvs entries
+                // load scene objects used as pvs entries
                 ObjectContainer pvsObjects;
                 if (0) LoadObjects(buf, pvsObjects, mObjects);
@@ -731 +731 @@
                         {
                                 if (!mViewCellsManager->LoadViewCellsGeometry(vcGeomFilename, extrudeBaseTriangles))
-                                {
                                         cerr << "loading view cells geometry failed" << endl;
-                                }
                         }
                         else
@@ -1616 +1614 @@
 
 
-}
+bool Preprocessor::AddGeometry(const string &filename,
+                                                           ObjectContainer &pvsObjects, 
+                                                           const ObjectContainer &preprocessorObjects)
+{
+//      bool success = LoadBinaryObj(filename, mSceneGraph->GetRoot(), &mFaseParents);
+        bool success = LoadBinaryObj(filename, mSceneGraph->GetRoot(), NULL);
+
+        return success;
+}
+
+}

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

@@ -179 +179 @@
         Vector3 GetParentNormal(const int index) const;
 
-        /** Sets a Preprocessor thread.
+        /** Sets a preprocessor thread.
         */
         void SetThread(PreprocessorThread *t);
 
-        /** Returns a Preprocessor thread.
+        /** Returns a preprocessor thread.
         */
         PreprocessorThread *GetThread() const;
@@ -194 +194 @@
 
         static bool LoadObjects(const string &filename,
-                                ObjectContainer &pvsObjects, 
-                                const ObjectContainer &preprocessorObject);
-
+                                                        ObjectContainer &pvsObjects, 
+                                                        const ObjectContainer &preprocessorObject);
+
+        /** Adds new geometry to the existing one.
+        */
+        bool AddGeometry(const string &filename, ObjectContainer &pvsObjects, const ObjectContainer &prepObjects);
 
         /////////////////////////

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

@@ -366 +366 @@
                         <File
                                 RelativePath="..\src\Exporter.h">
+                        </File>
+                        <File
+                                RelativePath=".\FilterBasedDistribution.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\FilterBasedDistribution.h">
                         </File>
                         <File
@@ -1059 +1065 @@
                         </File>
                         <File
+                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
+                        </File>
+                        <File
                                 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h">
-                        </File>
-                        <File
-                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
                         </File>
                         <File

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -717 +717 @@
                 if (1 && mShowRays) 
                 {
-                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution);
+                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod, mShowDistribution, 1);
                 }
         }
@@ -731 +731 @@
         if (!mTopView)
                 GlRenderer::SetupCamera();
-        else {
-                if (0) {
+        else 
+        {
+                if (0) 
+                {
                         float dist = Magnitude(mSceneGraph->GetBox().Diagonal())*0.05;
                         Vector3 pos = mViewPoint - dist*Vector3(mViewDirection.x,
@@ -940 +942 @@
         connect(mControlWidget, SIGNAL(SetShowRays(bool)), this, SLOT(SetShowRays(bool)));
 
-        resize(1000, 500);
+        // setting the size here
+        resize(800, 600);
         mControlWidget->show();
 }
@@ -1525 +1528 @@
                 const float importance = (vcRatio - minRatio) * scale;
         
-                if (i < 20)
+                if (0 && (i < 20))
                 {
                         cout << "pvs1: " << vc->GetPvs().GetSize() << " pvs2: " << compareInfo[i].mPvsSize << " importance: " << importance << endl;

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlViewer.cpp

@@ -46 +46 @@
 QSize QtGlViewer::sizeHint() const 
 {
-        return QSize(500, 500);
+        return QSize(640, 480);
 }
   

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

@@ -2735 +2735 @@
 #endif
 
-        bool hasContri = false;
         // if ray not outside of view space
         float relContribution = 0.0f;
@@ -2746 +2745 @@
                 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
-#if MYSTATS
                 
                 if (hasAbsContribution)
                 {
                         UpdateStatsForViewCell(viewCell, obj);
-                        hasContri = true;
-                }
-#endif
-
+                }
         }
         else 
@@ -2796 +2791 @@
 #endif
 
-        return hasContri;
+        return hasAbsContribution;
 }
 

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

@@ -68 +68 @@
         else
         {
-                mTermination = ray.Extrap(1e6);//TODO: should be Limits::Infinity
+                mTermination = ray.Extrap(1e6); //TODO: should be Limits::Infinity
                 mTerminationObject = NULL;
         }
@@ -80 +80 @@
         mFlags = 0;
         Vector3 dir = GetDir();
-//mFlags |= BorderSample;
 #define BIDIRECTIONAL_RAY 0
 #if BIDIRECTIONAL_RAY

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

@@ -44 +44 @@
   int mMailbox;
         
-  // side of the ray - used for the ray classification
-  //  char mSide;
-        
-  // computed t
-  //  float mT;
-
   // inverse of the ray size
   float mInvSize;
@@ -76 +70 @@
   short mPass;
 
-  // Distribution used to generate this ray
+  /// Distribution used to generate this ray
   short mDistribution;
   
-  // number of cells where this ray made a contribution to the PVS
+  /// number of cells where this ray made a contribution to the PVS
   int mPvsContribution;
   
-  // sum of relative ray contributions per object
+  /// sum of relative ray contributions per object
   float mRelativePvsContribution;
 
-  // weighted contribution to the pvs (based on the pass the ray was casted at)
-  // computed by the prperocessor
+  /// weighted contribution to the pvs (based on the pass the ray was casted at)
+  /// computed by the prperocessor
   float mWeightedPvsContribution;
 
-  // probability of this ray
+  /// probability of this ray
   float mPdf;
   

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

@@ -338 +338 @@
                 // $$matt
                 preprocessor->renderer = 
-                        new QtGlRendererBuffer(1024, 1024,
+                        new QtGlRendererBuffer(512, 512,
                         preprocessor->mSceneGraph,
                         preprocessor->mViewCellsManager,