Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5782 for sandbox/src/orxonox


Ignore:
Timestamp:
Sep 24, 2009, 11:32:39 AM (15 years ago)
Author:
rgrieder
Message:

Applied changes to the real sandbox this time.

Location:
sandbox/src/orxonox
Files:
29 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • sandbox/src/orxonox/CMakeLists.txt

    r5752 r5782  
    2626SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2727  Main.cc
    28 
    29   CameraManager.cc
    30   LevelManager.cc
    31   PawnManager.cc
    32   PlayerManager.cc
    33 
    34   Level.cc
    35   Radar.cc
    36   Scene.cc
     28  GSRoot.cc
    3729)
    38 
    39 ADD_SUBDIRECTORY(collisionshapes)
    40 ADD_SUBDIRECTORY(controllers)
    41 ADD_SUBDIRECTORY(gametypes)
    42 ADD_SUBDIRECTORY(graphics)
    43 ADD_SUBDIRECTORY(infos)
    44 ADD_SUBDIRECTORY(interfaces)
    45 ADD_SUBDIRECTORY(items)
    46 ADD_SUBDIRECTORY(overlays)
    47 ADD_SUBDIRECTORY(pickup)
    48 ADD_SUBDIRECTORY(sound)
    49 ADD_SUBDIRECTORY(weaponsystem)
    50 ADD_SUBDIRECTORY(worldentities)
    5130
    5231ORXONOX_ADD_LIBRARY(orxonox
    5332  FIND_HEADER_FILES
    54   TOLUA_FILES
    55     LevelManager.h
    56     pickup/BaseItem.h
    57     pickup/PickupInventory.h
    5833  DEFINE_SYMBOL
    5934    "ORXONOX_SHARED_BUILD"
    60   PCH_FILE
    61     OrxonoxPrecompiledHeaders.h
    6235  LINK_LIBRARIES
    63     ${Boost_FILESYSTEM_LIBRARY}
    64     ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
    65     ${Boost_THREAD_LIBRARY}
    66     ${Boost_DATE_TIME_LIBRARY} # Thread dependency
    67     ${OGRE_LIBRARY}
    68     ${OPENAL_LIBRARY}
    69     ${ALUT_LIBRARY}
    70     ${VORBISFILE_LIBRARY}
    71     ${VORBIS_LIBRARY}
    72     ${OGG_LIBRARY}
    73     tinyxml++_orxonox
    7436    tolua++_orxonox
    75     bullet_orxonox
    7637    util
    7738    core
    78     network
    79     tools
    8039  SOURCE_FILES ${ORXONOX_SRC_FILES}
    8140)

  • sandbox/src/orxonox/Main.cc

    r5695 r5782  
    4141#include "core/Game.h"
    4242#include "core/LuaState.h"
    43 #include "ToluaBindOrxonox.h"
    4443#include "Main.h"
    45 
    46 SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
    47 // Shortcuts for easy direct loading
    48 SetCommandLineSwitch(server).information("Start in server mode");
    49 SetCommandLineSwitch(client).information("Start in client mode");
    50 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
    51 SetCommandLineSwitch(standalone).information("Start in standalone mode");
    52 
    53 DeclareToluaInterface(Orxonox);
    5444
    5545namespace orxonox
    … …  
    6555        game->setStateHierarchy(
    6656        "root"
    67         " graphics"
    68         "  mainMenu"
    69         "  standalone"
    70         "   level"
    71         "  server"
    72         "   level"
    73         "  client"
    74         "   level"
    75         " dedicated"
    76         "  level"
    77         " ioConsole"
    7857        );
    7958
    8059        game->requestState("root");
    81 
    82         // Some development hacks (not really, but in the future, this calls won't make sense anymore)
    83         if (CommandLine::getValue("standalone").getBool())
    84             Game::getInstance().requestStates("graphics, standalone, level");
    85         else if (CommandLine::getValue("server").getBool())
    86             Game::getInstance().requestStates("graphics, server, level");
    87         else if (CommandLine::getValue("client").getBool())
    88             Game::getInstance().requestStates("graphics, client, level");
    89         else if (CommandLine::getValue("dedicated").getBool())
    90             Game::getInstance().requestStates("dedicated, level");
    91         else if (CommandLine::getValue("console").getBool())
    92             Game::getInstance().requestStates("ioConsole");
    93         else
    94             Game::getInstance().requestStates("graphics, mainMenu");
    9560
    9661        game->run();

  • sandbox/src/orxonox/OrxonoxPrereqs.h

    r5738 r5782  
    3636
    3737#include "OrxonoxConfig.h"
    38 
    39 #include "tools/ToolsPrereqs.h"
    4038
    4139//-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.