Changeset 358

Timestamp:

10/22/06 16:40:33 (2 years ago)

Author:

dshipton

Message:

Simplify some code, also make sure our triangle culled take into account the small feature culling.

Files:

• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp (modified) (7 diffs)

branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp

@@ -268 +268 @@
-#endif
-        _numTestSamples = _rt->getOcclusionCullingQueryBufferSize();
-
+//
-        _testSamples = new GLuint[_numTestSamples];
-        //std::cout << "Performing OCC on " << uNumNodes << " nodes." << std::endl;
@@ -462 +462 @@
-                {
-                    if(cbb * _vpWidth * _vpHeight < _minFeatureSize) //small feature culling
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        pNode->setIsRendered(true);
-                    }
@@ -503 +516 @@
-void OcclusionCullingTreeBuilder::drawTestNode(RenderTreeNode *pNode, DrawEnv &denv, RenderPartition *part)
-{
+
+    //std::cout << "Front: " << _currSample << " Back: " << _currSampleBack << std::endl;
+    while(_testPendingNodes.size() == _numTestSamples - 1)
+    {
+        drawTestResults(denv, part);
+        //std::cout << "NOW:  Front: " << _currSample << " Back: " << _currSampleBack << std::endl;
+    }
+
-    //DRAW DRAW DRAW
-    Window* win = denv.getWindow();
-    pNode->setIsRendered(false);
-
-    //pNode->getCore()->getPositions();
-    //std::cout << pNode->getNode()->getPositions()->size()<<std::endl;
-
-
@@ -539 +557 @@
-    v[1][2] = v[2][2] = v[5][2] = v[6][2] = max[2];
-
-    //std::cout << "Front: " << _currSample << " Back: " << _currSampleBack << std::endl;
-    while(_testPendingNodes.size() == _numTestSamples - 1)
-    {
-        drawTestResults(denv, part);
-        //std::cout << "NOW:  Front: " << _currSample << " Back: " << _currSampleBack << std::endl;
-    }
-
-    if(_currSample == _numTestSamples - 1)
@@ -552 +564 @@
-    _currSample++;
-
-    enterTesting(denv, part);
-    StatCollector *sc = _rt->getStatistics();
-    sc->getElem(statNOccTests    )->inc();
-
+    enterTesting(denv, part);
-    BeginQueryT beginq = (BeginQueryT) win->getFunction(_funcBeginQueryARB);
-    //std::cout << "Push: " << _currSample << std::endl;
@@ -583 +595 @@
-    leaveTesting(denv, part);
-
+    UInt32 uiNextMatrix = pNode->getMatrixStore().first;
+
+    if(uiNextMatrix != 0 && uiNextMatrix != _uiActiveMatrix)
+    {
+        glLoadMatrixf(pNode->getMatrixStore().second.getValues());
+
+        _uiActiveMatrix = uiNextMatrix;
+
+        _currMatrix.second = pNode->getMatrixStore().second;
+
+        updateTopMatrix(denv);
+
+        denv.setObjectToWorld(_accMatrix);
+
+        ++part->_uiNumMatrixChanges;
+    }
+
-    //STATE ACTIVATION        
-    State         *pNewState         = pNode->getState();
@@ -644 +673 @@
-                return;
-            } 
-00
+
-            getquiv(_testSamples[pNode->getResultNum()], GL_QUERY_RESULT_ARB, &sampleCount);
-            
-            if(sampleCount > _visPixelThreshold)
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            }
-            else