Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 17, 2011, 5:47:22 AM (13 years ago)
Author:
rgrieder
Message:

Stripped down trunk to form a new light sandbox.

Location:
code/forks/sandbox_light/src/orxonox
Files:
37 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • code/forks/sandbox_light/src/orxonox/CMakeLists.txt

    r7648 r7908  
    2424
    2525SET_SOURCE_FILES(ORXONOX_SRC_FILES
    26   Level.cc
    27   LevelInfo.cc
    28   LevelManager.cc
    2926  Main.cc
    30   MoodManager.cc
    31   PawnManager.cc
    32   PlayerManager.cc
    33   Radar.cc
    34   ChatHistory.cc
    35   ChatInputHandler.cc
    36 #  Test.cc
    37 COMPILATION_BEGIN SceneCompilation.cc
    38   CameraManager.cc
    39   Scene.cc
    40 COMPILATION_END
    4127)
    42 
    43 ADD_SUBDIRECTORY(collisionshapes)
    44 ADD_SUBDIRECTORY(controllers)
    45 ADD_SUBDIRECTORY(gamestates)
    46 ADD_SUBDIRECTORY(gametypes)
    47 ADD_SUBDIRECTORY(graphics)
    48 ADD_SUBDIRECTORY(infos)
    49 ADD_SUBDIRECTORY(interfaces)
    50 ADD_SUBDIRECTORY(items)
    51 ADD_SUBDIRECTORY(overlays)
    52 ADD_SUBDIRECTORY(pickup)
    53 ADD_SUBDIRECTORY(sound)
    54 ADD_SUBDIRECTORY(weaponsystem)
    55 ADD_SUBDIRECTORY(worldentities)
    5628
    5729ORXONOX_ADD_LIBRARY(orxonox
    5830  FIND_HEADER_FILES
    59   TOLUA_FILES
    60     ChatInputHandler.h
    61     LevelInfo.h
    62     LevelManager.h
    63     MoodManager.h
    64     controllers/HumanController.h
    65     infos/PlayerInfo.h
    66     sound/SoundManager.h
    6731  PCH_FILE
    6832    OrxonoxPrecompiledHeaders.h
    … …  
    7034    ${Boost_FILESYSTEM_LIBRARY}
    7135    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
    72     ${Boost_THREAD_LIBRARY}
    73     ${Boost_DATE_TIME_LIBRARY} # Thread dependency
    74     ${OGRE_LIBRARY}
    75     ${OPENAL_LIBRARY}
    76     ${ALUT_LIBRARY}
    77     ${VORBISFILE_LIBRARY}
    78     ${VORBIS_LIBRARY}
    79     ${OGG_LIBRARY}
    80     tinyxml_orxonox
    81     tolua_orxonox
    82     bullet_orxonox
    8336    util
    8437    core
    85     network
    86     tools
    8738  SOURCE_FILES ${ORXONOX_SRC_FILES}
    8839)

  • code/forks/sandbox_light/src/orxonox/Main.cc

    r7801 r7908  
    3737
    3838#include "core/CommandLineParser.h"
    39 #include "core/Game.h"
    40 #include "core/LuaState.h"
    41 #include "ToluaBindOrxonox.h"
    42 #include "ToluaBindNetwork.h"
    43 
    44 DeclareToluaInterface(Orxonox);
    45 DeclareToluaInterface(Network);
     39#include "core/Core.h"
    4640
    4741namespace orxonox
    4842{
    49     SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
    50     SetCommandLineSwitch(server).information("Start in server mode");
    51     SetCommandLineSwitch(client).information("Start in client mode");
    52     SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
    53     SetCommandLineSwitch(standalone).information("Start in standalone mode");
    54     SetCommandLineSwitch(dedicatedClient).information("Start in dedicated client mode");
    55 
    56     /* ADD masterserver command */
    57     SetCommandLineSwitch(masterserver).information("Start in masterserver mode");
    58 
    5943    SetCommandLineArgument(generateDoc, "")
    6044        .information("Generates a Doxygen file from things like SetConsoleCommand");
    … …  
    6650    int main(const std::string& strCmdLine)
    6751    {
    68         Game* game = new Game(strCmdLine);
     52        Core* core = new Core(strCmdLine);
    6953
    7054        if (CommandLineParser::getValue("generateDoc").getString().empty())
    7155        {
    72             /* TODO make this clear */
    73             game->setStateHierarchy(
    74             "root"
    75             " graphics"
    76             "  mainMenu"
    77             "  standalone,server,client"
    78             "   level"
    79             " server,client,masterserver"
    80             "  level"
    81             );
    82 
    83             game->requestState("root");
    84 
    85             // Some development hacks (not really, but in the future, these calls won't make sense anymore)
    86             if (CommandLineParser::getValue("standalone").getBool())
    87                 Game::getInstance().requestStates("graphics, standalone, level");
    88             else if (CommandLineParser::getValue("server").getBool())
    89                 Game::getInstance().requestStates("graphics, server, level");
    90             else if (CommandLineParser::getValue("client").getBool())
    91                 Game::getInstance().requestStates("graphics, client, level");
    92             else if (CommandLineParser::getValue("dedicated").getBool())
    93                 Game::getInstance().requestStates("server, level");
    94             else if (CommandLineParser::getValue("dedicatedClient").getBool())
    95                 Game::getInstance().requestStates("client, level");
    96             /* ADD masterserver command */
    97             else if (CommandLineParser::getValue("masterserver").getBool())
    98                 Game::getInstance().requestStates("masterserver");
    99             else
    100             {
    101                 if (!CommandLineParser::getValue("console").getBool())
    102                     Game::getInstance().requestStates("graphics, mainMenu");
    103             }
    104 
    105             game->run();
     56            // Start your program here
    10657        }
    10758
    108         delete game;
     59        delete core;
    10960
    11061        return 0;

  • code/forks/sandbox_light/src/orxonox/OrxonoxPrecompiledHeaders.h

    r7284 r7908  
    3838#include "OrxonoxConfig.h"
    3939
    40 ///////////////////////////////////////////
    41 /////          Stable Headers         /////
    42 ///////////////////////////////////////////
    43 
    44 #include <cassert>  // 87
    45 #include <cstring>  // 87
    46 #include <fstream>  // 87
    47 #include <iostream> // 87
    48 #include <map>      // 87
    49 #include <set>      // 87
    50 #include <sstream>  // 87
    51 #include <string>   // 87
    52 #include <vector>   // 87
    53 #include <list>     // 86
    54 #include <ctime>    // 82
    55 #include <cmath>    // 81
    56 #include <deque>    // 81
    57 #include <queue>    // 81
    58 
    59 #include <OgreMath.h>        // 81
    60 #include <OgreVector2.h>     // 81
    61 #include <OgreVector3.h>     // 81
    62 #include <OgreVector4.h>     // 81
    63 #include <OgreQuaternion.h>  // 81
    64 #include <OgreColourValue.h> // 81
    65 
    66 #include "util/OgreForwardRefs.h"     // 67
    67 #include <LinearMath/btMotionState.h> // 60
    68 #include "util/SubString.h" // 55
    69 #include <tinyxml/ticpp.h>  // 41
    70 
    71 //#include <OgreRenderable.h> // 14, 5.1MB
    72 //#include <OgreSceneNode.h>  // 13, 1MB
    73 //#include <OgreResourceGroupManager.h> // 12, 1.5MB
    74 //#include <OgreTexture.h>       // 11, 0.6MB
    75 //#include <OgreMovableObject.h> // 10, 1.6MB
    76 //#include <OgreSceneManager.h>  // 9, 8.7MB
    77 
    78 ///////////////////////////////////////////
    79 /////       All Rebuild Headers       /////
    80 ///////////////////////////////////////////
    81 
    82 #include "core/BaseObject.h"   // 82
    83 #include "core/CoreIncludes.h" // 80
    84 
    85 ///////////////////////////////////////////
    86 /////      Not so Stable Headers      /////
    87 ///////////////////////////////////////////
    88 
    89 #include "network/synchronisable/Synchronisable.h" // 70
    90 #include "util/MultiType.h"    // 65
    91 #include "core/command/Executor.h"     // 55
    92 //#include "core/XMLPort.h"     // 41
    93 
    94 
    9540// Just in case some header included windows.h
    9641#undef min

  • code/forks/sandbox_light/src/orxonox/OrxonoxPrereqs.h

    r7854 r7908  
    3737
    3838#include "OrxonoxConfig.h"
    39 #include "tools/ToolsPrereqs.h"
    4039
    4140//-----------------------------------------------------------------------
    … …  
    6564namespace orxonox
    6665{
    67     class CameraManager;
    68     class Level;
    69     class LevelInfo;
    70     class LevelInfoItem;
    71     class LevelManager;
    72     class PawnManager;
    73     class PlayerManager;
    74     class Radar;
    75     class Scene;
    76 
    77     // collisionshapes
    78     class CollisionShape;
    79     class CompoundCollisionShape;
    80     class WorldEntityCollisionShape;
    81 
    82     // controllers
    83     class AIController;
    84     class ArtificialController;
    85     class Controller;
    86     class DroneController;
    87     class HumanController;
    88     class ScriptController;
    89     class WaypointController;
    90     class WaypointPatrolController;
    91 
    92     // gametypes
    93     class Asteroids;
    94     class Deathmatch;
    95     class Dynamicmatch;
    96     class Gametype;
    97     class LastManStanding;
    98     class TeamBaseMatch;
    99     class TeamDeathmatch;
    100     class UnderAttack;
    101 
    102     // graphics
    103     class Backlight;
    104     class Billboard;
    105     class BlinkingBillboard;
    106     class Camera;
    107     class FadingBillboard;
    108     class GlobalShader;
    109     class Light;
    110     class Model;
    111     class ParticleEmitter;
    112     class ParticleSpawner;
    113 
    114     // infos
    115     class Bot;
    116     class GametypeInfo;
    117     class HumanPlayer;
    118     class Info;
    119     class PlayerInfo;
    120 
    121     // interfaces
    122     class GametypeMessageListener;
    123     class NotificationListener;
    124     class Pickupable;
    125     class PickupCarrier;
    126     class PlayerTrigger;
    127     class RadarListener;
    128     class RadarViewable;
    129     class Rewardable;
    130     class TeamColourable;
    131 
    132     // items
    133     class Engine;
    134     class Item;
    135     class MultiStateEngine;
    136 
    137     // overlays
    138     class InGameConsole;
    139     class Map;
    140     class OrxonoxOverlay;
    141     class OverlayGroup;
    142 
    143     // pickup
    144     class PickupIdentifier;
    145 
    146     //sound
    147     class AmbientSound;
    148     class BaseSound;
    149     class SoundBuffer;
    150     class SoundManager;
    151     class SoundStreamer;
    152     class WorldSound;
    153     class WorldAmbientSound;
    154 
    155     // weaponsystem
    156     class DefaultWeaponmodeLink;
    157     class Munition;
    158     class Weapon;
    159     class WeaponMode;
    160     class WeaponPack;
    161     class WeaponSet;
    162     class WeaponSlot;
    163     class WeaponSystem;
    164 
    165     // worldentities
    166     class BigExplosion;
    167     class CameraPosition;
    168     class ControllableEntity;
    169     class Drone;
    170     class EffectContainer;
    171     class ExplosionChunk;
    172     class MobileEntity;
    173     class MovableEntity;
    174     class SpawnPoint;
    175     class StaticEntity;
    176     class TeamSpawnPoint;
    177     class WorldEntity;
    178     class Rocket;
    179     // worldentities, pawns
    180     class Destroyer;
    181     class Pawn;
    182     class SpaceShip;
    183     class Spectator;
    184     class TeamBaseMatchBase;
    18566}
    18667
    187 // Bullet Physics Engine
    188 class btTransform;
    189 class btVector3;
    190 
    191 class btRigidBody;
    192 class btCollisionObject;
    193 class btGhostObject;
    194 class btManifoldPoint;
    195 
    196 class btCollisionShape;
    197 class btSphereShape;
    198 class btCompoundShape;
    199 class btStaticPlaneShape;
    200 
    201 class btDiscreteDynamicsWorld;
    202 class bt32BitAxisSweep3;
    203 class btDefaultCollisionConfiguration;
    204 class btCollisionDispatcher;
    205 class btSequentialImpulseConstraintSolver;
    206 
    207 // ALUT
    208 typedef struct ALCcontext_struct ALCcontext;
    209 typedef struct ALCdevice_struct ALCdevice;
    210 typedef unsigned int ALuint;
    211 typedef int ALint;
    212 typedef int ALenum;
    213 
    21468#endif /* _OrxonoxPrereqs_H__ */
Note: See TracChangeset for help on using the changeset viewer.