Changeset 166 for trunk

Timestamp:

07/11/05 17:47:47 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• Ogre/src/OgreItemBufferQueryManager.cpp (modified) (2 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)
• work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp (modified) (1 diff)
• work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp (modified) (3 diffs)

trunk/VUT/Ogre/src/OgreItemBufferQueryManager.cpp

@@ -83 +83 @@
                 id += buf[idx + 2];
 
-                std::stringstream d; d << "myid: " << (int)buf[idx] << " " << (int)buf[idx + 1] << " " << (int)buf[idx + 2];
-                LogManager::getSingleton().logMessage(d.str());
+                //std::stringstream d; d << "myid: " << (int)buf[idx] << " " << (int)buf[idx + 1] << " " << (int)buf[idx + 2];
+                //LogManager::getSingleton().logMessage(d.str());
 
                 // if valid id <= add visibility (id values start at 1)
@@ -157 +157 @@
                                 
                         subEnt->setId(id);
-                        subEnt->setId((41 << 16) + (4 << 8) + 60);
+                        //subEnt->setId((41 << 16) + (4 << 8) + 60);
                         //subEnt->setId((2 << 16) + (4 << 8) + 60);
                 }

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -752 +752 @@
         {
                 ent->getSubEntity(i)->setId(mCurrentEntityId);
-                ent->getSubEntity(i)->setId((41 << 16) + (4 << 8) + 60);
+                //ent->getSubEntity(i)->setId((41 << 16) + (4 << 8) + 60);
                 //ent->getSubEntity(i)->setId((2 << 16) + (4 << 8) + 60);
         }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp

@@ -170 +170 @@
 void OctreeNode::getRenderOperation( RenderOperation& rend )
 {
-#ifdef GTP_VISIBILITY_MODIFED_OGRE
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         /*static SubMesh* pSubMesh = 0;
 

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

@@ -365 +365 @@
                 md3dpp.BackBufferWidth                  = mWidth;
                 md3dpp.BackBufferHeight                 = mHeight;
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
+#endif
                 if (mVSync)
                         md3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
@@ -951 +953 @@
                 }
 
-                if (FAILED(hr = mpD3DDevice->GetFrontBufferData(0, pTempSurf)))
+                //if (FAILED(hr = mpD3DDevice->GetFrontBufferData(0, pTempSurf)))
+                if (FAILED(hr = mpD3DDevice->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &pTempSurf)))
                 {
                         SAFE_RELEASE(pTempSurf);
-                        OGRE_EXCEPT(hr, "Can't get front buffer!", "D3D9RenderWindow::writeContentsToFile");
+                        OGRE_EXCEPT(hr, "Can't get back buffer!", "D3D9RenderWindow::getBufferContents");
                 }
 
@@ -1055 +1058 @@
                 }
 
+                pTempSurf->UnlockRect();
                 SAFE_RELEASE(pTempSurf);
                 SAFE_RELEASE(pSurf);