Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 20, 2009, 9:20:47 AM (16 years ago)
Author:
rgrieder
Message:

Merged pch branch back to trunk.

Location:
code/trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/gamestates/GSClient.cc

    r3110 r3196  
    2929#include "GSClient.h"
    3030
    31 #include "core/input/InputManager.h"
     31#include "util/Exception.h"
    3232#include "core/Clock.h"
    3333#include "core/CommandLine.h"
  • code/trunk/src/orxonox/gamestates/GSClient.h

    r2896 r3196  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"
  • code/trunk/src/orxonox/gamestates/GSDedicated.cc

    r3110 r3196  
    2929#include "GSDedicated.h"
    3030
     31#include "util/Debug.h"
     32#include "util/Sleep.h"
    3133#include "core/Clock.h"
    3234#include "core/CommandLine.h"
    3335#include "core/Game.h"
    3436#include "core/GameMode.h"
    35 #include "core/Iterator.h"
    3637#include "network/Server.h"
    37 #include "objects/Tickable.h"
    38 #include "util/Sleep.h"
    3938
    4039namespace orxonox
  • code/trunk/src/orxonox/gamestates/GSDedicated.h

    r2896 r3196  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"
  • code/trunk/src/orxonox/gamestates/GSGraphics.cc

    r3110 r3196  
    2828
    2929/**
    30     @file
    31     @brief Implementation of Graphics GameState class.
     30@file
     31@brief
     32    Implementation of Graphics GameState class.
    3233 */
    3334
     
    3738#include <OgreRenderWindow.h>
    3839
    39 #include "util/Debug.h"
    4040#include "core/ConfigValueIncludes.h"
    4141#include "core/Clock.h"
     
    5252#include "overlays/console/InGameConsole.h"
    5353#include "gui/GUIManager.h"
     54#include "sound/SoundManager.h"
    5455#include "GraphicsManager.h"
    5556
     
    6465        , guiManager_(0)
    6566        , graphicsManager_(0)
     67        , soundManager_(0)
    6668        , masterKeyBinder_(0)
    6769        , masterInputState_(0)
     
    9597        \li creates input manager
    9698        \li loads master key bindings
     99        \li loads the SoundManager
    97100        \li loads ingame console
    98101        \li loads GUI interface (GUIManager)
     
    128131        masterKeyBinder_->loadBindings("masterKeybindings.ini");
    129132        masterInputState_->setKeyHandler(masterKeyBinder_);
     133
     134        // Load the SoundManager
     135        soundManager_ = new SoundManager();
    130136
    131137        // Load the InGameConsole
     
    173179        delete this->debugOverlay_;
    174180
     181        delete this->soundManager_;
     182
    175183        delete this->inputManager_;
    176184        this->inputManager_ = 0;
  • code/trunk/src/orxonox/gamestates/GSGraphics.h

    r3084 r3196  
    2727 */
    2828
    29  /**
    30     @file
    31     @brief Declaration of the Graphics GameState class.
    32   */
     29/**
     30@file
     31@brief
     32    Declaration of the Graphics GameState class.
     33*/
    3334
    3435#ifndef _GSGraphics_H__
     
    3637
    3738#include "OrxonoxPrereqs.h"
     39
    3840#include "core/GameState.h"
    39 #include "tools/WindowEventListener.h"
     41#include "interfaces/WindowEventListener.h"
    4042
    4143namespace orxonox
    4244{
    4345    /**
    44     @class GSGraphics
    4546    @brief
    46         Game state used when displaying graphics of any kind
     47        Game state used when displaying graphics of any kind. Another blubb resides here.
    4748
    4849        This game state is only left out if we start a dedicated server where no graphics are present.
     
    7172        GUIManager*           guiManager_;          //!< Interface to GUI
    7273        GraphicsManager*      graphicsManager_;     //!< Interface to Ogre
     74        SoundManager*         soundManager_;        //!< Keeps track of SoundBase objects
    7375
    7476        KeyBinder*            masterKeyBinder_;     //!< Key binder for master key bindings
  • code/trunk/src/orxonox/gamestates/GSIOConsole.cc

    r3110 r3196  
    3030
    3131#include <iostream>
    32 #include <OgreFrameListener.h>
    33 #include <OgreRoot.h>
    34 #include <OgreTimer.h>
    3532
    3633#include "core/ConsoleCommand.h"
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r3110 r3196  
    3333#include "core/input/SimpleInputState.h"
    3434#include "core/input/KeyBinder.h"
    35 #include "core/Loader.h"
    36 #include "core/XMLFile.h"
    37 #include "core/CommandExecutor.h"
     35#include "core/Clock.h"
     36#include "core/CommandLine.h"
    3837#include "core/ConsoleCommand.h"
    39 #include "core/CommandLine.h"
    4038#include "core/ConfigValueIncludes.h"
    41 #include "core/Core.h"
    4239#include "core/CoreIncludes.h"
    4340#include "core/Game.h"
    4441#include "core/GameMode.h"
    45 #include "objects/Tickable.h"
     42#include "core/Core.h"
     43#include "core/Loader.h"
     44#include "core/XMLFile.h"
     45
     46#include "interfaces/Tickable.h"
    4647#include "objects/Radar.h"
     48#include "objects/quest/QuestManager.h"
     49#include "overlays/notifications/NotificationManager.h"
     50#include "gui/GUIManager.h"
    4751#include "CameraManager.h"
    4852#include "GraphicsManager.h"
    4953#include "LevelManager.h"
    5054#include "PlayerManager.h"
    51 #include "gui/GUIManager.h"
    52 #include "objects/quest/QuestManager.h"
    53 #include "overlays/notifications/NotificationManager.h"
    5455
    5556namespace orxonox
     
    148149        if (show)
    149150        {
    150             GUIManager::getInstancePtr()->showGUI("inGameTest");
    151             GUIManager::getInstancePtr()->executeCode("showCursor()");
     151            GUIManager::getInstance().showGUI("inGameTest");
     152            GUIManager::getInstance().executeCode("showCursor()");
    152153            InputManager::getInstance().requestEnterState("guiMouseOnly");
    153154        }
    154155        else
    155156        {
    156             GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
    157             GUIManager::getInstancePtr()->executeCode("hideCursor()");
     157            GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
     158            GUIManager::getInstance().executeCode("hideCursor()");
    158159            InputManager::getInstance().requestLeaveState("guiMouseOnly");
    159160        }
  • code/trunk/src/orxonox/gamestates/GSLevel.h

    r3008 r3196  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
    3335#include "core/OrxonoxClass.h"
    3436#include "core/GameState.h"
     
    4850
    4951        static void showIngameGUI(bool show);
    50         static void setLevel(std::string levelName);
    5152
    5253        static XMLFile* startFile_s;
     
    6970        LevelManager*         levelManager_;            //!< global level manager
    7071        PlayerManager*        playerManager_;           //!< player manager for this level
    71         QuestManager*          questManager_;
     72        QuestManager*         questManager_;
    7273        NotificationManager*  notificationManager_;
    7374
  • code/trunk/src/orxonox/gamestates/GSMainMenu.cc

    r3110 r3196  
    2929#include "GSMainMenu.h"
    3030
    31 //#include <OgreViewport.h>
    3231#include <OgreSceneManager.h>
     32
     33#include "core/input/InputManager.h"
     34#include "core/input/SimpleInputState.h"
     35#include "core/Game.h"
    3336#include "core/Clock.h"
    3437#include "core/ConsoleCommand.h"
    35 #include "core/Game.h"
    36 #include "core/input/InputManager.h"
    37 #include "core/input/SimpleInputState.h"
     38#include "objects/Scene.h"
    3839#include "gui/GUIManager.h"
    39 #include "objects/Scene.h"
     40#include "sound/SoundMainMenu.h"
    4041#include "GraphicsManager.h"
    41 #include "sound/SoundMainMenu.h"
    4242
    4343namespace orxonox
  • code/trunk/src/orxonox/gamestates/GSMainMenu.h

    r3094 r3196  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include <OgrePrerequisites.h>
     33
     34#include "util/OgreForwardRefs.h"
    3435#include "core/GameState.h"
    3536
  • code/trunk/src/orxonox/gamestates/GSRoot.cc

    r3110 r3196  
    2929#include "GSRoot.h"
    3030
    31 #include "util/Exception.h"
    32 #include "util/Debug.h"
    3331#include "core/Clock.h"
     32#include "core/CommandLine.h"
     33#include "core/ConsoleCommand.h"
    3434#include "core/Game.h"
    3535#include "core/GameMode.h"
    36 #include "core/CommandLine.h"
    37 #include "core/ConsoleCommand.h"
    38 #include "tools/TimeFactorListener.h"
    3936#include "tools/Timer.h"
    40 #include "objects/Tickable.h"
     37#include "interfaces/TimeFactorListener.h"
     38#include "interfaces/Tickable.h"
    4139
    4240namespace orxonox
  • code/trunk/src/orxonox/gamestates/GSRoot.h

    r3084 r3196  
    3232#include "OrxonoxPrereqs.h"
    3333#include "core/GameState.h"
    34 #include "core/OrxonoxClass.h"
    3534
    3635namespace orxonox
  • code/trunk/src/orxonox/gamestates/GSServer.cc

    r3110 r3196  
    2929#include "GSServer.h"
    3030
     31#include "util/Debug.h"
    3132#include "core/CommandLine.h"
    3233#include "core/Game.h"
  • code/trunk/src/orxonox/gamestates/GSServer.h

    r2896 r3196  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/GameState.h"
    3435#include "network/NetworkPrereqs.h"
  • code/trunk/src/orxonox/gamestates/GSStandalone.cc

    r3110 r3196  
    2929#include "GSStandalone.h"
    3030
    31 #include <OgreViewport.h>
    32 #include <OgreCamera.h>
    3331#include "core/Game.h"
    3432#include "core/GameMode.h"
    35 #include "core/ConsoleCommand.h"
    36 #include "gui/GUIManager.h"
    37 #include "GraphicsManager.h"
    3833
    3934namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.