Changeset 502 for trunk/VUT

Timestamp:

01/05/06 16:06:31 (19 years ago)

Author:

bittner

Message:

bsp viewcell location

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• GlRenderer.cpp (modified) (5 diffs)
• GlRenderer.h (modified) (6 diffs)
• Makefile (modified) (1 diff)
• RssPreprocessor.cpp (modified) (1 diff)
• ViewCellBsp.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• ViewCellsManager.h (modified) (1 diff)
• default.env (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -26 +26 @@
   //  timerId = startTimer(10);
   mFrame = 0;
+  mWireFrame = false;
 }
 
@@ -81 +82 @@
   
   for (i=0; i < mesh->mFaces.size(); i++) {
-        glBegin(GL_POLYGON);
+        if (mWireFrame)
+          glBegin(GL_POLYGON);
+        else
+          glBegin(GL_LINE_LOOP);
+
         Face *face = mesh->mFaces[i];
         for (int j = 0; j < face->mVertexIndices.size(); j++) {
@@ -309 +314 @@
   // now render im1
   if (viewcell) {
+        if (mTopView) {
+          mWireFrame = true;
+          RenderMeshInstance(viewcell);
+          mWireFrame = false;
+        }
+        
         // init ortographic projection
         glMatrixMode(GL_PROJECTION);
@@ -388 +399 @@
 
   makeCurrent();
-
   SetupProjection(GetWidth(), GetHeight());
   
@@ -481 +491 @@
   mFrame++;
 }
+
+
+void
+GlRendererWidget::SetupCamera()
+{
+  if (!mTopView)
+        GlRenderer::SetupCamera();
+  else {
+        float dist = Magnitude(mSceneGraph->GetBox().Diagonal())*0.05;
+        Vector3 pos = mViewPoint - dist*Vector3(mViewDirection.x,
+                                                                                        1,
+                                                                                        mViewDirection.y);
+        
+        Vector3 target = mViewPoint + dist*mViewDirection;
+        Vector3 up(0,1,0);
+        
+        glLoadIdentity();
+        gluLookAt(mViewPoint.x, mViewPoint.y, mViewPoint.z,
+                          target.x, target.y, target.z,
+                          up.x, up.y, up.z);
+  }
+
+}

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -24 +24 @@
   int frames;
   int errorFreeFrames;
-  
+
   PvsRenderStatistics() { Reset(); }
   
@@ -61 +61 @@
   
   int mFrame;
-  
+  bool mWireFrame;
+
   QWaitCondition mRenderingFinished;
   
@@ -76 +77 @@
   void RenderMesh(Mesh *m);
   void SetupMaterial(Material *m);
-  void SetupCamera();
+  virtual void SetupCamera();
   void RandomViewPoint();
   
@@ -119 +120 @@
         makeCurrent();
         InitGL();
-        
+        doneCurrent();
+
   }
   
@@ -142 +144 @@
 public:
 
+  // point of the last mouse click used for movement in the scene
+  Vector3 mousePoint;
+
+  bool mTopView;
+  
   GlRendererWidget(SceneGraph *sceneGraph,
                                    ViewCellsManager *viewcells,
@@ -147 +154 @@
                                    ):
         GlRenderer(sceneGraph, viewcells), QGLWidget(parent, shareWidget, f)
-  {}
+  {
+        mTopView = false;
+  }
 
-  Vector3 mousePoint;
-  
+  virtual void SetupCamera();
+
   void initializeGL() {
         InitGL();

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.0) on: st 4. I 19:53:26 2006
+# Generated by qmake (2.00a) (Qt 4.1.0) on: ?t 5. I 09:42:49 2006
 # Project:  preprocessor.pro
 # Template: app

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -610 +610 @@
                 "#RssSamples\n" <<rssSamples<<endl;
           
-        ComputeRenderError();
-
-        mVssRays.PrintStatistics(mStats);
-        mViewCellsManager->PrintPvsStatistics(mStats);
-
-        VssRayContainer selectedRays;
-        int desired = Max(
-                                          mViewCellsManager->GetPostProcessSamples(),
-                                          mViewCellsManager->GetVisualizationSamples());
-
-        mVssRays.SelectRays(desired, selectedRays);
-        
-        //-- post process view cells
-        mViewCellsManager->PostProcess(mObjects, selectedRays);
-        
-        //-- several visualizations and statistics
-        Debug << "view cells after post processing: " << endl;
-        mViewCellsManager->PrintStatistics(Debug);
-        
-        if (1) 
-          mViewCellsManager->Visualize(mObjects, selectedRays);
-  }
+
+          mVssRays.PrintStatistics(mStats);
+          mViewCellsManager->PrintPvsStatistics(mStats);
+          
+          VssRayContainer selectedRays;
+          int desired = Max(
+                                                mViewCellsManager->GetPostProcessSamples(),
+                                                mViewCellsManager->GetVisualizationSamples());
+          
+          mVssRays.SelectRays(desired, selectedRays);
+          
+          //-- post process view cells
+          mViewCellsManager->PostProcess(mObjects, selectedRays);
+          
+          //-- several visualizations and statistics
+          Debug << "view cells after post processing: " << endl;
+          mViewCellsManager->PrintStatistics(Debug);
+          
+          if (1) 
+                mViewCellsManager->Visualize(mObjects, selectedRays);
+
+          ComputeRenderError();
+          
+        }
 
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -2676 +2676 @@
 BspTree::GetViewCell(const Vector3 &point)
 {
+  if (mRoot == NULL)
+        return NULL;
+  
+
   stack<BspNode *> nodeStack;
   nodeStack.push(mRoot);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -1035 +1035 @@
                 exporter->ExportPolygons(cell);
         }
+}
+
+ViewCell *
+BspViewCellsManager::GetViewCell(const Vector3 &point)
+{
+  if (!mBspTree)
+        return NULL;
+  return mBspTree->GetViewCell(point);
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -344 +344 @@
 
   /** Get a viewcell containing the specified point */
-  ViewCell *GetViewCell(const Vector3 &point) { return NULL; }
+  ViewCell *GetViewCell(const Vector3 &point);
 
 protected:

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -23 +23 @@
         useGlRenderer true
 #       type sampling
-        type vss
-#       type rss
+#       type vss
+        type rss
 }
 
@@ -169 +169 @@
         #type kdTree
         #type vspKdTree
-         type bspTree
-        # type vspBspTree
+        type bspTree
+        #type vspBspTree
         
         #type sceneDependent