Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 25, 2008, 9:50:26 PM (16 years ago)
Author:
rgrieder
Message:

tiny adjustments to various files. just came across certain things..

Location:
code/branches/objecthierarchy/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • code/branches/objecthierarchy/src/core/ArgumentCompletionFunctions.cc

    r1505 r2013  
    3030#include <map>
    3131
    32 #include "boost/filesystem.hpp"
     32#include <boost/filesystem.hpp>
    3333
    3434#include "ArgumentCompletionFunctions.h"
  • code/branches/objecthierarchy/src/core/Template.cc

    r1993 r2013  
    2727 */
    2828
    29 #include "OrxonoxStableHeaders.h"
    3029#include "Template.h"
    3130
  • code/branches/objecthierarchy/src/orxonox/OrxonoxStableHeaders.h

    r1841 r2013  
    3737#include "util/OrxonoxPlatform.h"
    3838
    39 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
     39#if defined(ORXONOX_ENABLE_PCH)
    4040
    4141// including std headers here is useless since they're already precompiled
     
    4747#include <Ogre.h>
    4848#include <CEGUI.h>
     49#include "ois/OIS.h"
    4950#include <boost/thread/recursive_mutex.hpp>
    50 #include <boost/thread/mutex.hpp>
    51 #include <boost/thread/condition.hpp>
    52 #include <boost/thread/thread.hpp>
    53 
     51//#include <boost/thread/mutex.hpp>
     52//#include <boost/thread/condition.hpp>
     53//#include <boost/thread/thread.hpp>
     54#include <boost/static_assert.hpp>
    5455#include "tinyxml/ticpp.h"
    5556#include "tinyxml/tinyxml.h"
     57#include "tolua/tolua++.h"
    5658
    57 //Get around Windows hackery (windows.h is included by Ogre)
     59//Get around Windows hackery (windows.h is included by Ogre.h)
    5860#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
    5961#  ifdef max
     
    6769//----------- Our files ----------
    6870//--------------------------------
    69 // only include when not debugging so that we may find issues with missing headers quicker
    70 #if defined(NDEBUG)
     71//// only include when not debugging so that we may find issues with missing headers quicker
     72//#if defined(NDEBUG)
    7173
    7274#include "util/Convert.h"
    7375#include "util/Debug.h"
     76#include "util/Exception.h"
    7477#include "util/Math.h"
    7578#include "util/Multitype.h"
    76 #include "util/OutputBuffer.h"
    77 #include "util/OutputHandler.h"
    7879#include "util/Sleep.h"
    7980#include "util/String.h"
     
    8586#include "core/ConfigValueIncludes.h"
    8687#include "core/CommandExecutor.h"
     88#include "core/Core.h"
    8789#include "core/Executor.h"
     90#include "core/ObjectList.h"
     91#include "core/Super.h"
    8892#include "core/XMLIncludes.h"
    8993#include "core/XMLPort.h"
     94#include "core/input/SimpleInputState.h"
     95#include "core/input/InputManager.h"
    9096
    9197#include "network/Synchronisable.h"
    9298
    93 //#include "tools/Mesh.h"
    94 //#include "tools/Timer.h"
    95 //#include "objects/Model.h"
    96 //#include "objects/Tickable.h"
    97 //#include "objects/WorldEntity.h"
     99#include "Settings.h"
    98100
    99 #endif /* ifdef NDEBUG */
     101//#endif /* ifdef NDEBUG */
    100102
    101103#endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) */
  • code/branches/objecthierarchy/src/orxonox/gamestates/GSGraphics.cc

    r2007 r2013  
    489489            it->windowResized(this->renderWindow_->getWidth(), this->renderWindow_->getHeight());
    490490
    491                 // OIS needs this under linux even if we only use relative input measurement.
    492                 if (this->inputManager_)
     491        // OIS needs this under linux even if we only use relative input measurement.
     492        if (this->inputManager_)
    493493            this->inputManager_->setWindowExtents(renderWindow_->getWidth(), renderWindow_->getHeight());
    494494    }
     
    506506
    507507        // instruct InputManager to clear the buffers (core library so we cannot use the interface)
    508                 if (this->inputManager_)
     508        if (this->inputManager_)
    509509            this->inputManager_->clearBuffers();
    510510    }
     
    518518    void GSGraphics::windowClosed(Ogre::RenderWindow *rw)
    519519    {
    520         // using CommandExecutor in order to avoid depending on Orxonox.h.
    521         //CommandExecutor::execute("exit", false);
    522520        this->requestState("root");
    523521    }
  • code/branches/objecthierarchy/src/orxonox/gamestates/GSIOConsole.cc

    r1755 r2013  
    3636
    3737#include "core/ConsoleCommand.h"
    38 #include "core/TclThreadManager.h"
    3938#include "GraphicsEngine.h"
    4039
  • code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUIRenderer.cpp

    r1755 r2013  
    2525*************************************************************************/
    2626
     27#include "OrxonoxStableHeaders.h"
    2728#include <CEGUIImagesetManager.h>
    2829#include <CEGUIImageset.h>
  • code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUIResourceProvider.cpp

    r1755 r2013  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
     26#include "OrxonoxStableHeaders.h"
    2627#include "OgreCEGUIResourceProvider.h"
    2728
  • code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUITexture.cpp

    r1755 r2013  
    2525*************************************************************************/
    2626
     27#include "OrxonoxStableHeaders.h"
    2728#include <CEGUISystem.h>
    2829#include <CEGUIExceptions.h>
  • code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

    r1969 r2013  
    3636
    3737#include "worldentities/PositionableEntity.h"
    38 
    39 #include "../tools/BillboardSet.h"
     38#include "tools/BillboardSet.h"
    4039
    4140namespace orxonox {
Note: See TracChangeset for help on using the changeset viewer.