Changeset 2053

Timestamp:

01/24/07 16:35:17 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (5 diffs)
• GvsPreprocessor.cpp (modified) (18 diffs)
• GvsPreprocessor.h (modified) (1 diff)
• Polygon3.cpp (modified) (6 diffs)
• Preprocessor.cpp (modified) (1 diff)
• RssTree.cpp (modified) (6 diffs)
• TestPreprocessor.vcproj (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsParser.cpp (modified) (4 diffs)
• main.cpp (modified) (1 diff)

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

@@ -89 +89 @@
   mUseForcedColors = false;
   mRenderBoxes = false;
-  mUseGlLists = true;
-  //mUseGlLists = false;
+ // mUseGlLists = true;
+  mUseGlLists = false;
 
   if (mViewCellsManager->GetViewCellPoints()->size())
@@ -447 +447 @@
 
                         if (id != 0xFFFFFF)
+                        {
                                 ++ mObjects[id]->mCounter;
+                        }
                 }
         }
@@ -511 +513 @@
 
                 pixelCount = mOcclusionQueries[j]->GetQueryResult();
+                
                 mObjects[j]->mCounter += pixelCount;
         }
@@ -554 +557 @@
                         //      cout <<"o="<<j+q<<" q="<<mOcclusionQueries[q]->GetQueryId()<<" pc="<<pixelCount<<" ";
                         mObjects[j + t]->mCounter += pixelCount;
+                
                 }
 
@@ -735 +739 @@
         {
           (*it)->mCounter = 0;
+         
         }
 

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

@@ -16 +16 @@
 {
   
-#define GVS_DEBUG 0
+#define GVS_DEBUG 1
 
 struct VizStruct
@@ -140 +140 @@
 
                 // set flag for visualization
-                newRay->mFlags |= VssRay::ReverseSample;
+                //newRay->mFlags |= VssRay::ReverseSample;
                 
                 // if ray is not further processed => delete ray
@@ -154 +154 @@
 }
 
-// #id: 1270
+
 bool GvsPreprocessor::HasContribution(VssRay &ray)
 {
@@ -314 +314 @@
         if (!newRay) return castRays;
 
-        newRay->mFlags |= VssRay::BorderSample;
+        //newRay->mFlags |= VssRay::BorderSample;
 
         // add new ray to queue
@@ -391 +391 @@
         GenerateRays(numRandomRays, vcStrat, simpleRays);
 
+
         /////////////////////
-
 
         // keep origin for per view cell sampling
@@ -398 +398 @@
 
         const int numBorderSamples = (int)vssRays.size() - numRandomRays;
-
         // set flags
-        VssRayContainer::const_iterator rit, rit_end = vssRays.end();
-        int i = 0;
-  
+        /*VssRayContainer::const_iterator rit, rit_end = vssRays.end();
         for (rit = vssRays.begin(); rit != rit_end; ++ rit, ++ i)
-        {
-                if (i < numBorderSamples)
-                        (*rit)->mFlags |= VssRay::BorderSample;
-        }
-
+                (*rit)->mFlags |= VssRay::BorderSample;
+                */
         int castRays = (int)simpleRays.size();
 
@@ -429 +423 @@
         mGvsStats.mBorderSamples += castRays;
 
-        CLEAR_CONTAINER(invalidSamples);
+        //CLEAR_CONTAINER(invalidSamples);
         
         //cout << "cast rays: " << castRays << endl;
@@ -585 +579 @@
         EnqueueRays(samples, invalidSamples);
 
-        CLEAR_CONTAINER(invalidSamples);
+        //CLEAR_CONTAINER(invalidSamples);
         //Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
         return (int)simpleRays.size();
@@ -599 +593 @@
                 VssRay *ray = *vit;
 
-                if (!HandleRay(ray))
-                        invalidSamples.push_back(ray);
+                HandleRay(ray);
+
+                //if (!HandleRay(ray));
+                //      invalidSamples.push_back(ray);
         }
 }
@@ -729 +725 @@
         //exporter->SetFilled();
 
-        DEL_PTR(exporter);
+        delete exporter;
 }
 
@@ -820 +816 @@
         vector<ViewCellPoints *> *vcPoints = mViewCellsManager->GetViewCellPoints();
 
+        
+        int i = 0;
         if (!vcPoints->empty())
         {
+                cout << "loading view cell list" << endl;
+                
                 vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
 
                 for (vit = vcPoints->begin(); vit != vit_end; ++ vit)
-                {
+                {//cout << i ++ << " " << (*vit)->first->GetId() << endl;
                         mViewCells.push_back((*vit)->first);
                 }
@@ -913 +913 @@
                 (*oit)->mCounter = 0;
         }
-//int dummy = 0;
+        int dummy = 0;
         while (NextViewCell())// && (dummy < 3))
-        {//++ dummy;
+        {
+                //++ dummy;
+                //if (mProcessedViewCells < 53) continue;
+        
                 long startTime = GetTime();
                 cout << "\n***********************\n" 
@@ -969 +972 @@
                 // is this really necessary?
                 //ClearRayQueue();
-
+                cout << "finished" << endl;
                 if (mEvaluatePixelError || mExportVisibility)
                 {
@@ -988 +991 @@
 }
 
-
+/*
 void GvsPreprocessor::ComputeRenderError()
 {
@@ -1012 +1015 @@
         }
 }
-
+*/
 
 void GvsPreprocessor::UpdatePvs(ViewCell *currentViewCell)
@@ -1047 +1050 @@
 void GvsPreprocessor::GetObjectPvs(ObjectContainer &objectPvs) const
 {
+        objectPvs.reserve((int)mTrianglePvs.size());
+
         BvhLeaf::NewMail();
 
@@ -1056 +1061 @@
         
                 BvhLeaf *bv = intersect->mBvhLeaf;
+
+                // hack: reset counter
+                (*oit)->mCounter = 0;
 
                 if (!bv || bv->Mailed())
@@ -1063 +1071 @@
 
                 objectPvs.push_back(bv);
-                // hack: reset counter
-                (*oit)->mCounter = 0;
         }
 }

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

@@ -217 +217 @@
         void DeterminePvsObjects(VssRayContainer &rays);
 
-        virtual void ComputeRenderError();
+        //virtual void ComputeRenderError();
 
         void StorePvs(const ObjectContainer &objectPvs);

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

@@ -65 +65 @@
         mVertices.push_back(tri.mVertices[1]);
         mVertices.push_back(tri.mVertices[2]);
-
-        VertexContainer::iterator it, it_end = mVertices.end();
-
-        //for (it = mVertices.begin(); it != it_end;  ++ it){cout << (*it) << " ";}cout<<endl<<endl;
-        //cout << "poly n: " << GetNormal() << " t normal: " << tri.GetNormal() << endl;
 }
 
@@ -105 +100 @@
     Vector3 lastSplit;
                 
+        /////////////
         //-- find line - plane intersections
 
@@ -139 +135 @@
                         if (sideA > 0)
                         {
+                                ////////////
                                 //-- plane - line intersection
+
                                 Vector3 splitPt = partition.FindIntersection(ptA, ptB);
-                                // test if split point not too close to other split point
-                                        // test if split point not too close to previous split point
+                                
+                                // test if split point not too close to previous split point
                                 if (!foundSplit || (!EpsilonEqualV3(splitPt, lastSplit, epsilon)))
                                 {
@@ -153 +151 @@
                                 }       
                         }
+
                         back.mVertices.push_back(ptB);
                 }
@@ -249 +248 @@
                 sum += mVertices[i];
         
-        return sum/(float)i;
+        return sum / (float)i;
 }
 
@@ -258 +257 @@
         int i;
         Vector3 center = Center();
-        for (i=0; i < mVertices.size(); i++) {
-                mVertices[i] = center + scale*(mVertices[i] - center);
+        
+        for (i=0; i < mVertices.size(); i++) 
+        {
+                mVertices[i] = center + scale * (mVertices[i] - center);
         }
 }

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

@@ -658 +658 @@
   
   // export the preprocessed information to a file
-  if (mExportVisibility)
+  if (1 && mExportVisibility)
   {
           ExportPreprocessedData(mVisibilityFileName);

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

@@ -997 +997 @@
                 if (!object->Mailed()) {
                   object->Mail();
+                  
                   object->mCounter = 1;
                 } else
+                {
+                        
                   object->mCounter++;
-          
+                }
 #if EVAL_VIEWCELLS       
           // and do the same for all viewcells
@@ -1010 +1013 @@
                   currInfo.viewCells++;
                   viewcell->Mail();
+                  
                   viewcell->mCounter = 1;
                 } else
+                {
+                        
                   viewcell->mCounter++;
+                }
           }
 #endif
@@ -1059 +1066 @@
                 }
                 if (--object->mCounter == 0)
+                {
                   currInfo.pvsFront--;
+                }
           }
 
@@ -1071 +1080 @@
                 }
                 if (--viewcell->mCounter == 0)
+                {
                   currInfo.viewCellsFront--;
+                }
           }
 #endif
@@ -2386 +2397 @@
                 if (!object->Mailed()) {
                   object->Mail();
+                  
                   object->mCounter = 1;
                   pvs.push_back(object);
@@ -2843 +2855 @@
                   object->mCounter = 1;
                 } else
+                {
+                
                   object->mCounter++;
+                }
                 samples++;
           }

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

@@ -197 +197 @@
                                 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;USE_CG"
+                                ExceptionHandling="TRUE"
                                 RuntimeLibrary="2"
                                 EnableEnhancedInstructionSet="2"
@@ -209 +210 @@
                                 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 cg.lib cgGL.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtInterface.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";.\QtInterface\Release;"$(CG_LIB_PATH)""
@@ -217 +218 @@
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"
+                                OptimizeForWindows98="1"
                                 TargetMachine="1"
                                 FixedBaseAddress="1"/>

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

@@ -536 +536 @@
 
                 if (GenerateViewPoint(viewCell, pt))
-                {cout<<"here4"<<endl;
+                {
                         ++ generatedPts;
                         cout << "generated view point " << generatedPts << endl;
@@ -1102 +1102 @@
                 vm->mMaxPvsSize = (int)objects->size();
 
+                
                 if (finalizeViewCells)
                 {
                         // create the meshes and compute volumes
-                        vm->FinalizeViewCells(true);
+                        vm->FinalizeViewCells(false);
                         // vm->mViewCellsTree->AssignRandomColors();
                 }
@@ -1113 +1114 @@
                         cout << "=============== " << vm->GetViewCellById(5318)->GetPvs().GetSize() << "========" << endl;
                 }
+
+                cout << (int)vm->mViewCells.size() << " view cells loaded in "
+                         << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
                 Debug << (int)vm->mViewCells.size() << " view cells loaded in "

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

@@ -396 +396 @@
 {
         //cout << "exchanging pvs" << endl;
-
-        sort(mBvhLeaves.begin(), mBvhLeaves.end(), ilt);
         ObjectPvs newPvs;
 
@@ -449 +447 @@
 {
         ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
-
+        
+        sort(mBvhLeaves.begin(), mBvhLeaves.end(), ilt);
+
+        //cout << "viewcells : " << mViewCells.size() << endl;
         for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
-        {//cout << "j";
+        {
                 ExchangePvs(*vit);
         }
@@ -773 +774 @@
                 //ViewCellsMap::iterator vit = mViewCells.find(viewCellId);
 //              BspViewCell *viewCell = static_cast<BspViewCell *>((*vit).second);
+
                 BspViewCell *viewCell = static_cast<BspViewCell *>(*vit);
                 if (viewCell->GetId() == viewCellId)
@@ -1508 +1510 @@
 #endif
 
-        if (0 && PVS_HACK)
+        if (1 && PVS_HACK)
                 handler.ExchangeElements();
 

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

@@ -366 +366 @@
                   new QtGlRendererBuffer(1024, 1024,
                                                                  preprocessor->mSceneGraph,
-                                                           preprocessor->mViewCellsManager,
+                                                                 preprocessor->mViewCellsManager,
                                                                  preprocessor->mKdTree);
           }