Changeset 1221 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Timestamp:

08/18/06 19:28:12 (18 years ago)

Author:

mattausch

Message:

added intel ray tracing

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreBoundingBoxConverter.cpp (modified) (5 diffs)
• OgreKdTreeSceneManager.cpp (modified) (1 diff)
• OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBoundingBoxConverter.cpp

@@ -19 +19 @@
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer::
                 const_iterator iit, iit_end = iboxes.end();
-
   
         for (iit = iboxes.begin(); iit != iit_end; ++ iit)
@@ -25 +24 @@
                 const GtpVisibilityPreprocessor::AxisAlignedBox3 box = (*iit).second;
                 const AxisAlignedBox currentBox = OgreTypeConverter::ConvertToOgre(box);
-
    
                 Entity *ent = FindCorrespondingObject(currentBox);
@@ -42 +40 @@
         const float eps = 1e-3f;
         const Vector3 veps(eps, eps, eps);
+
         Vector3 max = box.getMaximum();
         Vector3 min = box.getMinimum();
@@ -54 +53 @@
         //AxisAlignedBox dummy(Vector3(-50000, -50000, -50000), Vector3(50000, 50000, 50000));
         
-        //-- get intersecting scene nodes
+        // get intersecting scene nodes
         mSceneMgr->findNodesIn(mybox, sceneNodeList, NULL);
         
@@ -99 +98 @@
                                  bestFittingObj = static_cast<Entity *>(mo);
 
-                                 // perfect fit => object found, eraly exit
+                                 // perfect fit => object found, early exit
                                  if (overlap >= thresh)
                                          return bestFittingObj;                         

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp

@@ -1109 +1109 @@
 }
 //-----------------------------------------------------------------------
-const Pass *KdTreeSceneManager::_setPass(Pass* pass)
+const Pass *KdTreeSceneManager::_setPass(Pass* pass, bool evenIfSuppressed)
 {
         if (mRenderMethod == KdTree::KDRM_INTERNAL)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -207 +207 @@
 }
 //-----------------------------------------------------------------------
-const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass)
+const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass, bool evenIfSuppressed)
 {
         if (NORMAL_RENDER_HACK)