Changeset 2231

Timestamp:

03/12/07 00:11:00 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Exporter.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (2 diffs)
• Intersectable.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• VspTree.cpp (modified) (5 diffs)

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

@@ -153 +153 @@
                 SetFilled();
                 
-                if (0)
+                if (1)
                         ExportGeometry(leaf->mObjects, true, box);
                 else

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

@@ -844 +844 @@
         
         // assume pvs sampled sufficiently => take child pvs
-        if (avgRaysPerObjects > mMaxAvgRaysPerObject)
+        if (avgRaysPerObjects >= mMaxAvgRaysPerObject)
         {
                 return childPvs;
@@ -872 +872 @@
         const float newPvs = alpha * childPvs + (1.0f - alpha) * totalPvs;
 #endif
-cout << "b ";// << avgRaysPerObjects << " ";
+        cout << "b ";// << avgRaysPerObjects << " ";
         //cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl;
         
         if ((newPvs < childPvs - Limits::Small) || (newPvs > totalPvs + Limits::Small))
-                cout << "Error! " << newPvs << " smaller than child pvs or larger than parent pvs" << endl;
+                cout << "w: " << newPvs << " < child (" 
+                         << childPvs << ") or > parent (" << totalPvs << ")" << endl;
 
         return newPvs;

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

@@ -104 +104 @@
                                                                                  Vector3 &normal) 
 {
-        cerr << "GetRandomSurfacePoint(u,v...) not yet implemented" << endl;
+        cerr << "GetRandomSurfacePoint(u,v...) not yet implemented for type " << Type() << endl;
         return 1;
 }

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

@@ -186 +186 @@
                         IntermediateDirectory="bin\Release"
                         ConfigurationType="1"
-                        CharacterSet="2">
+                        CharacterSet="2"
+                        WholeProgramOptimization="TRUE">
                         <Tool
                                 Name="VCCLCompilerTool"
@@ -214 +215 @@
                                 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/Preprocessor.exe"
+                                OutputFile="../bin/release/Preprocessor2.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;&quot;$(QTDIR)\lib&quot;;.\QtInterface\Release;&quot;$(CG_LIB_PATH)&quot;"

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

@@ -6332 +6332 @@
         Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
 
-        //Vector3 scale(0.9f, 0.9f, 0.9f);
-        Vector3 scale(1.0f, 1.0f, 1.0f);
+        Vector3 scale(0.9f, 0.9f, 0.9f);
+        //Vector3 scale(1.0f, 1.0f, 1.0f);
 
         if (exporter)

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

@@ -30 +30 @@
 
 
+#define VISUALIZE_SPLIT 0
 #define USE_FIXEDPOINT_T 0
 
@@ -1343 +1344 @@
 
 #endif
-#if VISUALIZE_SPLIT
-        Exporter *exporter = Exporter::GetExporter("split.wrl");
-        exporter->ExportBox(box);
-
-                RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end();
-
-        for (rit = tData.mRays->begin(); rit != rit_end; ++ rit)
-        {
-                RayInfo rayInf = *rit;
-
-                VssRay *ray = rayInf.mRay;
-                
-                exporter->ExportIntersectable(GetParentObject(ray->mTerminationObject));
-
-                AxisAlignedBox3 candidatePlane;
-                exporter->ExportBox(candidatePlane);
-        }
-    delete exporter;
-#endif
+
+
         for (ci = mLocalSubdivisionCandidates->begin(); ci != ci_end; ++ ci)
         {
@@ -1425 +1409 @@
         const float newRenderCost = penaltyFront * pFront + penaltyBack * pBack;
 
+#if VISUALIZE_SPLIT
+        
+        const int leaves = mVspStats.Leaves();
+        const bool showViz = ((axis == 0) && (leaves == 500));
+
+        if (showViz)
+        {
+                Exporter *exporter;
+
+                exporter = Exporter::GetExporter("split.wrl");
+                exporter->SetWireframe();
+
+                exporter->ExportBox(tData.mBoundingBox);
+
+                RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end();
+
+                exporter->SetFilled();
+        
+                for (rit = tData.mRays->begin(); rit != rit_end; ++ rit)
+                {
+                        RayInfo rayInf = *rit;
+
+                        // export objects
+                        VssRay *ray = rayInf.mRay;      
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(ray->mTerminationObject);
+                        exporter->ExportIntersectable(leaf);
+
+                }
+
+                AxisAlignedBox3 vizPlaneBox;
+                vizPlaneBox = tData.mBoundingBox;
+        
+                Vector3 scale(1, 1, 1); scale[axis] = 0.05f;
+                vizPlaneBox.Scale(scale);
+                exporter->ExportBox(vizPlaneBox);
+
+                delete exporter;
+        }
+
+#endif
+
         if (splitPlaneFound)
         {
@@ -1430 +1455 @@
         }
         
+
 #ifdef GTP_DEBUG
         cout << "\n((((( eval local cost )))))" << endl
@@ -1437 +1463 @@
                   << "render cost decrease: " << oldRenderCost * volRatio - newRenderCost * volRatio << endl;
 #endif
+
         return ratio;
 }