Changeset 5774 for code/trunk/src/orxonox

Timestamp:

Sep 23, 2009, 11:31:02 PM (15 years ago)

Author:

rgrieder

Message:

Removed almost everything. Should be working already, but not yet tested on Unix.

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• CameraManager.cc (deleted)
• CameraManager.h (deleted)
• GSRoot.cc (copied) (copied from code/trunk/src/modules/gamestates/GSRoot.cc) (2 diffs)
• GSRoot.h (copied) (copied from code/trunk/src/modules/gamestates/GSRoot.h) (2 diffs)
• Level.cc (deleted)
• Level.h (deleted)
• LevelManager.cc (deleted)
• LevelManager.h (deleted)
• Main.cc (modified) (2 diffs)
• OrxonoxPrecompiledHeaders.h (deleted)
• OrxonoxPrereqs.h (modified) (1 diff)
• PawnManager.cc (deleted)
• PawnManager.h (deleted)
• PlayerManager.cc (deleted)
• PlayerManager.h (deleted)
• Radar.cc (deleted)
• Radar.h (deleted)
• Scene.cc (deleted)
• Scene.h (deleted)
• Test.cc (deleted)
• Test.h (deleted)
• collisionshapes (deleted)
• controllers (deleted)
• gametypes (deleted)
• graphics (deleted)
• infos (deleted)
• interfaces (deleted)
• items (deleted)
• overlays (deleted)
• pickup (deleted)
• sound (deleted)
• weaponsystem (deleted)
• worldentities (deleted)

code/trunk/src/orxonox/CMakeLists.txt

@@ -26 +26 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   Main.cc
-
-  CameraManager.cc
-  LevelManager.cc
-  PawnManager.cc
-  PlayerManager.cc
-
-  Level.cc
-  Radar.cc
-  Scene.cc
+  GSRoot.cc
 )
-
-ADD_SUBDIRECTORY(collisionshapes)
-ADD_SUBDIRECTORY(controllers)
-ADD_SUBDIRECTORY(gametypes)
-ADD_SUBDIRECTORY(graphics)
-ADD_SUBDIRECTORY(infos)
-ADD_SUBDIRECTORY(interfaces)
-ADD_SUBDIRECTORY(items)
-ADD_SUBDIRECTORY(overlays)
-ADD_SUBDIRECTORY(pickup)
-ADD_SUBDIRECTORY(sound)
-ADD_SUBDIRECTORY(weaponsystem)
-ADD_SUBDIRECTORY(worldentities)
 
 ORXONOX_ADD_LIBRARY(orxonox
   FIND_HEADER_FILES
-  TOLUA_FILES
-    LevelManager.h
-    pickup/BaseItem.h
-    pickup/PickupInventory.h
   DEFINE_SYMBOL
     "ORXONOX_SHARED_BUILD"
-  PCH_FILE
-    OrxonoxPrecompiledHeaders.h
   LINK_LIBRARIES
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
-    ${OGRE_LIBRARY}
-    ${OPENAL_LIBRARY}
-    ${ALUT_LIBRARY}
-    ${VORBISFILE_LIBRARY}
-    ${VORBIS_LIBRARY}
-    ${OGG_LIBRARY}
-    tinyxml++_orxonox
     tolua++_orxonox
-    bullet_orxonox
     util
     core
-    network
-    tools
   SOURCE_FILES ${ORXONOX_SRC_FILES}
 )

code/trunk/src/orxonox/GSRoot.cc

@@ -30 +30 @@
 
 #include "core/Clock.h"
-#include "core/ConsoleCommand.h"
 #include "core/Game.h"
-#include "core/GameMode.h"
-#include "network/NetworkFunction.h"
-#include "tools/Timer.h"
-#include "tools/interfaces/TimeFactorListener.h"
-#include "tools/interfaces/Tickable.h"
-#include "LevelManager.h"
 
 namespace orxonox
@@ -45 +38 @@
     GSRoot::GSRoot(const GameStateInfo& info)
         : GameState(info)
-        , timeFactor_(1.0f)
-        , bPaused_(false)
-        , timeFactorPauseBackup_(1.0f)
     {
-        this->ccSetTimeFactor_ = 0;
-        this->ccPause_ = 0;
     }
 
     GSRoot::~GSRoot()
     {
-        NetworkFunctionBase::destroyAllNetworkFunctions();
     }
 
     void GSRoot::activate()
     {
-        // reset game speed to normal
-        this->timeFactor_ = 1.0f;
-
-        {
-            // time factor console command
-            FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::setTimeFactor);
-            functor->setObject(this);
-            this->ccSetTimeFactor_ = createConsoleCommand(functor, "setTimeFactor");
-            CommandExecutor::addConsoleCommandShortcut(this->ccSetTimeFactor_).accessLevel(AccessLevel::Offline).defaultValue(0, 1.0);
-        }
-
-        {
-            // time factor console command
-            FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::pause);
-            functor->setObject(this);
-            this->ccPause_ = createConsoleCommand(functor, "pause");
-            CommandExecutor::addConsoleCommandShortcut(this->ccPause_).accessLevel(AccessLevel::Offline);
-        }
-
-        // create the LevelManager
-        this->levelManager_ = new LevelManager();
     }
 
     void GSRoot::deactivate()
     {
-/*
-        if (this->ccSetTimeFactor_)
-        {
-            delete this->ccSetTimeFactor_;
-            this->ccSetTimeFactor_ = 0;
-        }
-
-        if (this->ccPause_)
-        {
-            delete this->ccPause_;
-            this->ccPause_ = 0;
-        }
-*/
-
-        delete this->levelManager_;
     }
 
     void GSRoot::update(const Clock& time)
     {
-        if (this->getActivity().topState)
-        {
-            // This state can not 'survive' on its own.
-            // Load a user interface therefore
-            Game::getInstance().requestState("ioConsole");
-        }
-
-        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
-            it->tick(time);
-
-        /*** HACK *** HACK ***/
-        // Call the Tickable objects
-        float leveldt = time.getDeltaTime();
-        if (leveldt > 1.0f)
-        {
-            // just loaded
-            leveldt = 0.0f;
-        }
-        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
-            it->tick(leveldt * this->timeFactor_);
-        /*** HACK *** HACK ***/
-    }
-
-    /**
-    @brief
-        Changes the speed of Orxonox
-    @remark
-        This function is a hack when placed here!
-        Timefactor should be related to the scene (level or so), not the game
-    */
-    void GSRoot::setTimeFactor(float factor)
-    {
-        if (GameMode::isMaster())
-        {
-            if (!this->bPaused_)
-            {
-                TimeFactorListener::timefactor_s = factor;
-
-                for (ObjectList<TimeFactorListener>::iterator it = ObjectList<TimeFactorListener>::begin(); it != ObjectList<TimeFactorListener>::end(); ++it)
-                    it->changedTimeFactor(factor, this->timeFactor_);
-
-                this->timeFactor_ = factor;
-            }
-            else
-                this->timeFactorPauseBackup_ = factor;
-        }
-    }
-
-    void GSRoot::pause()
-    {
-        if (GameMode::isMaster())
-        {
-            if (!this->bPaused_)
-            {
-                this->timeFactorPauseBackup_ = this->timeFactor_;
-                this->setTimeFactor(0.0f);
-                this->bPaused_ = true;
-            }
-            else
-            {
-                this->bPaused_ = false;
-                this->setTimeFactor(this->timeFactorPauseBackup_);
-            }
-        }
     }
 }

code/trunk/src/orxonox/GSRoot.h

@@ -30 +30 @@
 #define _GSRoot_H__
 
-#include "gamestates/GameStatesPrereqs.h"
+#include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
 
 namespace orxonox
 {
-    class _GameStatesExport GSRoot : public GameState
+    class _OrxonoxExport GSRoot : public GameState
     {
     public:
@@ -45 +45 @@
         void update(const Clock& time);
 
-        // this has to be public because proteced triggers a bug in msvc
-        // when taking the function address.
-        void setTimeFactor(float factor);
-        void pause();
-        float getTimeFactor() { return this->timeFactor_; }
-
     private:
-        float                 timeFactor_;              //!< A factor that sets the gamespeed. 1 is normal.
-        bool                  bPaused_;
-        float                 timeFactorPauseBackup_;
-
-        LevelManager*         levelManager_;            //!< global level manager
-
-        // console commands
-        ConsoleCommand*       ccSetTimeFactor_;
-        ConsoleCommand*       ccPause_;
     };
 }

code/trunk/src/orxonox/Main.cc

@@ -41 +41 @@
 #include "core/Game.h"
 #include "core/LuaState.h"
-#include "ToluaBindOrxonox.h"
 #include "Main.h"
-
-SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
-// Shortcuts for easy direct loading
-SetCommandLineSwitch(server).information("Start in server mode");
-SetCommandLineSwitch(client).information("Start in client mode");
-SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
-SetCommandLineSwitch(standalone).information("Start in standalone mode");
-
-DeclareToluaInterface(Orxonox);
 
 namespace orxonox
@@ -65 +55 @@
         game->setStateHierarchy(
         "root"
-        " graphics"
-        "  mainMenu"
-        "  standalone"
-        "   level"
-        "  server"
-        "   level"
-        "  client"
-        "   level"
-        " dedicated"
-        "  level"
-        " ioConsole"
         );
 
         game->requestState("root");
-
-        // Some development hacks (not really, but in the future, this calls won't make sense anymore)
-        if (CommandLine::getValue("standalone").getBool())
-            Game::getInstance().requestStates("graphics, standalone, level");
-        else if (CommandLine::getValue("server").getBool())
-            Game::getInstance().requestStates("graphics, server, level");
-        else if (CommandLine::getValue("client").getBool())
-            Game::getInstance().requestStates("graphics, client, level");
-        else if (CommandLine::getValue("dedicated").getBool())
-            Game::getInstance().requestStates("dedicated, level");
-        else if (CommandLine::getValue("console").getBool())
-            Game::getInstance().requestStates("ioConsole");
-        else
-            Game::getInstance().requestStates("graphics, mainMenu");
 
         game->run();

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -36 +36 @@
 
 #include "OrxonoxConfig.h"
-
-#include "tools/ToolsPrereqs.h"
 
 //-----------------------------------------------------------------------