Changeset 91 for trunk

Timestamp:

05/11/05 01:23:54 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre/src

Files:

• OgrePlatformHierarchyInterface.cpp (modified) (2 diffs)
• OgreSolidHalfBoundingBox.cpp (modified) (3 diffs)
• OgreVisibilityOctreeSceneManager.cpp (modified) (1 diff)

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -50 +50 @@
                 halfbox->getRenderOperation(ro);
                 ro.srcRenderable = halfbox;
-                mRenderSystem->_render(ro);     
+                mRenderSystem->_render(ro);
         }
 }
@@ -105 +105 @@
         query->BeginQuery();
                         
-        // if node is leaf and was visible => 
-        // will be rendered anyway.
+        // if node is leaf and was visible => will be rendered anyway.
         // In this case we can also test with the real geometry.
         if(mUseOptimization && wasVisible && IsLeaf(node))

trunk/VUT/Ogre/src/OgreSolidHalfBoundingBox.cpp

@@ -23 +23 @@
                                                                                                         const bool isFirstHalf) 
 {
-        Vector3 vmax = aab.getMaximum();
-        Vector3 vmin = aab.getMinimum();
-                
-        //Real sqLen = std::max(vmax.squaredLength(), vmin.squaredLength());
-    //mRadius = Math::Sqrt(sqLen);
-        
-        Real maxx = vmax.x;
-        Real maxy = vmax.y;
-        Real maxz = vmax.z;
-        
-        Real minx = vmin.x;
-        Real miny = vmin.y;
-        Real minz = vmin.z;
-        
+        const Vector3& min = aab.getMinimum();
+    const Vector3& max = aab.getMaximum();
+
         // fill the vertex buffer: 12 lines with 2 endpoints each make up a box
     HardwareVertexBufferSharedPtr vbuf =
         mRenderOp.vertexData->vertexBufferBinding->getBuffer(POSITION_BINDING);     
 
-    float* pPos = static_cast<float*>(
-        vbuf->lock(HardwareBuffer::HBL_DISCARD));
+    float* pPos = static_cast<float*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
 
         //     5+------+7
@@ -56 +44 @@
         if(isFirstHalf)
         {
-                *pPos++ = minx; *pPos++ = maxy; *pPos++ = maxz; //011
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = maxz; //001
-                *pPos++ = maxx; *pPos++ = miny; *pPos++ = maxz; //101
-                *pPos++ = maxx; *pPos++ = maxy; *pPos++ = maxz; //111
+                *pPos++ = min.x; *pPos++ = max.y; *pPos++ = max.z; //011
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = max.z; //001
+                *pPos++ = max.x; *pPos++ = min.y; *pPos++ = max.z; //101
+                *pPos++ = max.x; *pPos++ = max.y; *pPos++ = max.z; //111
                 
-                *pPos++ = maxx; *pPos++ = maxy; *pPos++ = minz; //110
-                *pPos++ = minx; *pPos++ = maxy; *pPos++ = minz; //010
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = minz; //000
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = maxz; //001
+                *pPos++ = max.x; *pPos++ = max.y; *pPos++ = min.z; //110
+                *pPos++ = min.x; *pPos++ = max.y; *pPos++ = min.z; //010
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = min.z; //000
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = max.z; //001
         }
         else
         // fan 2
         {
-                *pPos++ = maxx; *pPos++ = miny; *pPos++ = minz; //100
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = minz; //000                                   
-                *pPos++ = minx; *pPos++ = maxy; *pPos++ = minz; //010
-                *pPos++ = maxx; *pPos++ = maxy; *pPos++ = minz; //110
+                *pPos++ = max.x; *pPos++ = min.y; *pPos++ = min.z; //100
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = min.z; //000                                        
+                *pPos++ = min.x; *pPos++ = max.y; *pPos++ = min.z; //010
+                *pPos++ = max.x; *pPos++ = max.y; *pPos++ = min.z; //110
 
-                *pPos++ = maxx; *pPos++ = maxy; *pPos++ = maxz; //111
-                *pPos++ = maxx; *pPos++ = miny; *pPos++ = maxz; //101
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = maxz; //001
-                *pPos++ = minx; *pPos++ = miny; *pPos++ = minz; //000
+                *pPos++ = max.x; *pPos++ = max.y; *pPos++ = max.z; //111
+                *pPos++ = max.x; *pPos++ = min.y; *pPos++ = max.z; //101
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = max.z; //001
+                *pPos++ = min.x; *pPos++ = min.y; *pPos++ = min.z; //000
         }
 
@@ -83 +71 @@
 }
 //-----------------------------------------------------------------------
-void SolidHalfBoundingBox::SetupBoundingBox(const AxisAlignedBox& aabb, 
+void SolidHalfBoundingBox::SetupBoundingBox(const AxisAlignedBox& aab, 
                                                                                         const bool isFirstHalf) 
 {
         // init the vertices to the aabb
-        SetupBoundingBoxVertices(aabb, isFirstHalf);
+        SetupBoundingBoxVertices(aab, isFirstHalf);
+
+        Real sqLen = std::max(aab.getMaximum().squaredLength(), 
+                                                  aab.getMinimum().squaredLength());
+    mRadius = Math::Sqrt(sqLen);
 
     // setup the bounding box of this SimpleRenderable
-        //setBoundingBox(aabb);
+        setBoundingBox(aab);
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -17 +17 @@
         mHierarchyInterface = 
                 new OctreeHierarchyInterface(this, mDestRenderSystem);
-//      visManager->SetCullingManager(GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING);
+        //visManager->SetCullingManager(GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING);
+        
         //mDisplayNodes = true;
         //mShowBoundingBoxes = true;