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

Timestamp:

01/29/07 19:00:03 (17 years ago)

Author:

mattausch

Message:

debug version: something wrong with the pvs!

File:

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

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

@@ -406 +406 @@
         else
         {
-                while (totalSamples < mInitialSamples) {
+                while (totalSamples < mInitialSamples) 
+                {
                         int passContributingSamples = 0;
                         int passSampleContributions = 0;
@@ -477 +478 @@
                 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;
-                }*/
         }
 
@@ -519 +510 @@
         // get viewcells as kd tree boxes
         vector<AxisAlignedBox3> kdViewcells;
-        if (0) {
+        if (0) 
+        {
                 vector<KdLeaf *> leaves;
                 mKdTree->CollectLeaves(leaves);
@@ -541 +533 @@
         while (samples < mVssSamples) 
         {
-
                 int num = mVssSamplesPerPass;
                 SimpleRayContainer rays;
                 VssRayContainer vssRays;
 
-                if (!mUseImportanceSampling) {
+                if (!mUseImportanceSampling) 
+                {
                         for (int j=0; j < num; j++) {
                                 Vector3 viewpoint; 
@@ -556 +548 @@
                                                            );
                         }
-                } else {
+                } 
+                else 
+                {
                         num = GenerateImportanceRays(vssTree, num, rays);
                 }
@@ -563 +557 @@
                 vssTree->AddRays(vssRays);
 
-                if (0) {
+                if (0) 
+                {
                         int subdivided = vssTree->UpdateSubdivision();
                         cout<<"subdivided leafs = "<<subdivided<<endl;
@@ -584 +579 @@
                 }
 
-                samples+=num;
+                samples += num;
+
                 float pvs = vssTree->GetAvgPvsSize();
                 cout<<"*****************************\n";
@@ -627 +623 @@
 void VssPreprocessor::DeterminePvsObjects(VssRayContainer &rays)
 {
+        //Preprocessor::DeterminePvsObjects(rays);
+
+        cout << "here4";
         mViewCellsManager->DeterminePvsObjects(rays, true);
 }