Changeset 1581 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

10/07/06 22:54:13 (18 years ago)

Author:

bittner

Message:

Qtglwidget changes - second view + trackball - ray casting seems not functional

File:

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

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

@@ -428 +428 @@
         if (mLoadViewCells)
         {       
-                Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
-                cout << "loading view cells from " << buf << endl;
-                
-                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true);
-
-                if (!mViewCellsManager)
-                        return false;
+          Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
+          cout << "loading view cells from " << buf << endl;
+          
+          mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true);
+          
+          if (!mViewCellsManager)
+                return false;
         }
         else
@@ -488 +488 @@
 
         mViewCellsManager->SetRenderer(mRenderSimulator);
-
+        
         if (mUseGlRenderer || mUseGlDebugger)
-        {
+          {
                 // NOTE: render texture should be power of 2 and square
                 // renderer must be initialised
                 // $$matt
-//              renderer = new GlRendererBuffer(1024, 768, mSceneGraph, mViewCellsManager, mKdTree);
+                //              renderer = new GlRendererBuffer(1024, 768, mSceneGraph, mViewCellsManager, mKdTree);
                 //              renderer->makeCurrent();
                 
-        }
-        
+          }
+
+        mViewCellsManager->SetPreprocessor(this);
         return true;
 }
@@ -505 +506 @@
 bool Preprocessor::ConstructViewCells()
 {
-        // construct view cells using it's own set of samples
-        mViewCellsManager->Construct(this);
-
-        // visualizations and statistics
-        Debug << "finished view cells:" << endl;
-        mViewCellsManager->PrintStatistics(Debug);
-            
-        return true;
+  // construct view cells using it's own set of samples
+  mViewCellsManager->Construct(this);
+  
+  // visualizations and statistics
+  Debug << "finished view cells:" << endl;
+  mViewCellsManager->PrintStatistics(Debug);
+  
+  return true;
 }
 
@@ -900 +901 @@
         }
 
+        if (i % 10000 == 0)
+                cout<<".";
+
 #if DEBUB_RAYCAST
         long t2 = GetTime();
-        if (i % 10000 == 0)
-                cout<<".";
-
         if (castDoubleRays)
                 cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;