Changeset 145 for trunk/VUT/Ogre/src

Timestamp:

06/22/05 10:05:06 (19 years ago)

Author:

mattausch

Message:

fixed bug when canceling login
fixed visibility queries using occlusion queries

File:

• trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp (modified) (8 diffs)

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -130 +130 @@
                 ++visQueryIt;
                 
-                // nodes with visibilty 0 in queue: 
-                // happens if node is intersected by near plane
+                // node with visibilty 0 in queue (e.g., if node is intersected by near plane)
                 if (visiblePixels > 0)
                 {
@@ -161 +160 @@
                 if (visiblePixels > 0)
                 {                        
-                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, 
-                                visiblePixels, projectedPixels));
+                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, visiblePixels, 
+                                projectedPixels));
                 }
         }
@@ -209 +208 @@
         cam->setAspectRatio(1.0);
         cam->setFOVy(Radian(Math::HALF_PI));
-
-        std::stringstream d;
-        d << "old camera: " + StringConverter::toString(savedCam->getDerivedPosition()) + 
-                " " + "O: " + StringConverter::toString(savedCam->getDerivedOrientation());
-        LogManager::getSingleton().logMessage(d.str());
 
         int sign = -1;
@@ -230 +224 @@
                 ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, relativeVisibility);
                 
-                //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("HAAHHAHAHAHAH");
+                //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("wait");
 
                 // permute directions
@@ -254 +248 @@
 
         for (visibleNodesIt = visibleNodes->begin(); visibleNodesIt != visibleNodesIt_end; 
-                ++visibleNodesIt);
+                ++visibleNodesIt)
         {
                 if (!nodeInfo || (nodeInfo->GetNode() != (*visibleNodesIt).GetNode()))
@@ -260 +254 @@
                         nodeInfo = &(*visibleNodesIt);
                 }
-                else
-                {
-                        // add visibility
-                        nodeInfo->SetVisiblePixels(nodeInfo->GetVisiblePixels() + 
-                                (*visibleNodesIt).GetVisiblePixels());
-                
-                        nodeInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
-                                (*visibleNodesIt).GetProjectedPixels());
+                else // add visibility
+                {                       
+                        nodeInfo->AddVisibility(*visibleNodesIt);
                 }
 
@@ -283 +272 @@
         GtpVisibility::MeshInfo *geomInfo = NULL;
 
+        int i=0;
         for (visibleGeomIt = visibleGeometry->begin(); visibleGeomIt != visibleGeomIt_end; 
-                ++visibleGeomIt);
+                ++visibleGeomIt)
         {
                 if (!geomInfo || (geomInfo->GetMesh() != (*visibleGeomIt).GetMesh()))
@@ -290 +280 @@
                         geomInfo = &(*visibleGeomIt);
                 }
-                else // info points to equal mesh
-                {
-                        // add visibility
-                        geomInfo->SetVisiblePixels(geomInfo->GetVisiblePixels() + 
-                                (*visibleGeomIt).GetVisiblePixels());
-
-                        geomInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
-                                (*visibleNodesIt).GetProjectedPixels());
+                else // info points to same mesh, just add visibility
+                {
+                        geomInfo->AddVisibility(*visibleGeomIt);
                 }
         }