Ignore:
Timestamp:
05/08/06 06:55:17 (19 years ago)
Author:
mattausch
Message:

update for ogre 1.2
OcclusionCullingSceneManager? is the only scenemanager in the solution now

Location:
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include
Files:
5 edited

Legend:

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

    r903 r925  
    5252        GtpVisibility::VisibilityManager *getVisibilityManager(); 
    5353 
    54         /** Render a set of objects, see renderSingleObject for param definitions  
     54        /** Render a queue group.  
    5555                Override so we can handle delayed rendering of transparent objects 
    5656        */ 
    57         virtual void renderObjects(const QueuedRenderableCollection& objs,  
    58                         QueuedRenderableCollection::OrganisationMode om,  
    59             bool doLightIteration, const LightList* manualLightList = 0); 
     57        void renderBasicQueueGroupObjects(RenderQueueGroup* pGroup,  
     58                                                                          QueuedRenderableCollection::OrganisationMode om); 
    6059 
    6160        /** Writes out stats into the Ogre log file. 
     
    103102                msz: Modified to reflect changes in Ogre::TerrainSceneManager 
    104103        */ 
     104#if 1 
    105105        virtual void setWorldGeometry( DataStreamPtr& stream, const String& typeName ); 
    106  
     106#endif 
    107107         
    108108        /** Loads view cells for this particular scene. 
     
    210210        bool mUseViewCells; 
    211211 
     212         
    212213        /// if the view cells are filtered 
    213214        bool mUseVisibilityFilter; 
     
    218219{ 
    219220protected: 
     221        typedef std::vector<TerrainPageSource*> TerrainPageSources; 
     222        TerrainPageSources mTerrainPageSources; 
    220223        void initMetaData(void) const; 
    221224        GtpVisibility::VisibilityManager *visManager; 
     
    225228                visManager = vm; 
    226229        } 
    227         ~OcclusionCullingSceneManagerFactory() {} 
     230 
    228231        /// Factory type name 
    229232        static const String FACTORY_TYPE_NAME; 
  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionQueriesQueryManager.h

    r370 r925  
    1515                on different hierarchy types, while reusing the implementation of the query methods. 
    1616    */ 
    17         OcclusionQueriesQueryManager(PlatformHierarchyInterface *hierarchyInterface, Viewport *vp, 
     17        OcclusionQueriesQueryManager(GtpVisibility::HierarchyInterface *hierarchyInterface, Viewport *vp, 
    1818                                                                 int queryModes, int itemBufferMode); 
    1919     
  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgrePlatformQueryManager.h

    r897 r925  
    44#include "VisibilityInfo.h" 
    55#include "QueryManager.h" 
    6 #include "OgrePlatformHierarchyInterface.h" 
     6#include "HierarchyInterface.h" 
    77 
    88namespace Ogre { 
     
    1717            on different hierarchy types, while reusing the implementation of the query methods. 
    1818    */ 
    19         PlatformQueryManager(PlatformHierarchyInterface *hierarchyInterface,  
     19        PlatformQueryManager(GtpVisibility::HierarchyInterface *hierarchyInterface,  
    2020                                 Viewport *vp, int queryModes); 
    2121     
  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreVisibilityOctreeSceneManager.h

    r903 r925  
    5555        GtpVisibility::VisibilityManager *getVisibilityManager(); 
    5656         
    57         /** Render a set of objects, see renderSingleObject for param definitions  
     57        /** Render a queue group.  
    5858                Override so we can handle delayed rendering of transparent objects 
    5959        */ 
    60         virtual void renderObjects(const QueuedRenderableCollection& objs,  
    61                         QueuedRenderableCollection::OrganisationMode om,  
    62             bool doLightIteration, const LightList* manualLightList = 0); 
     60        void renderBasicQueueGroupObjects(RenderQueueGroup* pGroup,  
     61                                                                 QueuedRenderableCollection::OrganisationMode om); 
    6362 
    6463        /** Writes out stats into the Ogre log file. 
  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreVisibilityTerrainSceneManager.h

    r897 r925  
    5151        GtpVisibility::VisibilityManager *getVisibilityManager(); 
    5252 
    53         /** Render a set of objects, see renderSingleObject for param definitions  
     53        /** Render a queue group.  
    5454                Override so we can handle delayed rendering of transparent objects 
    5555        */ 
    56         virtual void renderObjects(const QueuedRenderableCollection& objs,  
    57                         QueuedRenderableCollection::OrganisationMode om,  
    58             bool doLightIteration, const LightList* manualLightList = 0); 
     56        void renderBasicQueueGroupObjects(RenderQueueGroup* pGroup,  
     57                                                                 QueuedRenderableCollection::OrganisationMode om); 
    5958 
    6059        /** Writes out stats into the Ogre log file. 
Note: See TracChangeset for help on using the changeset viewer.