Changeset 538

Timestamp:

01/14/06 01:41:57 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (1 diff)
• src/AxisAlignedBox3.cpp (modified) (1 diff)
• src/AxisAlignedBox3.h (modified) (1 diff)
• src/Environment.cpp (modified) (1 diff)
• src/GlRenderer.cpp (modified) (9 diffs)
• src/GlRenderer.h (modified) (2 diffs)
• src/Polygon3.cpp (modified) (1 diff)
• src/Preprocessor.cpp (modified) (2 diffs)
• src/Preprocessor.h (modified) (1 diff)
• src/VspBspTree.cpp (modified) (6 diffs)
• src/VssPreprocessor.cpp (modified) (4 diffs)
• src/main.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -30 +30 @@
         samplesPerPass  100000
         initialSamples 300000
-        vssSamples 800000
+        vssSamples 300000
         vssSamplesPerPass 100000
         useImportanceSampling true

trunk/VUT/GtpVisibilityPreprocessor/src/AxisAlignedBox3.cpp

@@ -55 +55 @@
                 Include(*it);
 }
+
+void
+AxisAlignedBox3::Include(Mesh *mesh)
+{
+        VertexContainer::const_iterator it, it_end = mesh->mVertices.end();
+
+        for (it = mesh->mVertices.begin(); it != it_end; ++ it)
+                Include(*it);
+}
+
 
 void

trunk/VUT/GtpVisibilityPreprocessor/src/AxisAlignedBox3.h

@@ -105 +105 @@
   void Include(const Polygon3 &newpoly);
   void Include(const AxisAlignedBox3 &bbox);
+  void Include(Mesh *mesh);
   // Expand the axis-aligned box to include given values in particular axis
   void Include(const int &axis, const float &newBound);

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1434 +1434 @@
                                         "false");
 
+        RegisterOption("Preprocessor.useGlDebugger",
+                                        optBool,
+                                        "useGlDebugger",
+                                        "false");
+
         RegisterOption("Preprocessor.detectEmptyViewSpace",
                                    optBool,

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -21 +21 @@
 
 GlRendererWidget *rendererWidget = NULL;
+GlDebuggerWidget *debuggerWidget = NULL;
 
 
@@ -446 +447 @@
 {
   static int glList = -1;
-  if (glList != -1) {
-        glCallList(glList);
-  } else {
+  if (glList == -1)
+  {
         glList = glGenLists(1);
-        glNewList(glList, GL_COMPILE_AND_EXECUTE);
+        glNewList(glList, GL_COMPILE);
         ObjectContainer::const_iterator oi = mObjects.begin();
         for (; oi != mObjects.end(); oi++)
@@ -456 +456 @@
         glEndList();
   }
+  
+  glCallList(glList);
+  
   return true;
 }
@@ -565 +568 @@
 GlRendererWidget::paintGL()
 {
-  RenderErrors();
-  mFrame++;
+        RenderErrors();
+        
+        mFrame++;
 }
 
@@ -780 +784 @@
         GenQueries((int)beam.mViewCells.size());
 
-        // now check whether any backfacing polygon would pass the depth test
+        // now check whether any backfacing polygon would pass the depth test?
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
         glDepthMask(GL_FALSE);
@@ -799 +803 @@
 
         // at this point, if possible, go and do some other computation
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-        glDepthMask(GL_TRUE);
-        glEnable(GL_CULL_FACE);
+
+        queryIdx = 0;
+        unsigned int pixelCount;
 
         // 8. The number of visible pixels is the number of sample rays which see the source
-        //    object from the corresponding viewcell -> rember these values for later update
-        //   of the viewcell pvs - or update immediatelly?
-
-        //  In general it is not neccessary to rember to extract all the rays cast. I hope it
+        //    object from the corresponding viewcell -> remember these values for later update
+        //   of the viewcell pvs - or update immediately?
+
+        for (vit = beam.mViewCells.begin(); vit != vit_end; ++ vit)
+        {
+                // fetch queries
+                glGetOcclusionQueryuivNV(sQueries[queryIdx ++],
+                                                                 GL_PIXEL_COUNT_NV,
+                                                                 &pixelCount);
+
+                Debug << "visble pixels: " << pixelCount << endl;
+        }
+        
+
+        //  In general it is not neccessary to remember to extract all the rays cast. I hope it
         // would be sufficient to gain only the intergral statistics about the new contributions
         // and so the rss tree would actually store no new rays (only the initial ones)
@@ -815 +830 @@
         // (new viewcell has been discovered) or relative contribution greater than a threashold ... 
 
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        glDepthMask(GL_TRUE);
+        glEnable(GL_CULL_FACE);
+
+
         cgGLDisableProfile(sCgFragmentProfile);
         glDisable(GL_TEXTURE_2D);
@@ -838 +858 @@
 }
 
+
 void GlRendererBuffer::SetupProjectionForViewPoint(const Vector3 &viewPoint, 
                                                                                                  const Beam &beam, 
@@ -855 +876 @@
                           viewPoint.x, viewPoint.y, viewPoint.z, 
                           up.x, up.y, up.z);
-}                         
+}               
+
+  
+ 
+
+/***************************************************************/
+/*             GlDebuggerWidget implementation                             */
+/***************************************************************/
+
+
+GlDebuggerWidget::GlDebuggerWidget(QWidget *parent, GlRendererBuffer *buf)
+      : QGLWidget(QGLFormat(QGL::SampleBuffers), parent), mRenderBuffer(buf)
+{
+        // create the pbuffer
+    //pbuffer = new QGLPixelBuffer(QSize(512, 512), format(), this);
+    timerId = startTimer(20);
+    setWindowTitle(("OpenGL pbuffers"));
+}
+
+
+GlDebuggerWidget::~GlDebuggerWidget()
+{
+        mRenderBuffer->releaseFromDynamicTexture();
+        glDeleteTextures(1, &dynamicTexture);
+        
+        DEL_PTR(mRenderBuffer);
+}
+
+
+void GlDebuggerWidget::initializeGL()
+{
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+
+        glFrustum(-1, 1, -1, 1, 10, 100);
+        glTranslatef(-0.5f, -0.5f, -0.5f);
+        glTranslatef(0.0f, 0.0f, -15.0f);
+        glMatrixMode(GL_MODELVIEW);
+
+        glEnable(GL_CULL_FACE);
+        initCommon();
+        initPbuffer();
+
+}
+
+
+void GlDebuggerWidget::resizeGL(int w, int h)
+{
+        glViewport(0, 0, w, h);
+}
+
+
+void GlDebuggerWidget::paintGL()
+{
+        // draw a spinning cube into the pbuffer..
+        mRenderBuffer->makeCurrent();
+        //mRenderBuffer->SampleBeamContributions();
+        glFlush();
+
+    // rendering directly to a texture is not supported on X11, unfortunately
+    mRenderBuffer->updateDynamicTexture(dynamicTexture);
+   
+    // ..and use the pbuffer contents as a texture when rendering the
+    // background and the bouncing cubes
+    makeCurrent();
+    glBindTexture(GL_TEXTURE_2D, dynamicTexture);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    // draw the background
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+}
+
+
+void GlDebuggerWidget::initPbuffer()
+{
+        // set up the pbuffer context
+    mRenderBuffer->makeCurrent();
+        initCommon();
+
+        glViewport(0, 0, mRenderBuffer->size().width(), mRenderBuffer->size().height());
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glOrtho(-1, 1, -1, 1, -99, 99);
+        glTranslatef(-0.5f, -0.5f, 0.0f);
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+
+        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+
+        // generate a texture that has the same size/format as the pbuffer
+    dynamicTexture = mRenderBuffer->generateDynamicTexture();
+
+        // bind the dynamic texture to the pbuffer - this is a no-op under X11
+        mRenderBuffer->bindToDynamicTexture(dynamicTexture);
+        makeCurrent();
+}
+
+void GlDebuggerWidget::initCommon()
+{
+        glEnable(GL_TEXTURE_2D);
+        glEnable(GL_DEPTH_TEST);
+
+        glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+}

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -19 +19 @@
 class Beam;
 class KdTree;
-
+class QWidget;
+class GlRendererBuffer;
 class BeamSampleStatistics;
 
@@ -214 +215 @@
 extern GlRendererWidget *rendererWidget;
 
+class GlDebuggerWidget : public QGLWidget
+{
+public:
+    GlDebuggerWidget(QWidget *parent, GlRendererBuffer *buf);
+    ~GlDebuggerWidget();
+    void initializeGL();
+    void resizeGL(int w, int h);
+    void paintGL();
+    void timerEvent(QTimerEvent *) { update(); }
+    void mousePressEvent(QMouseEvent *) { killTimer(timerId); }
+    void mouseReleaseEvent(QMouseEvent *) { timerId = startTimer(20); }
+
+    void initCommon();
+    void initPbuffer();
+
+         GlRendererBuffer *mRenderBuffer;
+
+private:
+    GLuint dynamicTexture;
+    int timerId;
+};
+
+extern GlDebuggerWidget *debuggerWidget;
+
 #endif
 

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -133 +133 @@
         else if (classification == FRONT_SIDE)
                 return 1;
-
+        // plane splits polygon
         return 0;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -23 +23 @@
 {
   environment->GetBoolValue("Preprocessor.useGlRenderer", mUseGlRenderer);
+  
   // renderer will be constructed when the scene graph and viewcell manager will be known
   renderer = NULL;
   
+  environment->GetBoolValue("Preprocessor.useGlDebugger", mUseGlDebugger);
 }
 
@@ -256 +258 @@
                 mViewCellsFilename = buf;
         }
-        if (mUseGlRenderer)
+        if (mUseGlRenderer || mUseGlDebugger)
           renderer = new GlRendererBuffer(1024, 768, mSceneGraph, mViewCellsManager, mKdTree);
 

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -125 +125 @@
 
   bool mUseGlRenderer;
-  
+  bool mUseGlDebugger;
+
   bool mLoadViewCells;
 

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1480 +1480 @@
         stack<BspNode *> nodeStack;
 
-        if (!mRoot)
+        if (!root)
                 return;
 
-        nodeStack.push(mRoot);
+        nodeStack.push(root);
         
         while (!nodeStack.empty()) 
@@ -2182 +2182 @@
                 geom->IncludeInBox(box);
 
-                Debug << "box:\n " << box << endl;;
                 const int side = beam.ComputeIntersection(box);
                 
@@ -2188 +2187 @@
                 {
                 case -1:
-                        Debug << "here999" << endl;
                         CollectViewCells(node, beam.mViewCells, true);
                         break;
@@ -2195 +2193 @@
                         if (node->IsLeaf())
                         {
-                                Debug << "here2" << endl;
                                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
                         
@@ -2206 +2203 @@
                         else 
                         {
-                                Debug << "here77" << endl;
                                 BspInterior *interior = dynamic_cast<BspInterior *>(node);
                         
-                                BspNode *first = interior->GetBack();
-                                BspNode *second = interior->GetFront();
+                                BspNode *first = interior->GetFront();
+                                BspNode *second = interior->GetBack();
             
                                 BspNodeGeometry *firstGeom = new BspNodeGeometry();
                                 BspNodeGeometry *secondGeom = new BspNodeGeometry();
 
-                                ConstructGeometry(first, *firstGeom);
-                                ConstructGeometry(second, *secondGeom);
+                                geom->SplitGeometry(*firstGeom,
+                                                                        *secondGeom,
+                                                                        interior->GetPlane(),
+                                                                        mBox,
+                                                                        mEpsilon);
 
                                 // decide on the order of the nodes
@@ -2231 +2230 @@
                         
                         break;
-                        Debug << "culling!!" << endl;
+                default:
                         // default: cull
-                }
-                Debug << "here4" << endl;
+                        break;
+                }
+                
                 DEL_PTR(geom);
                 
         }
 
-        return beam.mViewCells.size();
+        return (int)beam.mViewCells.size();
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -366 +366 @@
 
         exporter->SetWireframe();
-        exporter->ExportGeometry(objects);
+        //exporter->ExportGeometry(objects);
         exporter->SetFilled();
         //Randomize();
@@ -389 +389 @@
                 Intersectable *sourceObj = mObjects[5];
                 BeamSampleStatistics stats;
+
                 renderer->SampleBeamContributions(sourceObj,
                                                                                   beam,
@@ -403 +404 @@
                 exporter->ExportBeam(beam, vbox);
 
-                bool exportViewCells = false;
+                bool exportViewCells = true;
                 
                 if (exportViewCells)
                 {
-                        exporter->SetWireframe();
-                        
                         ViewCellContainer::const_iterator it, it_end = beam.mViewCells.end();
                         
@@ -416 +415 @@
                                 AxisAlignedBox3 vbox;
                                 vbox.Initialize();
-                                Mesh *mesh = (*it)->GetMesh();
-
+                                vbox.Include((*it)->GetMesh());
+                        
+                                exporter->SetWireframe();
                                 exporter->ExportBox(vbox);
-                                //exporter->ExportViewCell(*it);
+                                exporter->SetFilled();
+                                exporter->ExportViewCell(*it);
                         }
+
+                        /*vector<KdNode *>::const_iterator it, it_end = beam.mKdNodes.end();
+                        
+                        for (it = beam.mKdNodes.begin(); it != beam.mKdNodes.end(); ++ it)
+                        {
+                                exporter->ExportBox(mKdTree->GetBox((*it)));
+                        }*/
                 }
         }

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -101 +101 @@
         pt->start(QThread::LowPriority);
         
-  } else {
+  } else if (0 /*p->UseGlDebugger*/) {
+            //debuggerWidget = new GlDebuggerWidget(*, (p->mSceneGraph, p->mViewCellsManager, p->mKdTree);
+                //  renderer->resize(640, 480);
+        //      debuggerWidget->resize(640, 480);
+        //      debuggerWidget->show();
+
+        pt->start(QThread::LowPriority);
+  } else
+  {
         // just call the mail method -> will be executed in the main thread
         pt->Main();