Changeset 544 for trunk/VUT

Timestamp:

01/16/06 19:33:48 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• scripts/default.env (modified) (2 diffs)
• src/GlRenderer.cpp (modified) (14 diffs)
• src/Polygon3.cpp (modified) (1 diff)
• src/Tetrahedron3.cpp (added)
• src/Tetrahedron3.h (added)
• src/Triangle3.h (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (2 diffs)
• src/ViewCellBsp.h (modified) (2 diffs)
• src/ViewCellsManager.cpp (modified) (1 diff)
• src/VspBspTree.cpp (modified) (3 diffs)
• src/VspBspTree.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -348 +348 @@
                         </File>
                         <File
+                                RelativePath="..\src\Tetrahedron3.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\Tetrahedron3.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Triangle3.cpp">
                         </File>

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -303 +303 @@
                 #maxAccRayLength        100
                 
-                maxViewCells            5001
+                maxViewCells            6001
                 
                 # used for pvs criterium
@@ -323 +323 @@
         PostProcess {
                 maxCostRatio 0.001
-                minViewCells 1000
+                minViewCells 2000
                 useRaysForMerge true
         }

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -582 +582 @@
                                                                                            BeamSampleStatistics &stat)
 {
-        // create beam mesh if not already doen
-        //TODO: should this be done here?
-        
-        beam.CreateMesh(2.0f * Magnitude(mSceneGraph->GetBox().Diagonal()));
-
-        // TODO: should not be done every time here
+        // TODO: should be moved out of here (not to be done every time)
         // only back faces are interesting for the depth pass
         glShadeModel(GL_FLAT);
         glDisable(GL_LIGHTING);
+
         // needed to kill the fragments for the front buffer
         glEnable(GL_ALPHA_TEST);
@@ -605 +601 @@
         // The viewpoints could actually be generated outside of the bounding box which
         // would distribute the 'efective viewpoints' of the object surface and thus
-        // with a few viewpoints better sample the vipoint space....
-  //TODO: remove
+        // with a few viewpoints better sample the viewpoint space....
+
+        //TODO: comment in
         //int viewPointSamples = sqrt((float)desiredSamples);
         int viewPointSamples = max(desiredSamples / (GetWidth() * GetHeight()), 1);
@@ -640 +637 @@
         // in order that thios scheme is working well the gpu render buffer should run in a separate
         // thread than the cpu sampler, which would not be such a big problem....
+
+        // disable alpha test again
+        glDisable(GL_ALPHA_TEST);
 }
 
@@ -650 +650 @@
 {
     // 1. setup the view port to match the desired samples
-        glViewport(0, 0, GetWidth(), GetHeight());
+        glViewport(0, 0, samples, samples);
 
         // 2. setup the projection matrix and view matrix to match the viewpoint + beam.mDirBox
         SetupProjectionForViewPoint(viewPoint, beam, sourceObject);
 
+
         // 3. reset z-buffer to 0 and render the source object for the beam
         //    with glCullFace(Enabled) and glFrontFace(GL_CW)
-        //    save result to depth map
-
-        // front depth buffer must bé initialised to 0
+        //    save result to the front depth map
+        //    the front depth map holds ray origins
+
+
+        // front depth buffer must be initialised to 0
         float clearDepth;
+        
         glGetFloatv(GL_DEPTH_CLEAR_VALUE, &clearDepth);
         glClearDepth(0.0f);
-        
-
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+
         //glFrontFace(GL_CW);
         glEnable(GL_CULL_FACE);
@@ -676 +680 @@
         glStencilFunc(GL_ALWAYS, 0x1, 0x1);
         glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
+
 
 #if 0
@@ -694 +699 @@
 
 #endif  
+
+         // copy contents of the front depth buffer into depth texture
+        glBindTexture(GL_TEXTURE_2D, frontDepthMap);    
+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, depthMapSize, depthMapSize);
+
+
         // reset clear function
         glClearDepth(clearDepth);
 
-        // copy contents of depth buffer into depth texture
-        // depth buffer holds ray origins
-        glBindTexture(GL_TEXTURE_2D, frontDepthMap);    
-        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, depthMapSize, depthMapSize);
-
-
-#if 0
-        // only the samples which are inside the beam AND on the source object
-        // should be considered => only where stencil == 2
+        
+        
+        // 4. set up the termination depth buffer (= standard depth buffer)
+        //    only rays which have non-zero entry in the origin buffer are valid since
+        //    they realy start on the object surface (this is tagged by setting a
+        //    stencil buffer bit at step 3).
+        
+        glStencilFunc(GL_EQUAL, 0x1, 0x1);
+        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glStencilFunc(GL_ALWAYS, 0x2, 0x2);
-        glStencilOp(GL_INCR, GL_INCR, GL_INCR);
-
-        // render back face of frustum beam
-        RenderMesh(beam.mMesh);
-#endif
-
-
-        // 4. set back to normal rendering and clear the ray termination depth buffer
-        //    only rays which have non-zero entry in the origin buffer are valid since
-        //    they realy start on the object surface (this can also be tagged by setting a
-        //    stencil buffer bit at step 3)
-
-        //glDisable(GL_STENCIL_TEST);
-        glEnable(GL_STENCIL_TEST);
-        glStencilFunc(GL_EQUAL, 0x1, 0x1);
-        //glStencilFunc(GL_EQUAL, 0x2, 0x2);
-        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glColorMask(1, 1, 1, 1);
         glDepthMask(1);
+
         glEnable(GL_DEPTH_TEST);
-        //glDisable(GL_STENCIL_TEST);   
+                
         glEnable(GL_CULL_FACE);
         glCullFace(GL_BACK);
 
-
-        // 5. render all objects inside the beam using id based false color
-        //    (objects can be compiled to a gl list now so that subsequent rendering for
-        //     this beam is fast - the same hold for step 3)
-
+        // setup front depth buffer
+        glEnable(GL_TEXTURE_2D);
+        
+        // bind pixel shader implementing the front depth buffer functionality
+        cgGLBindProgram(sCgFragmentProgram);
+        cgGLEnableProfile(sCgFragmentProfile);
+
+
+        // 5. render all objects inside the beam 
+        //    we can use id based false color to read them back for gaining the pvs
+
+        glColorMask(1, 1, 1, 1);
+
+        
+        // if objects not stored in beam => extract objects
         if (beam.mFlags & !Beam::STORE_OBJECTS)
         {
@@ -750 +752 @@
         }
 
-        // list of objects intersected by the frustum
+
+        //    (objects can be compiled to a gl list now so that subsequent rendering for
+        //    this beam is fast - the same hold for step 3)
+        //    Afterwards we have two depth buffers defining the ray origin and termination
+        
+
 #if 0
         static int glObjList = -1; 
@@ -761 +768 @@
                 for (it = beam.mObjects.begin(); it != it_end; ++ it)
                 {
+                        // render all objects except the source object
                         if (*it != sourceObject)
                                 RenderIntersectable(*it);
@@ -767 +775 @@
                 glEndList();
         }
+
         glCallList(glObjList);
 #else
@@ -772 +781 @@
         for (it = beam.mObjects.begin(); it != it_end; ++ it)
         {       
+                // render all objects except the source object
                 if (*it != sourceObject)
                         RenderIntersectable(*it);
         }
 #endif
-
-        
-    // 6. Now we have a two depth buffers defining the ray origin and termination
-
-        
-        // bind depth texture
-        glEnable(GL_TEXTURE_2D);
-        
-        // bind depth cull pixel shader
-        cgGLBindProgram(sCgFragmentProgram);
-        cgGLEnableProfile(sCgFragmentProfile);
-
-        // 7. Use occlusion queries for all viewcell meshes associated with the beam ->
-        // a fragment passes if the corresponding stencil fragment is set and its depth is
-        // between origin and termination buffer
+        
+   
+
+        // 6. Use occlusion queries for all viewcell meshes associated with the beam ->
+        //     a fragment passes if the corresponding stencil fragment is set and its depth is
+        //     between origin and termination buffer
 
         // create new queries if necessary
         GenQueries((int)beam.mViewCells.size());
 
-        // now check whether any backfacing polygon would pass the depth test?
-        //matt: should check both back /front facing because of dual depth buffer
-        //and danger of cutting the near plane with front facing polys.
+        // check whether any backfacing polygon would pass the depth test?
+        // matt: should check both back /front facing because of dual depth buffer
+        // and danger of cutting the near plane with front facing polys.
+        
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
         glDepthMask(GL_FALSE);
         glDisable(GL_CULL_FACE);
+
   
         ViewCellContainer::const_iterator vit, vit_end = beam.mViewCells.end();
@@ -815 +818 @@
         }
 
+
+
         // at this point, if possible, go and do some other computation
+
+
+        
+        // 7. The number of visible pixels is the number of sample rays which see the source
+        //    object from the corresponding viewcell -> remember these values for later update
+        //   of the viewcell pvs - or update immediately?
 
         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 -> remember these values for later update
-        //   of the viewcell pvs - or update immediately?
 
         for (vit = beam.mViewCells.begin(); vit != vit_end; ++ vit)
@@ -835 +842 @@
         
 
-        //  In general it is not neccessary to remember to extract all the rays cast. I hope it
+        // 8. Copmpute rendering statistics
+        // 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)
@@ -846 +854 @@
         stat.pvsSize = ComputePvs(beam.mObjects, pvsObj);
         
-        
+        // to gain ray source and termination
+        // copy contents of ray termination buffer into depth texture
+        // and compare with ray source buffer
 #if 0
-        // copy contents of back depth buffer into depth texture
-        // depth buffer holds ray origins
+        VssRayContainer rays;
+
         glBindTexture(GL_TEXTURE_2D, backDepthMap);     
         glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, depthMapSize, depthMapSize);
+
+        ComputeRays(Intersectable *sourceObj, rays);
+
 #endif
-        // reset state
+
+
+
+        //-- cleanup
+
+
+        // reset gl state
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         glDepthMask(GL_TRUE);
@@ -861 +880 @@
         glDisable(GL_TEXTURE_2D);
 
-        // remove objects again
+        // remove objects from beam
         if (beam.mFlags & !Beam::STORE_OBJECTS)
                 beam.mObjects.clear();

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -120 +120 @@
                 v += CrossProd(mVertices[i], mVertices[i+1]);
     
-    //Debug << "area2: " << 0.5f * fabs(DotProd(GetNormal(), v)) << endl;  
-        return 0.5f * fabs(DotProd(GetNormal(), v));
+    return 0.5f * fabs(DotProd(GetNormal(), v));
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/Triangle3.h

@@ -37 +37 @@
 
   float GetSpatialAngle(const Vector3 &point) const;
+
+  float GetArea() const {
+          Vector3 v1=mVertices[0]-mVertices[1], v2=mVertices[2]-mVertices[1];
+          return 0.5f * Magnitude(CrossProd(v2, v1));
+  }
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -9 +9 @@
 #include "AxisAlignedBox3.h"
 #include "Triangle3.h"
+#include "Tetrahedron3.h"
 
 #include <stack>
@@ -2549 +2550 @@
 
 
+float BspNodeGeometry::GetVolume() const
+{
+        //-- compute volume using tetrahedralization of the geometry
+        //   and adding the volume of the single tetrahedrons
+        float volume = 0;
+        const float f = 1.0f / 6.0f;
+
+        PolygonContainer::const_iterator pit, pit_end = mPolys.end();
+
+        for (pit = mPolys.begin(); pit != pit_end; ++ pit)
+        {
+                Polygon3 *poly = *pit;
+                const Vector3 v = poly->mVertices[0];
+
+                for (int i = 1; i < (int)poly->mVertices.size() - 1; ++ i)
+                {
+                        volume += f * (DotProd(v, 
+                                CrossProd(poly->mVertices[i], poly->mVertices[i + 1])));
+                }
+        }
+
+        Debug << "volume: " << volume << endl;
+        return volume;
+}
+
+
+Vector3 BspNodeGeometry::ComputeMassCenter() const
+{
+        int n = 0;
+
+        Vector3 center(0,0,0);
+
+        PolygonContainer::const_iterator pit, pit_end = mPolys.end();
+
+        for (pit = mPolys.begin(); pit != pit_end; ++ pit)
+        {
+                Polygon3 *poly = *pit;
+                
+                VertexContainer::const_iterator vit, vit_end = poly->mVertices.end();
+
+                for(vit = poly->mVertices.begin(); vit != vit_end; ++ vit)
+                {
+                        center += *vit;
+                        ++ n;
+                }
+        }
+
+        return center / (float)n;
+}
+
+
 void BspNodeGeometry::AddToMesh(Mesh &mesh)
 {

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -35 +35 @@
         float GetArea() const;
         
+        float GetVolume() const;
+
         /** Computes new front and back geometry based on the old cell 
                 geometry and a new split plane
@@ -57 +59 @@
         void AddToMesh(Mesh &mesh);
 
+        /** Computes mass center of bsp node geometry.
+        */
+        Vector3 ComputeMassCenter() const;
         /** The polygons the geometry consists of.
         */

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -2017 +2017 @@
 
         // check if new view cells turned invalid
-        mVspBspTree->CheckValidy();
+        mVspBspTree->ValidateTree();
         ResetViewCells();
 

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1606 +1606 @@
 
 
-
-void VspBspTree::CheckValidy()
+void VspBspTree::ValidateTree()
 {
         stack<BspNode *> nodeStack;
@@ -1635 +1634 @@
                                                 BspLeaf *l = viewCell->mLeaves.back();
                                                 l->SetTreeValid(false);
+                                                ++ mStat.invalidLeaves;
                                                 PropagateUpValidity(l);
 
@@ -2697 +2697 @@
         startTime = GetTime();
 
-        int nViewCells = /*mergeStats.nodes*/ mStat.Leaves() - mStat.invalidLeaves;
+        int nViewCells = mStat.Leaves() - mStat.invalidLeaves;
 
         //-- use priority queue to merge leaf pairs

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -308 +308 @@
                 if not valid, sets regions invalid and deletes view cell.
         */
-        void CheckValidy();
+        void ValidateTree();
 
 protected: