Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 24, 2009, 9:37:19 PM (15 years ago)
Author:
rgrieder
Message:

Moved GraphicsManager and GUIManager to the core. Almost no actual code changes though, just moving (here was that Map-hack I had to move to GSGraphics).

Location:
code/branches/resource/src
Files:
1 deleted
13 edited
2 copied
2 moved

Legend:

Unmodified
Added
Removed
  • code/branches/resource/src/core/CMakeLists.txt

    r3327 r3346  
    2727  GameMode.cc
    2828  GameState.cc
     29  GraphicsManager.cc
     30  GUIManager.cc
    2931  Language.cc
    3032  LuaBind.cc
     
    8082  LINK_LIBRARIES
    8183    ${OGRE_LIBRARY}
     84    ${Boost_FILESYSTEM_LIBRARY}
     85    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
    8286    ${Boost_THREAD_LIBRARY}
    83     ${Boost_FILESYSTEM_LIBRARY}
    84     ${Boost_SYSTEM_LIBRARY}
    85     ${Boost_DATE_TIME_LIBRARY} # MSVC only
     87    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
     88    ${CEGUI_LIBRARY}
     89    ${CEGUILUA_LIBRARY}
    8690    ${LUA_LIBRARIES}
    8791    cpptcl_orxonox
     92    ogreceguirenderer_orxonox
    8893    ois_orxonox
    8994    tinyxml++_orxonox
  • code/branches/resource/src/core/CorePrereqs.h

    r3327 r3346  
    123123    class FunctorMember;
    124124    class FunctorStatic;
     125    class GraphicsManager;
     126    class GUIManager;
    125127    class Identifier;
    126128    class IRC;
     
    144146    template <class T>
    145147    class ObjectListIterator;
     148    class OgreWindowEventListener;
    146149    class OrxonoxClass;
    147150    class Shell;
     
    220223}
    221224
     225// CEGUI
     226namespace CEGUI
     227{
     228    class DefaultLogger;
     229    class Logger;
     230    class LuaScriptModule;
     231
     232    class OgreCEGUIRenderer;
     233    class OgreCEGUIResourceProvider;
     234    class OgreCEGUITexture;
     235}
     236
     237// Lua
     238struct lua_State;
     239
    222240// TinyXML and TinyXML++
    223241class TiXmlString;
  • code/branches/resource/src/core/GUIManager.cc

    r3340 r3346  
    5757#include "util/Exception.h"
    5858#include "util/OrxAssert.h"
    59 #include "core/Core.h"
    60 #include "core/Clock.h"
    61 #include "core/LuaBind.h"
     59#include "Core.h"
     60#include "Clock.h"
     61#include "LuaBind.h"
    6262
    6363namespace orxonox
  • code/branches/resource/src/core/GUIManager.h

    r3339 r3346  
    3737#define _GUIManager_H__
    3838
    39 #include "OrxonoxPrereqs.h"
     39#include "CorePrereqs.h"
    4040
    4141#include <map>
     
    4545
    4646#include "util/OgreForwardRefs.h"
    47 #include "core/input/InputHandler.h"
     47#include "input/InputHandler.h"
    4848
    4949namespace orxonox
     
    6060        Those input events are then injected into CEGUI in Lua.
    6161    */
    62     class _OrxonoxExport GUIManager : public InputHandler
     62    class _CoreExport GUIManager : public InputHandler
    6363    {
    6464    public:
  • code/branches/resource/src/core/GraphicsManager.cc

    r3338 r3346  
    5757#include "util/StringUtils.h"
    5858#include "util/SubString.h"
    59 #include "core/Clock.h"
    60 #include "core/ConsoleCommand.h"
    61 #include "core/ConfigValueIncludes.h"
    62 #include "core/CoreIncludes.h"
    63 #include "core/Core.h"
    64 #include "core/Game.h"
    65 #include "core/GameMode.h"
    66 #include "core/WindowEventListener.h"
    67 #include "tools/ParticleInterface.h"
    68 
    69 // HACK!
    70 #include "overlays/map/Map.h"
     59#include "Clock.h"
     60#include "ConsoleCommand.h"
     61#include "ConfigValueIncludes.h"
     62#include "CoreIncludes.h"
     63#include "Core.h"
     64#include "Game.h"
     65#include "GameMode.h"
     66#include "WindowEventListener.h"
    7167
    7268namespace orxonox
     
    148144*/
    149145
    150         // HACK! This fixes an exit crash
    151         Map::hackDestroyMap();
    152146        // unload all compositors (this is only necessary because we don't yet destroy all resources!)
    153147        Ogre::CompositorManager::getSingleton().removeAll();
  • code/branches/resource/src/core/GraphicsManager.h

    r3336 r3346  
    3737#define _GraphicsManager_H__
    3838
    39 #include "OrxonoxPrereqs.h"
     39#include "CorePrereqs.h"
    4040
    4141#include <cassert>
    4242#include <string>
    4343#include <OgreLog.h>
    44 #include "core/OrxonoxClass.h"
     44#include "OrxonoxClass.h"
    4545
    4646namespace orxonox
     
    5050        Graphics engine manager class
    5151    */
    52     class _OrxonoxExport GraphicsManager : public OrxonoxClass, public Ogre::LogListener
     52    class _CoreExport GraphicsManager : public OrxonoxClass, public Ogre::LogListener
    5353    {
    5454    public:
  • code/branches/resource/src/orxonox/CMakeLists.txt

    r3280 r3346  
    2020SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2121  CameraManager.cc
    22   GraphicsManager.cc
    2322  LevelManager.cc
    2423  Main.cc
     
    2726)
    2827ADD_SUBDIRECTORY(gamestates)
    29 ADD_SUBDIRECTORY(gui)
    3028ADD_SUBDIRECTORY(interfaces)
    3129ADD_SUBDIRECTORY(objects)
     
    4341  TOLUA_FILES
    4442    LevelManager.h
    45     gui/GUIManager.h
    4643    objects/pickup/BaseItem.h
    4744    objects/pickup/PickupInventory.h
     
    5350  ${ORXONOX_WIN32}
    5451  LINK_LIBRARIES
     52    ${Boost_FILESYSTEM_LIBRARY}
     53    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
     54    ${Boost_THREAD_LIBRARY}
     55    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
    5556    ${OGRE_LIBRARY}
    56     ${CEGUI_LIBRARY}
    57     ${LUA_LIBRARIES}
    58     ${CEGUILUA_LIBRARY}
    59     ${Boost_SYSTEM_LIBRARY}
    6057    ${OPENAL_LIBRARY}
    6158    ${ALUT_LIBRARY}
     
    6360    ${VORBIS_LIBRARY}
    6461    ${OGG_LIBRARY}
    65     ogreceguirenderer_orxonox
    6662    tinyxml++_orxonox
    6763    tolua++_orxonox
  • code/branches/resource/src/orxonox/CameraManager.cc

    r3280 r3346  
    3434#include "util/StringUtils.h"
    3535#include "core/GameMode.h"
     36#include "core/GUIManager.h"
    3637#include "core/ObjectList.h"
    3738#include "tools/Shader.h"
    3839#include "objects/worldentities/Camera.h"
    3940#include "objects/Scene.h"
    40 #include "gui/GUIManager.h"
    4141
    4242namespace orxonox
  • code/branches/resource/src/orxonox/OrxonoxPrereqs.h

    r3327 r3346  
    7373        };
    7474    }
    75 
    76     class GraphicsManager;
    77     class OgreWindowEventListener;
    78     class Settings;
    7975
    8076    class RadarViewable;
     
    277273    class Map;
    278274
    279     //gui
    280     class GUIManager;
    281 
    282275    //sound
    283276    class SoundBase;
     
    293286}
    294287
    295 namespace CEGUI
    296 {
    297     class DefaultLogger;
    298     class Logger;
    299     class LuaScriptModule;
    300 
    301     class OgreCEGUIRenderer;
    302     class OgreCEGUIResourceProvider;
    303     class OgreCEGUITexture;
    304 }
    305 
    306288// Bullet Physics Engine
    307289class btTransform;
     
    330312typedef int ALint;
    331313
    332 // Lua
    333 struct lua_State;
    334 
    335314#endif /* _OrxonoxPrereqs_H__ */
  • code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

    r3343 r3346  
    4545#include "core/Game.h"
    4646#include "core/GameMode.h"
     47#include "core/GraphicsManager.h"
     48#include "core/GUIManager.h"
    4749#include "core/input/InputManager.h"
    4850#include "core/input/KeyBinder.h"
     
    5153#include "core/XMLFile.h"
    5254#include "overlays/console/InGameConsole.h"
    53 #include "gui/GUIManager.h"
    5455#include "sound/SoundManager.h"
    55 #include "GraphicsManager.h"
     56
     57// HACK:
     58#include "overlays/map/Map.h"
    5659
    5760namespace orxonox
     
    169172        this->inputManager_ = 0;
    170173
     174        // HACK:
     175        Map::hackDestroyMap();
     176
    171177        delete graphicsManager_;
    172178
  • code/branches/resource/src/orxonox/gamestates/GSLevel.cc

    r3327 r3346  
    4040#include "core/GameMode.h"
    4141#include "core/Core.h"
     42#include "core/GraphicsManager.h"
     43#include "core/GUIManager.h"
    4244#include "core/Loader.h"
    4345#include "core/XMLFile.h"
     
    4749#include "objects/quest/QuestManager.h"
    4850#include "overlays/notifications/NotificationManager.h"
    49 #include "gui/GUIManager.h"
    5051#include "CameraManager.h"
    51 #include "GraphicsManager.h"
    5252#include "LevelManager.h"
    5353#include "PlayerManager.h"
  • code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc

    r3339 r3346  
    3636#include "core/Clock.h"
    3737#include "core/ConsoleCommand.h"
     38#include "core/GraphicsManager.h"
     39#include "core/GUIManager.h"
    3840#include "objects/Scene.h"
    39 #include "gui/GUIManager.h"
    4041#include "sound/SoundMainMenu.h"
    41 #include "GraphicsManager.h"
    4242
    4343namespace orxonox
  • code/branches/resource/src/orxonox/objects/pickup/PickupInventory.cc

    r3327 r3346  
    3737
    3838#include "core/ConsoleCommand.h"
     39#include "core/GUIManager.h"
    3940#include "core/input/InputManager.h"
    40 #include "gui/GUIManager.h"
    4141#include "objects/controllers/HumanController.h"
    4242#include "objects/worldentities/pawns/Pawn.h"
  • code/branches/resource/src/orxonox/objects/pickup/PickupSpawner.cc

    r3325 r3346  
    3737
    3838#include "core/CoreIncludes.h"
     39#include "core/GUIManager.h"     // HACK; see below
    3940#include "core/Template.h"
    4041#include "core/XMLPort.h"
    41 #include "gui/GUIManager.h"     // HACK; see below
    4242#include "objects/worldentities/pawns/Pawn.h"
    4343#include "PickupInventory.h"    // HACK; Only for hack, remove later
  • code/branches/resource/src/orxonox/overlays/GUIOverlay.cc

    r3337 r3346  
    3434#include "core/input/InputManager.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/GUIManager.h"
    3637#include "core/XMLPort.h"
    37 #include "gui/GUIManager.h"
    3838
    3939namespace orxonox
  • code/branches/resource/src/orxonox/tools/ParticleInterface.cc

    r3336 r3346  
    4545#include "core/ConfigValueIncludes.h"
    4646#include "core/GameMode.h"
    47 #include "GraphicsManager.h"
    4847
    4948namespace orxonox
  • code/branches/resource/src/orxonox/tools/Shader.cc

    r3301 r3346  
    4141#include "core/CoreIncludes.h"
    4242#include "core/GameMode.h"
    43 #include "GraphicsManager.h"
     43#include "core/GraphicsManager.h"
    4444
    4545namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.