Changeset 174 for trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

Timestamp:

07/14/05 09:06:16 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -12 +12 @@
 //----------------------------------------------------------------------- 
 PlatformQueryManager::PlatformQueryManager(PlatformHierarchyInterface *hierarchyInterface, 
-                                                                                   Viewport *vp, bool renderPatches):
-QueryManager(hierarchyInterface), 
+                                                                                   Viewport *vp, int queryModes):
+QueryManager(hierarchyInterface, queryModes), 
 mViewport(vp), 
-mWasInitialised(false),
-mRenderPatches(renderPatches)
+mWasInitialised(false)
 {
 }
@@ -147 +146 @@
         uchar *buf = mViewport->getTarget()->getBufferContents(dimx, dimy);
 
-        int n = mRenderPatches ? 
-                (int)visiblePatches->size() : (int)visibleGeometry->size();
-
         //std::stringstream d; d << "dimx: " << dimx << ", dimy: " << dimy; LogManager::getSingleton().logMessage(d.str());
 
@@ -163 +159 @@
 
                 // if valid id <= add visibility (id values start at 1)
-                if ((id > 0) && (id < n))
-                {
-                        if (mRenderPatches)
-                        {       
+                if (mQueryModes == PATCH_VISIBILITY)
+                {       
+                        if ((id > 0) && (id < (int)visiblePatches->size()))
+                        {
                                 ((*visiblePatches)[id]).AddVisibility(1, 0);
                         }
-                        else
+                }
+                else if (mQueryModes == GEOMETRY_VISIBILITY)
+                {
+                        if ((id > 0) && (id < (int)visibleGeometry->size()))
                         {
                                 ((*visibleGeometry)[id]).AddVisibility(1, 0);
@@ -213 +212 @@
                         SubEntity *subEnt = ent->getSubEntity(i);
 
-                        if (mRenderPatches)
+                        if (mQueryModes == PATCH_VISIBILITY)
                         {
                                 ++ id;
@@ -223 +222 @@
                 }
                         
-                if (!mRenderPatches)
+                if (mQueryModes == GEOMETRY_VISIBILITY)
                 {
                         visibleGeometry->push_back(GtpVisibility::MeshInfo(ent, 0, 0));