Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 12, 2010, 12:47:30 AM (14 years ago)
Author:
rgrieder
Message:

Basic stuff up and running for the Qt sandbox.
No GUI support yet.

Location:
sandbox_qt/src/orxonox
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sandbox_qt/src/orxonox/CMakeLists.txt

    r7401 r7421  
    2424
    2525SET_SOURCE_FILES(ORXONOX_SRC_FILES
    26   Level.cc
    27   LevelManager.cc
    2826  Main.cc
    29   MoodManager.cc
    30   PawnManager.cc
    31   PlayerManager.cc
    32   Radar.cc
    33   ChatHistory.cc
    34   ChatInputHandler.cc
    35 #  Test.cc
    36 COMPILATION_BEGIN SceneCompilation.cc
    37   CameraManager.cc
    38   Scene.cc
    39 COMPILATION_END
    4027)
    4128
    42 ADD_SUBDIRECTORY(collisionshapes)
    43 ADD_SUBDIRECTORY(controllers)
    44 ADD_SUBDIRECTORY(gamestates)
    45 ADD_SUBDIRECTORY(gametypes)
    46 ADD_SUBDIRECTORY(graphics)
    47 ADD_SUBDIRECTORY(infos)
    48 ADD_SUBDIRECTORY(interfaces)
    49 ADD_SUBDIRECTORY(items)
    50 ADD_SUBDIRECTORY(overlays)
    51 ADD_SUBDIRECTORY(pickup)
    52 ADD_SUBDIRECTORY(sound)
    53 ADD_SUBDIRECTORY(weaponsystem)
    54 ADD_SUBDIRECTORY(worldentities)
     29#ADD_SUBDIRECTORY(subdir)
    5530
    5631ORXONOX_ADD_LIBRARY(orxonox
    5732  FIND_HEADER_FILES
    58   TOLUA_FILES
    59     ChatInputHandler.h
    60     LevelManager.h
    61     MoodManager.h
    62     controllers/HumanController.h
    63     interfaces/Pickupable.h
    64     infos/PlayerInfo.h
    65     sound/SoundManager.h
    66   PCH_FILE
    67     OrxonoxPrecompiledHeaders.h
    6833  LINK_LIBRARIES
    69     ${Boost_FILESYSTEM_LIBRARY}
    70     ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
    71     ${Boost_THREAD_LIBRARY}
    72     ${Boost_DATE_TIME_LIBRARY} # Thread dependency
    73     ${OGRE_LIBRARY}
    74     ${OPENAL_LIBRARY}
    75     ${ALUT_LIBRARY}
    76     ${VORBISFILE_LIBRARY}
    77     ${VORBIS_LIBRARY}
    78     ${OGG_LIBRARY}
    79     tinyxml_orxonox
    80     tolua_orxonox
    81     bullet_orxonox
     34    ${QT_QTCORE_LIBRARY}
    8235    util
    8336    core
    84     network
    85     tools
    8637  SOURCE_FILES ${ORXONOX_SRC_FILES}
    8738)

  • sandbox_qt/src/orxonox/Main.cc

    r7401 r7421  
    3636#include "OrxonoxPrereqs.h"
    3737
    38 #include "core/CommandLineParser.h"
    3938#include "core/Game.h"
    40 #include "core/LuaState.h"
    41 #include "ToluaBindOrxonox.h"
    42 #include "ToluaBindNetwork.h"
    4339#include "Main.h"
    44 
    45 DeclareToluaInterface(Orxonox);
    46 DeclareToluaInterface(Network);
    4740
    4841namespace orxonox
    4942{
    50     SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
    51     SetCommandLineSwitch(server).information("Start in server mode");
    52     SetCommandLineSwitch(client).information("Start in client mode");
    53     SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
    54     SetCommandLineSwitch(standalone).information("Start in standalone mode");
    55     SetCommandLineSwitch(dedicatedClient).information("Start in dedicated client mode");
    56 
    57     SetCommandLineArgument(generateDoc, "")
    58         .information("Generates a Doxygen file from things like SetConsoleCommand");
    59 
    6043    /**
    6144    @brief
    … …  
    6649        Game* game = new Game(strCmdLine);
    6750
    68         if (CommandLineParser::getValue("generateDoc").getString().empty())
    69         {
    70             game->setStateHierarchy(
    71             "root"
    72             " graphics"
    73             "  mainMenu"
    74             "  standalone,server,client"
    75             "   level"
    76             " server,client"
    77             "  level"
    78             );
    79 
    80             game->requestState("root");
    81 
    82             // Some development hacks (not really, but in the future, these calls won't make sense anymore)
    83             if (CommandLineParser::getValue("standalone").getBool())
    84                 Game::getInstance().requestStates("graphics, standalone, level");
    85             else if (CommandLineParser::getValue("server").getBool())
    86                 Game::getInstance().requestStates("graphics, server, level");
    87             else if (CommandLineParser::getValue("client").getBool())
    88                 Game::getInstance().requestStates("graphics, client, level");
    89             else if (CommandLineParser::getValue("dedicated").getBool())
    90                 Game::getInstance().requestStates("server, level");
    91             else if (CommandLineParser::getValue("dedicatedClient").getBool())
    92                 Game::getInstance().requestStates("client, level");
    93             else
    94             {
    95                 if (!CommandLineParser::getValue("console").getBool())
    96                     Game::getInstance().requestStates("graphics, mainMenu");
    97             }
    98 
    99             game->run();
    100         }
     51        //if (CommandLineParser::getValue("generateDoc").getString().empty())
     52        //    game->run();
    10153
    10254        delete game;

  • sandbox_qt/src/orxonox/OrxonoxPrereqs.h

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