Changeset 598 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

02/05/06 11:03:17 (18 years ago)

Author:

mattausch

Message:

added cutting plane and enlarging view space

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (16 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -85 +85 @@
 {
         DEL_PTR(mRenderer);
-        //CLEAR_CONTAINER(mViewCells);
-        DEL_PTR(mViewCellsTree);
+
+        if (!ViewCellsTreeConstructed())
+                CLEAR_CONTAINER(mViewCells);
+        else
+                DEL_PTR(mViewCellsTree);
 
         CLEAR_CONTAINER(mMeshContainer);
@@ -689 +692 @@
         int axis = 0;
 
-        Vector3 point = mViewSpaceBox.Center();
+        const float factor = 0.55;
+        Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * factor;
 
         if (mUseCuttingPlaneForViz)
@@ -1277 +1281 @@
         if (exporter)
         {
+                //exporter->SetFilled();
+
+                if (mExportGeometry)
+                        exporter->ExportGeometry(objects);
+
                 Material m;
                 m.mDiffuseColor = RgbColor(1, 0, 0);
@@ -1288 +1297 @@
                 exporter->SetForcedMaterial(m);
                 //exporter->ResetForcedMaterial();
-
-                exporter->SetFilled();
-
-                if (mExportGeometry)
-                        exporter->ExportGeometry(objects);
 
                 delete exporter;
@@ -1402 +1406 @@
                                                                           ViewCell *vc) const
 {
-        if (mColorCode == 0) // Random color
-        {
-                exporter->ResetForcedMaterial();
-                return;
-        }
+                const bool vcValid = CheckValidity(vc, mMinPvsSize, mMaxPvsSize);
 
         float importance = 0;
+        static Material m;
 
         switch (mColorCode)
         {
+        case 0: // Random
+                {
+                        if (vcValid)
+                        {
+                                m.mDiffuseColor.r = 0.5f + RandomValue(0.0f, 0.5f);
+                                m.mDiffuseColor.g = 0.5f + RandomValue(0.0f, 0.5f);
+                                m.mDiffuseColor.b = 0.5f + RandomValue(0.f, 0.5f);
+                        }
+                        else
+                        {
+                                m.mDiffuseColor.r = 0.0f;
+                                m.mDiffuseColor.g = 1.0f;
+                                m.mDiffuseColor.b = 0.0f;
+                        }
+
+                        exporter->SetForcedMaterial(m);
+                        return;
+                }
+                
         case 1: // pvs
                 {
                         importance = (float)vc->GetPvs().GetSize() /
                                 (float)mViewCellsStats.maxPvs;
+
                 }
                 break;
         case 2: // merges
                 {
-                        importance = (float)mViewCellsTree->GetSize(vc) /
-                                (float)mViewCellsStats.maxLeaves;
-                }
-                break;
+            int lSize = mViewCellsTree->GetSize(vc);
+        
+                        importance = (float)lSize / (float)mViewCellsStats.maxLeaves;
+                }
+                //break;
         case 3: // merge tree differene
                 {
                         // TODO
+                        //importance = (float)GetMaxTreeDiff(vc) /
+                        //      (float)(mVspBspTree->GetStatistics().maxDepth * 2);
+
                 }
                 break;
@@ -1433 +1458 @@
         }
 
-        Material m;
-        m.mDiffuseColor.b = 1.0f;
+        // special color code for invalid view cells
         m.mDiffuseColor.r = importance;
         m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
-
+        m.mDiffuseColor.b = vcValid ? 1.0f : 0.0f;
+
+        //Debug << "importance: " << importance << endl;
         exporter->SetForcedMaterial(m);
 }
@@ -1466 +1492 @@
                                                    *cuttingPlane,
                                                    mViewSpaceBox, 
-                                                   0.005);
+                                                   0.0001);
 
                 exporter->ExportPolygons(back.mPolys);
@@ -2049 +2075 @@
                 return;
 
+        if (mExportGeometry)
+                exporter->ExportGeometry(objects);
+        
         //exporter->SetWireframe();
         //exporter->ExportVspKdTree(*mVspKdTree, mVspKdTree->GetStatistics().maxPvsSize);
         exporter->ExportVspKdTree(*mVspKdTree);
-
-        if (mExportGeometry)
-                exporter->ExportGeometry(objects);
 
         if (mExportRays)
@@ -2416 +2442 @@
                 if (exporter)
                 {
+                        if (0 && mExportRays)
+                                exporter->ExportRays(rays, RgbColor(1, 1, 1));
+
+                        if (mExportGeometry)
+                                exporter->ExportGeometry(objects);
+
                         //exporter->SetWireframe();
                         exporter->SetFilled();
                         ExportViewCellsForViz(exporter);
-
-                        if (0 && mExportRays)
-                                exporter->ExportRays(rays, RgbColor(1, 1, 1));
-
-                        if (mExportGeometry)
-                                exporter->ExportGeometry(objects);
 
                         delete exporter;
@@ -2497 +2523 @@
                 if (exporter)
                 {
-                        if (0)
-                                exporter->SetWireframe();
-                        else
-                                exporter->SetFilled();
-                        ExportViewCellsForViz(exporter);
-
                         if (mExportGeometry)
                         {
@@ -2513 +2533 @@
                         }
 
+                        if (0)
+                                exporter->SetWireframe();
+                        else
+                                exporter->SetFilled();
+
+                        ExportViewCellsForViz(exporter);
+
                         delete exporter;
                 }
@@ -2600 +2627 @@
                 RefineViewCells(postProcessRays, objects);
 
-        if (mCompressViewCells)
+        //-- compression
+
+        if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
                 int pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
@@ -2628 +2657 @@
 
 
-        //-- export shuffled view cells
+        //-- export refined (shuffled) view cells
         if (0)
         {
@@ -2701 +2730 @@
         // real meshes are only contructed only at this stage
         FinalizeViewCells(true);
-
-        // HACK: removes view cells in bsp leaves with active ones
-        if (0)
-                AddCurrentViewCellsToHierarchy();
-
 
         // write view cells to disc
@@ -3056 +3080 @@
                         if (vcValid)
                         {
-                                m.mDiffuseColor.r = RandomValue(0.3f, 1.0f);
-                                m.mDiffuseColor.g = RandomValue(0.3f, 1.0f);
-                                m.mDiffuseColor.b = RandomValue(0.3f, 1.0f);
+                                m.mDiffuseColor.r = 0.5f + RandomValue(0.0f, 0.5f);
+                                m.mDiffuseColor.g = 0.5f + RandomValue(0.0f, 0.5f);
+                                m.mDiffuseColor.b = 0.5f + RandomValue(0.f, 0.5f);
                         }
                         else
@@ -3140 +3164 @@
                                                            *cuttingPlane,
                                                            mViewSpaceBox, 
-                                                           0.005);
+                                                           0.0001);
 
                         exporter->ExportPolygons(back.mPolys);