Changeset 164 for trunk/VUT/Ogre/src

Timestamp:

07/11/05 03:25:50 (19 years ago)

Author:

mattausch

Message:

bug fix (deleting while animation)

Location:

trunk/VUT/Ogre/src

Files:

• OgreItemBufferQueryManager.cpp (modified) (5 diffs)
• OgrePlatformQueryManager.cpp (modified) (3 diffs)
• OgreTerrainContentGenerator.cpp (modified) (1 diff)
• OgreVisibilityOctreeSceneManager.cpp (modified) (1 diff)
• OgreVisibilityTerrainSceneManager.cpp (modified) (7 diffs)

trunk/VUT/Ogre/src/OgreItemBufferQueryManager.cpp

@@ -6 +6 @@
 
 namespace Ogre {
+
 //----------------------------------------------------------------------- 
-ItemBufferQueryManager::ItemBufferQueryManager(PlatformHierarchyInterface *hierarchyInterface, Viewport *vp,
+ItemBufferQueryManager::ItemBufferQueryManager(PlatformHierarchyInterface *hierarchyInterface, 
+                                                                                           Viewport *vp,
                                                                                            const bool renderPatches):
 PlatformQueryManager(hierarchyInterface, vp), mRenderPatchesForItemBuffer(renderPatches)
@@ -13 +15 @@
 }
 //-----------------------------------------------------------------------
-bool ItemBufferQueryManager::ShootRay(const Ray &ray, std::vector<Mesh *> *visibleMeshes, bool isGlobalLine)
+bool ItemBufferQueryManager::ShootRay(const Ray &ray, 
+                                                                          std::vector<Mesh *> *visibleMeshes, 
+                                                                          bool isGlobalLine)
 {
     // run OGRE ray shooting query
@@ -50 +54 @@
         ColourValue bg = mViewport->getBackgroundColour();
         mViewport->setBackgroundColour(ColourValue(0, 0, 0, 0));
+        pfHierarchyInterface->GetRenderSystem()->clearFrameBuffer(FBT_COLOUR | FBT_DEPTH);
 
+        //-- render item buffer
+        sm->_renderScene(pCam, mViewport, false);
+    //mViewport->getTarget()->update();
 
-        // --- render item buffer
-        pfHierarchyInterface->GetSceneManager()->_renderScene(pCam, mViewport, false);
+//for(int j=0; j<10000000; j++) printf("wait");
 
 
@@ -64 +71 @@
 
         int n = mRenderPatchesForItemBuffer ? (int)visiblePatches->size() : (int)visibleGeometry->size();
-        
+
+        std::stringstream d; d << "dimx: " << dimx << ", dimy: " << dimy;
+        LogManager::getSingleton().logMessage(d.str());
+
         // loop through frame buffer & collect visible pixels
         for (int idx = 0; idx < dimy * dimx * 3; idx += 3)
         {
-                // -- decode color code to receive id
+                //-- decode color code to receive id
                 int id = buf[idx] << 16;
                 id += buf[idx + 1] << 8;
                 id += buf[idx + 2];
 
-                // if valid id <= add visibility (id values start at 1
+                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)
                 if ((id > 0) && (id < n))
                 {
@@ -144 +157 @@
                                 
                         subEnt->setId(id);
+                        subEnt->setId((41 << 16) + (4 << 8) + 60);
+                        //subEnt->setId((2 << 16) + (4 << 8) + 60);
                 }
                         

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -49 +49 @@
         
         // ---- capture visibility from all 6 directions
-        for (int i=0; i < 6; i++)       
+        for (int dir=0; dir < 6; dir++) 
         {
                 sign *= -1;
@@ -60 +60 @@
 
                 // prevent from initialising geometry / node array again
-                if (i > 0)
+                if (dir > 0)
                 {
                         mWasInitialised = true;
@@ -70 +70 @@
 
                 // permute directions
-                Vector3 dir(0,0,0);
-                dir[i/2] = sign;
+                Vector3 direction(0,0,0);
+                direction[dir/2] = sign;
 
-                cam->setDirection(dir);
+                cam->setDirection(direction);
         }
         

trunk/VUT/Ogre/src/OgreTerrainContentGenerator.cpp

@@ -16 +16 @@
 RayQueryExecutor::~RayQueryExecutor()
 {
-        delete mRaySceneQuery;
+        OGRE_DELETE(mRaySceneQuery);
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -739 +739 @@
 }
 */
-//-----------------------------------------------------------------------
-/*
+/*//-----------------------------------------------------------------------
 Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
                                                                                                         const String& meshName)

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -37 +37 @@
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
         
-        //mDisplayNodes = true;
-        //mShowBoundingBoxes = true;
-        //mShowBoxes = true;
+        //mDisplayNodes = true;//mShowBoundingBoxes = true;//mShowBoxes = true;
 
         // TODO: set maxdepth to reasonable value
@@ -120 +118 @@
         if (mRenderNodesForViz || mRenderNodesContentForViz)
         {
-                // change node material so it is better suited for visualization
+                // HACK: change node material so it is better suited for visualization
                 MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
                 nodeMat->setAmbient(1, 1, 0);
@@ -130 +128 @@
                         if (mRenderNodesForViz)
                         {
-                                if (((*it)->numAttachedObjects() > 0) && ((*it)->numChildren() == 0)
-                                        && (*it)->getAttachedObject(0)->getMovableType() == "Entity")
-                                getRenderQueue()->addRenderable((*it));
+                                // render the leaf nodes
+                                if (((*it)->numAttachedObjects() > 0) && ((*it)->numChildren() == 0) && 
+                                         (*it)->getAttachedObject(0)->getMovableType() == "Entity")
+                                {
+                                        getRenderQueue()->addRenderable((*it));
+                                }
 
                                 // addbounding boxes instead of node itself
@@ -508 +509 @@
         }
 
-        // --- item buffer
+        //-- item buffer
 
     // Iterate through priorities
@@ -743 +744 @@
 */
 //-----------------------------------------------------------------------
-/*
 Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
                                                                                                         const String& meshName)
@@ -752 +752 @@
         {
                 ent->getSubEntity(i)->setId(mCurrentEntityId);
+                ent->getSubEntity(i)->setId((41 << 16) + (4 << 8) + 60);
+                //ent->getSubEntity(i)->setId((2 << 16) + (4 << 8) + 60);
         }
 
@@ -759 +761 @@
         return ent;
 }
-*/
 } // namespace Ogre