Changeset 1563 for GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

Timestamp:

10/03/06 22:03:58 (18 years ago)

Author:

mattausch

Message:

fixed bug with view space box

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp (modified) (4 diffs)

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

@@ -40 +40 @@
   
   useViewspacePlane = mUseViewSpaceBox; //hack
-
-  mViewSpaceBox.Initialize();
   
   Debug << "*********** vss preprocessor options **************" << endl;
@@ -158 +156 @@
 
   exporter->SetForcedMaterial(RgbColor(1,0,1));
-  exporter->ExportBox(mViewSpaceBox);
+  exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
   exporter->ResetForcedMaterial();
 
@@ -201 +199 @@
 
   exporter->SetForcedMaterial(RgbColor(1,0,0));
-  exporter->ExportBox(mViewSpaceBox);
+  exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
   exporter->ResetForcedMaterial();
 
@@ -373 +371 @@
         Debug << "type: vss" << endl;
 
-  long startTime = GetTime();
-
-  int totalSamples = 0;
-
-
-  AxisAlignedBox3 box(mKdTree->GetBox());
-  
-  if (!useViewspacePlane) {
-        float size = 0.05f;
-        float s = 0.5f - size;
-        float olds = Magnitude(box.Size());
-        box.Enlarge(box.Size()*Vector3(-s));
-        Vector3 translation = Vector3(-olds*0.1f, 0, 0);
-        box.SetMin(box.Min() + translation);
-        box.SetMax(box.Max() + translation);
-  } else {
-
-        // sample city like heights
-        box.SetMin(1, box.Min(1) + box.Size(1)*0.2f);
-        box.SetMax(1, box.Min(1) + box.Size(1)*0.3f);
-  }
-
-  if (use2dSampling)
-        box.SetMax(1, box.Min(1));
-
-  cout << "use view space box=" << mUseViewSpaceBox << endl;
-
-  
-  if (mUseViewSpaceBox)
-  {
-          if (!mEnlargeViewSpace)
-          {
-                  mViewSpaceBox = AxisAlignedBox3(box);
-          }
-          else
-          {
-                  mViewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
-
-                  if (0) 
-                  {
-                          // HACK: enlarge in y directon
-                          Vector3 size = mViewSpaceBox.Size();
-                        
-                          size[1] *= 1.25;
-                          Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
-                          //Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
-
-                          mViewSpaceBox.Enlarge(enlarge);
-                          mViewSpaceBox.SetMax(mViewSpaceBox.Max() + enlarge);
-                  } 
-                  else 
-                  {
-                          AxisAlignedBox3 tbox(mViewSpaceBox);
-
-                          Vector3 size = mViewSpaceBox.Size();
-                          tbox.SetMax(0, mViewSpaceBox.Max(0) + size[0] * 0.5f);
-                          tbox.SetMin(0, mViewSpaceBox.Min(0) + size[0]);
-                          mViewSpaceBox = tbox;
-                  }             
-          }
-  }
-  else
-  {
-          mViewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
-  }
-  
-  mSceneGraph->CollectObjects(&mObjects);
-
-  if (!mLoadViewCells)
-  {
-          //-- generate new view cells from the scratch
-          //-- for construction the manager uses it's own set of samples
-          ConstructViewCells(mViewSpaceBox);
-  }
+        const long startTime = GetTime();
+        int totalSamples = 0;
+
+        if (mUseViewSpaceBox)
+        {
+                AxisAlignedBox3 viewSpaceBox;
+                viewSpaceBox.Initialize();
+
+                viewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
+                AxisAlignedBox3 tbox(mViewCellsManager->GetViewSpaceBox());
+
+                const Vector3 size = tbox.Size();
+                viewSpaceBox.SetMax(0, tbox.Max(0) + size[0] * 0.5f);
+                viewSpaceBox.SetMin(0, tbox.Min(0) + size[0]);
+                 
+                // change the view space of the view cells manager
+                mViewCellsManager->SetViewSpaceBox(viewSpaceBox);
+        }
+
+
+        mSceneGraph->CollectObjects(&mObjects);
+
+        if (!mLoadViewCells)
+        {
+                //-- generate new view cells from the scratch
+                //-- for construction the manager uses it's own set of samples
+                ConstructViewCells();
+        }
 #if 0
-  else 
-  {      
-          //-- load view cells from file
-          //-- test successful view cells loading by exporting them again
-      VssRayContainer dummies;
-          mViewCellsManager->Visualize(mObjects, dummies);
-          mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
-  }
+        else 
+        {        
+                //-- load view cells from file
+                //-- test successful view cells loading by exporting them again
+                VssRayContainer dummies;
+                mViewCellsManager->Visualize(mObjects, dummies);
+                mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
+        }
 #endif
 
-  VssTree *vssTree = NULL; 
-  const long initialTime = GetTime();
-
-  if (mLoadInitialSamples)
-  {
-          cout << "Loading samples from file ... ";
-          LoadSamples(mVssRays, mObjects);
-          cout << "finished\n" << endl;
-          totalSamples = (int)mVssRays.size();
-  }
-  else
-  {
-        while (totalSamples < mInitialSamples) {
-                int passContributingSamples = 0;
-                int passSampleContributions = 0;
-                int passSamples = 0;
-
-                int index = 0;
-
-                int sampleContributions;
-
-                int s = Min(mSamplesPerPass, mInitialSamples);
-                for (int k=0; k < s; k++) 
+        VssTree *vssTree = NULL; 
+        const long initialTime = GetTime();
+
+        if (mLoadInitialSamples)
+        {
+                cout << "Loading samples from file ... ";
+                LoadSamples(mVssRays, mObjects);
+                cout << "finished\n" << endl;
+                totalSamples = (int)mVssRays.size();
+        }
+        else
+        {
+                while (totalSamples < mInitialSamples) {
+                        int passContributingSamples = 0;
+                        int passSampleContributions = 0;
+                        int passSamples = 0;
+
+                        int index = 0;
+
+                        int sampleContributions;
+
+                        int s = Min(mSamplesPerPass, mInitialSamples);
+                        for (int k=0; k < s; k++) 
+                        {
+                                Vector3 viewpoint; 
+
+                                mViewCellsManager->GetViewPoint(viewpoint);
+                                const Vector3 direction = GetDirection(viewpoint, &mViewCellsManager->GetViewSpaceBox());
+
+                                const SimpleRay sray(viewpoint, direction);
+                                sampleContributions = mRayCaster->CastRay(sray, mVssRays, mViewCellsManager->GetViewSpaceBox(), true);
+
+                                if (sampleContributions) {
+                                        passContributingSamples ++;
+                                        passSampleContributions += sampleContributions;
+                                }
+                                passSamples++;
+                                totalSamples++;
+                        }
+
+                        mPass++;
+                        int pvsSize = 0;
+                        float avgRayContrib = (passContributingSamples > 0) ?
+                                passSampleContributions/(float)passContributingSamples : 0;
+
+                        cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+                        cout << "#TotalSamples=" << totalSamples/1000
+                                << "#SampleContributions=" << passSampleContributions << " ("
+                                << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
+                                << pvsSize/(float)mObjects.size() << endl
+                                << "avg ray contrib=" << avgRayContrib << endl;
+
+                        mStats <<
+                                "#Pass\n" <<mPass<<endl<<
+                                "#Time\n" << TimeDiff(startTime, GetTime())*1e-3 << endl<<
+                                "#TotalSamples\n" << totalSamples<< endl<<
+                                "#SampleContributions\n" << passSampleContributions << endl <<
+                                "#PContributingSamples\n"<<100*passContributingSamples/(float)passSamples<<endl <<
+                                "#AvgPVS\n"<< pvsSize/(float)mObjects.size() << endl <<
+                                "#AvgRayContrib\n" << avgRayContrib << endl;
+                }
+
+                cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
+
+
+
+        }
+
+
+        cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl << flush;
+        Debug << (int)mVssRays.size() << " rays generated in " 
+                << TimeDiff(initialTime, GetTime()) * 1e-3 << " seconds" << endl;
+
+        if (mStoreInitialSamples)
+        {
+                cout << "Writing " << (int)mVssRays.size() << " samples to file ... ";
+                ExportSamples(mVssRays);
+                cout << "finished\n" << endl;
+
+                /*VssRayContainer dummyRays;
+                LoadSamples(dummyRays, mObjects);
+                Debug << "rays " << (int)mVssRays.size() << " " << dummyRays.size() << endl;
+
+                for (int i = 0; i < (int)mVssRays.size(); ++ i)
                 {
-                        Vector3 viewpoint; 
-                
-                        mViewCellsManager->GetViewPoint(viewpoint);
-                        const Vector3 direction = GetDirection(viewpoint, &mViewSpaceBox);
-
-                        const SimpleRay sray(viewpoint, direction);
-                        sampleContributions = mRayCaster->CastRay(sray, mVssRays, mViewSpaceBox, true);
-
-                        if (sampleContributions) {
-                                passContributingSamples ++;
-                                passSampleContributions += sampleContributions;
+                Debug << mVssRays[i]->GetOrigin() << " " << mVssRays[i]->GetTermination() << " " << mVssRays[i]->mOriginObject << " " << mVssRays[i]->mTerminationObject << endl;
+                Debug << dummyRays[i]->GetOrigin() << " " << dummyRays[i]->GetTermination() << " " << dummyRays[i]->mOriginObject << " " << dummyRays[i]->mTerminationObject << endl << endl;
+                }*/
+        }
+
+
+        //int numExportRays = 2000;
+        int numExportRays = 0;
+
+        if (numExportRays) {
+                char filename[64];
+                sprintf(filename, "vss-rays-initial.x3d");
+                ExportRays(filename, mVssRays, numExportRays);
+        }
+
+        vssTree = new VssTree;
+        // viewcells = Construct(mVssRays);
+
+        vssTree->Construct(mVssRays, NULL);
+        cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
+
+        if (0) ExportRays("kdtree.x3d", mVssRays, 10);
+
+        if (0)
+        {
+                ExportVssTree("vss-tree-100.x3d", vssTree, Vector3(1,0,0));
+                ExportVssTree("vss-tree-001.x3d", vssTree, Vector3(0,0,1));
+                ExportVssTree("vss-tree-101.x3d", vssTree, Vector3(1,0,1));
+                ExportVssTree("vss-tree-101m.x3d", vssTree, Vector3(-1,0,-1));
+                ExportVssTreeLeaves(vssTree, 10);
+        }
+
+        // viewcells->UpdatePVS(newVssRays);
+        // get viewcells as kd tree boxes
+        vector<AxisAlignedBox3> kdViewcells;
+        if (0) {
+                vector<KdLeaf *> leaves;
+                mKdTree->CollectLeaves(leaves);
+                vector<KdLeaf *>::const_iterator it;
+                int targetLeaves = 50;
+                float prob = targetLeaves/(float)leaves.size();
+                for (it = leaves.begin(); it != leaves.end(); ++it)
+                        if (RandomValue(0.0f,1.0f) < prob)
+                                kdViewcells.push_back(mKdTree->GetBox(*it));
+
+                float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
+                cout<<"Initial average PVS size = "<<avgPvs<<endl;
+        }
+
+
+        int samples = 0;
+        int pass = 0;
+
+
+        // cast view cell samples
+        while (samples < mVssSamples) 
+        {
+
+                int num = mVssSamplesPerPass;
+                SimpleRayContainer rays;
+                VssRayContainer vssRays;
+
+                if (!mUseImportanceSampling) {
+                        for (int j=0; j < num; j++) {
+                                Vector3 viewpoint; 
+                                mViewCellsManager->GetViewPoint(viewpoint);
+                                Vector3 direction = GetDirection(viewpoint, NULL);
+                                rays.push_back(SimpleRay(viewpoint, direction));
                         }
-                        passSamples++;
-                        totalSamples++;
+                } else {
+                        num = GenerateImportanceRays(vssTree, num, rays);
                 }
 
-                mPass++;
-                int pvsSize = 0;
-                float avgRayContrib = (passContributingSamples > 0) ?
-                        passSampleContributions/(float)passContributingSamples : 0;
-
-                cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
-                cout << "#TotalSamples=" << totalSamples/1000
-                        << "#SampleContributions=" << passSampleContributions << " ("
-                        << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
-                        << pvsSize/(float)mObjects.size() << endl
-                        << "avg ray contrib=" << avgRayContrib << endl;
-
-                mStats <<
-                        "#Pass\n" <<mPass<<endl<<
-                        "#Time\n" << TimeDiff(startTime, GetTime())*1e-3 << endl<<
-                        "#TotalSamples\n" << totalSamples<< endl<<
-                        "#SampleContributions\n" << passSampleContributions << endl <<
-                        "#PContributingSamples\n"<<100*passContributingSamples/(float)passSamples<<endl <<
-                        "#AvgPVS\n"<< pvsSize/(float)mObjects.size() << endl <<
-                        "#AvgRayContrib\n" << avgRayContrib << endl;
-          }
- 
-          cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-
-
-          
-  }
- 
-
-  cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl << flush;
-  Debug << (int)mVssRays.size() << " rays generated in " 
-            << TimeDiff(initialTime, GetTime()) * 1e-3 << " seconds" << endl;
-
-  if (mStoreInitialSamples)
-  {
-          cout << "Writing " << (int)mVssRays.size() << " samples to file ... ";
-          ExportSamples(mVssRays);
-          cout << "finished\n" << endl;
-
-          /*VssRayContainer dummyRays;
-          LoadSamples(dummyRays, mObjects);
-          Debug << "rays " << (int)mVssRays.size() << " " << dummyRays.size() << endl;
-
-          for (int i = 0; i < (int)mVssRays.size(); ++ i)
-          {
-                  Debug << mVssRays[i]->GetOrigin() << " " << mVssRays[i]->GetTermination() << " " << mVssRays[i]->mOriginObject << " " << mVssRays[i]->mTerminationObject << endl;
-                  Debug << dummyRays[i]->GetOrigin() << " " << dummyRays[i]->GetTermination() << " " << dummyRays[i]->mOriginObject << " " << dummyRays[i]->mTerminationObject << endl << endl;
-          }*/
-  }
-
-  
-  //int numExportRays = 2000;
-  int numExportRays = 0;
-
-  if (numExportRays) {
-        char filename[64];
-        sprintf(filename, "vss-rays-initial.x3d");
-        ExportRays(filename, mVssRays, numExportRays);
-  }
-
-  vssTree = new VssTree;
-  // viewcells = Construct(mVssRays);
-
-  vssTree->Construct(mVssRays, NULL);
-  cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
-
-  if (0) ExportRays("kdtree.x3d", mVssRays, 10);
-
-  if (0)
-  {
-          ExportVssTree("vss-tree-100.x3d", vssTree, Vector3(1,0,0));
-          ExportVssTree("vss-tree-001.x3d", vssTree, Vector3(0,0,1));
-          ExportVssTree("vss-tree-101.x3d", vssTree, Vector3(1,0,1));
-          ExportVssTree("vss-tree-101m.x3d", vssTree, Vector3(-1,0,-1));
-          ExportVssTreeLeaves(vssTree, 10);
-  }
-
-  // viewcells->UpdatePVS(newVssRays);
-  // get viewcells as kd tree boxes
-  vector<AxisAlignedBox3> kdViewcells;
-  if (0) {
-        vector<KdLeaf *> leaves;
-        mKdTree->CollectLeaves(leaves);
-        vector<KdLeaf *>::const_iterator it;
-        int targetLeaves = 50;
-        float prob = targetLeaves/(float)leaves.size();
-        for (it = leaves.begin(); it != leaves.end(); ++it)
-          if (RandomValue(0.0f,1.0f) < prob)
-                kdViewcells.push_back(mKdTree->GetBox(*it));
-
-        float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
-        cout<<"Initial average PVS size = "<<avgPvs<<endl;
-  }
-
-
-  int samples = 0;
-  int pass = 0;
-
-  
-  // cast view cell samples
-  while (samples < mVssSamples) 
-  {
-        
-        int num = mVssSamplesPerPass;
-        SimpleRayContainer rays;
-        VssRayContainer vssRays;
-
-        if (!mUseImportanceSampling) {
-          for (int j=0; j < num; j++) {
-                Vector3 viewpoint; 
-                mViewCellsManager->GetViewPoint(viewpoint);
-                Vector3 direction = GetDirection(viewpoint, NULL);
-                rays.push_back(SimpleRay(viewpoint, direction));
-          }
-        } else {
-          num = GenerateImportanceRays(vssTree, num, rays);
-        }
-
-        CastRays(rays, vssRays, true);
-        vssTree->AddRays(vssRays);
-
-        if (0) {
-          int subdivided = vssTree->UpdateSubdivision();
-          cout<<"subdivided leafs = "<<subdivided<<endl;
-        }
-
-        float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
-        cout<<"Average PVS size = "<<avgPvs<<endl;
-
-        /// compute view cell contribution of rays
-        mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
-        
-        if (numExportRays) {
-          char filename[64];
-          if (mUseImportanceSampling)
-                sprintf(filename, "vss-rays-i%04d.x3d", pass);
-          else
-                sprintf(filename, "vss-rays-%04d.x3d", pass);
-
-          ExportRays(filename, vssRays, numExportRays);
-        }
-
-        samples+=num;
-        float pvs = vssTree->GetAvgPvsSize();
-        cout<<"*****************************\n";
-        cout<<samples<<" avgPVS ="<<pvs<<endl;
-        cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
-        cout<<"*****************************\n";
-//      if (samples >= mVssSamples) break;
-        pass ++;
-  }
-
-  if (mTestBeamSampling && mUseGlRenderer)
-  {     
-          TestBeamCasting(vssTree, mViewCellsManager, mObjects);
-  }
-
-  if (0)  Debug << vssTree->stat << endl;
-
-  if (0)
-  {
-          VssRayContainer viewCellRays;
-          // compute rays used for view cells construction
-          const int numRays = mViewCellsManager->GetVisualizationSamples();
-          vssTree->CollectRays(viewCellRays, numRays);
-  }
-
-
-  ////////////////////
-  //-- render simulation after construction
-
-  mRenderSimulator->RenderScene();
-  SimulationStatistics ss;
-  mRenderSimulator->GetStatistics(ss);
-  Debug << "\nFinal view cells partition render time\n" << ss << endl;
-  cout << "\nFinal view cells partition render time\n" << ss << endl;
-
-  delete vssTree;
-  
-  return true;
-}
-
-}
+                CastRays(rays, vssRays, true);
+                vssTree->AddRays(vssRays);
+
+                if (0) {
+                        int subdivided = vssTree->UpdateSubdivision();
+                        cout<<"subdivided leafs = "<<subdivided<<endl;
+                }
+
+                float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
+                cout<<"Average PVS size = "<<avgPvs<<endl;
+
+                /// compute view cell contribution of rays
+                mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
+
+                if (numExportRays) {
+                        char filename[64];
+                        if (mUseImportanceSampling)
+                                sprintf(filename, "vss-rays-i%04d.x3d", pass);
+                        else
+                                sprintf(filename, "vss-rays-%04d.x3d", pass);
+
+                        ExportRays(filename, vssRays, numExportRays);
+                }
+
+                samples+=num;
+                float pvs = vssTree->GetAvgPvsSize();
+                cout<<"*****************************\n";
+                cout<<samples<<" avgPVS ="<<pvs<<endl;
+                cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
+                cout<<"*****************************\n";
+                //      if (samples >= mVssSamples) break;
+                pass ++;
+        }
+
+        if (mTestBeamSampling && mUseGlRenderer)
+        {       
+                TestBeamCasting(vssTree, mViewCellsManager, mObjects);
+        }
+
+        if (0)  Debug << vssTree->stat << endl;
+
+        if (0)
+        {
+                VssRayContainer viewCellRays;
+                // compute rays used for view cells construction
+                const int numRays = mViewCellsManager->GetVisualizationSamples();
+                vssTree->CollectRays(viewCellRays, numRays);
+        }
+
+
+        ////////////////////
+        //-- render simulation after construction
+
+        mRenderSimulator->RenderScene();
+        SimulationStatistics ss;
+        mRenderSimulator->GetStatistics(ss);
+        Debug << "\nFinal view cells partition render time\n" << ss << endl;
+        cout << "\nFinal view cells partition render time\n" << ss << endl;
+
+        delete vssTree;
+
+        return true;
+}
+
+}