Ignore:
Timestamp:
08/18/06 19:28:12 (18 years ago)
Author:
mattausch
Message:

added intel ray tracing

Location:
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h

    r1214 r1221  
    9292        /** Override pass so we can do the z-fail pass. 
    9393        */ 
    94         const Pass* _setPass(Pass* pass); 
     94        virtual const Pass* _setPass(const Pass* pass, bool evenIfSuppressed = false); 
    9595 
    9696        /** Render a queue group.  

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

    r938 r1221  
    6464        /** Override pass so we can do the z-fail pass.  
    6565        */ 
    66         const Pass* _setPass(Pass* pass); 
     66        virtual const Pass* _setPass(const Pass* pass, bool evenIfSuppressed = false); 
    6767 
    6868        /** Override from SceneManager so we can skip all but first pass for depth pass.  
    … …  
    124124        */ 
    125125        void InitVisibilityCulling(Camera *cam); 
    126 #if 0 
    127         /** Finds object corresponding to this bounding box in the scene. 
    128         */ 
    129         Entity *FindCorrespondingObject(const AxisAlignedBox &box); 
    130  
    131         /** Identifies objects in the scene and gives them unique ids that 
    132                 correspond to preprocessor ids. 
    133         */ 
    134         void IdentifyObjects(GtpVisibilityPreprocessor::ObjectContainer &objects); 
    135 #endif 
    136126        /** Loads / unloads pvs of the view cell to set the visibility in the scene. 
    137127        */ 
    … …  
    145135        */ 
    146136        void SetObjectsVisible(const bool visible); 
     137 
     138         
     139        ////////////////////////////////////////// 
    147140 
    148141        /// the interface to the scene hierarchy. 

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

    r1206 r1221  
    109109                                LinkIncremental="1" 
    110110                                SuppressStartupBanner="TRUE" 
    111                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(QTDIR)\lib";..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib" 
     111                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib" 
    112112                                ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 
    113113                                GenerateDebugInformation="TRUE" 

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

    r944 r1221  
    1919        GtpVisibilityPreprocessor::IndexedBoundingBoxContainer:: 
    2020                const_iterator iit, iit_end = iboxes.end(); 
    21  
    2221   
    2322        for (iit = iboxes.begin(); iit != iit_end; ++ iit) 
    … …  
    2524                const GtpVisibilityPreprocessor::AxisAlignedBox3 box = (*iit).second; 
    2625                const AxisAlignedBox currentBox = OgreTypeConverter::ConvertToOgre(box); 
    27  
    2826    
    2927                Entity *ent = FindCorrespondingObject(currentBox); 
    … …  
    4240        const float eps = 1e-3f; 
    4341        const Vector3 veps(eps, eps, eps); 
     42 
    4443        Vector3 max = box.getMaximum(); 
    4544        Vector3 min = box.getMinimum(); 
    … …  
    5453        //AxisAlignedBox dummy(Vector3(-50000, -50000, -50000), Vector3(50000, 50000, 50000)); 
    5554         
    56         //-- get intersecting scene nodes 
     55        // get intersecting scene nodes 
    5756        mSceneMgr->findNodesIn(mybox, sceneNodeList, NULL); 
    5857         
    … …  
    9998                                 bestFittingObj = static_cast<Entity *>(mo); 
    10099 
    101                                  // perfect fit => object found, eraly exit 
     100                                 // perfect fit => object found, early exit 
    102101                                 if (overlap >= thresh) 
    103102                                         return bestFittingObj;                          

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

    r1220 r1221  
    11091109} 
    11101110//----------------------------------------------------------------------- 
    1111 const Pass *KdTreeSceneManager::_setPass(Pass* pass) 
     1111const Pass *KdTreeSceneManager::_setPass(Pass* pass, bool evenIfSuppressed) 
    11121112{ 
    11131113        if (mRenderMethod == KdTree::KDRM_INTERNAL) 

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

    r1220 r1221  
    207207} 
    208208//----------------------------------------------------------------------- 
    209 const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass) 
     209const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass, bool evenIfSuppressed) 
    210210{ 
    211211        if (NORMAL_RENDER_HACK) 
Note: See TracChangeset for help on using the changeset viewer.