Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 1, 2009, 2:03:05 AM (15 years ago)
Author:
landauf
Message:

merged libraries2 back to trunk

Location:
code/trunk
Files:
18 deleted
12 edited
174 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/orxonox/CMakeLists.txt

    r5693 r5738  
    2626  PlayerManager.cc
    2727
    28   InGameConsole.cc
    29   Map.cc
     28  Level.cc
     29  Radar.cc
     30  Scene.cc
    3031)
    31 ADD_SUBDIRECTORY(gamestates)
     32
     33ADD_SUBDIRECTORY(collisionshapes)
     34ADD_SUBDIRECTORY(controllers)
     35ADD_SUBDIRECTORY(gametypes)
     36ADD_SUBDIRECTORY(graphics)
     37ADD_SUBDIRECTORY(infos)
    3238ADD_SUBDIRECTORY(interfaces)
     39ADD_SUBDIRECTORY(items)
    3340ADD_SUBDIRECTORY(overlays)
    34 ADD_SUBDIRECTORY(objects)
     41ADD_SUBDIRECTORY(pickup)
    3542ADD_SUBDIRECTORY(sound)
    36 ADD_SUBDIRECTORY(tools)
    37 
    38 # Translate argument
    39 IF(ORXONOX_USE_WINMAIN)
    40   SET(ORXONOX_WIN32 WIN32)
    41 ENDIF()
     43ADD_SUBDIRECTORY(weaponsystem)
     44ADD_SUBDIRECTORY(worldentities)
    4245
    4346ORXONOX_ADD_LIBRARY(orxonox
    … …  
    4548  TOLUA_FILES
    4649    LevelManager.h
    47     objects/pickup/BaseItem.h
    48     objects/pickup/PickupInventory.h
     50    pickup/BaseItem.h
     51    pickup/PickupInventory.h
    4952  DEFINE_SYMBOL
    5053    "ORXONOX_SHARED_BUILD"
    … …  
    7275)
    7376
    74 ORXONOX_ADD_EXECUTABLE(orxonox-main
    75   # When defined as WIN32 this removes the console window on Windows
    76   ${ORXONOX_WIN32}
    77   LINK_LIBRARIES
    78     orxonox
    79   SOURCE_FILES
    80     Orxonox.cc
    81   OUTPUT_NAME orxonox
    82 )
    83 
    84 GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
    85 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
    86 SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
    87 
    8877
    8978# When using Visual Studio we want to use the output directory as working

  • code/trunk/src/orxonox/CameraManager.cc

    r3370 r5738  
    3737#include "core/ObjectList.h"
    3838#include "tools/Shader.h"
    39 #include "objects/worldentities/Camera.h"
    40 #include "objects/Scene.h"
     39#include "graphics/Camera.h"
     40#include "Scene.h"
    4141
    4242namespace orxonox

  • code/trunk/src/orxonox/LevelManager.cc

    r5695 r5738  
    3838#include "core/Loader.h"
    3939#include "PlayerManager.h"
    40 #include "objects/Level.h"
    41 #include "objects/infos/HumanPlayer.h"
     40#include "Level.h"
     41#include "infos/HumanPlayer.h"
    4242
    4343namespace orxonox

  • code/trunk/src/orxonox/OrxonoxPrereqs.h

    r5693 r5738  
    6464namespace orxonox
    6565{
    66     // manager
    6766    class CameraManager;
    6867    class LevelManager;
    … …  
    7069    class PlayerManager;
    7170
     71    class Level;
     72    class Scene;
     73    class Tickable;
     74
    7275    // interfaces
    7376    class GametypeMessageListener;
    7477    class NotificationListener;
    7578    class PawnListener;
     79    class PlayerTrigger;
    7680    class RadarListener;
    7781    class RadarViewable;
    7882    class Rewardable;
    7983    class Teamcolourable;
    80 
    81     // objects
    82     class Level;
    83     class Scene;
    84     class Tickable;
    8584
    8685    // worldentities
    … …  
    106105
    107106    // mixed
    108     class PongCenterpoint;
    109     class PongBall;
    110     class PongBat;
    111 
    112     class EventListener;
    113     class EventDispatcher;
    114     class EventTarget;
    115 
    116107    class SpawnPoint;
    117108    class TeamSpawnPoint;
    118109
    119     class Attacher;
    120110    class CameraPosition;
    121111    class Sublevel;
    122     class ForceField;
    123112    class Radar;
    124113
    … …  
    139128    class TeamBaseMatch;
    140129    class UnderAttack;
    141     class Pong;
    142130
    143131    // pickups
    … …  
    162150    class RotatingEngine;
    163151
    164     // trigger
    165     class Trigger;
    166     class DistanceTrigger;
    167     class EventTrigger;
    168     class PlayerTrigger;
    169     class CheckPoint;
    170 
    171152    // weaponsystem
    172153    class WeaponSystem;
    … …  
    187168    class WaypointController;
    188169    class WaypointPatrolController;
    189     class PongAI;
    190170
    191171    // infos
    … …  
    194174    class HumanPlayer;
    195175    class Bot;
    196     class PongBot;
    197176    class GametypeInfo;
    198177
    199178    // collision
    200179    class CollisionShape;
    201     class SphereCollisionShape;
    202180    class CompoundCollisionShape;
    203     class PlaneCollisionShape;
    204181    class WorldEntityCollisionShape;
    205182

  • code/trunk/src/orxonox/PawnManager.cc

    r3370 r5738  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "objects/worldentities/pawns/Pawn.h"
     32#include "worldentities/pawns/Pawn.h"
    3333
    3434namespace orxonox

  • code/trunk/src/orxonox/PlayerManager.cc

    r3370 r5738  
    3131#include "core/CoreIncludes.h"
    3232#include "core/GameMode.h"
    33 #include "objects/Level.h"
    34 #include "objects/infos/HumanPlayer.h"
     33#include "Level.h"
     34#include "infos/HumanPlayer.h"
    3535#include "LevelManager.h"
    3636

  • code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc

    r5693 r5738  
    3535#include "GametypeMessageListener.h"
    3636#include "PawnListener.h"
     37#include "PlayerTrigger.h"
    3738#include "RadarListener.h"
    3839#include "Rewardable.h"
    … …  
    8485    Rewardable::Rewardable()
    8586    {
    86         RegisterObject(Rewardable);
     87        RegisterRootObject(Rewardable);
    8788    }
    8889
    … …  
    9293    NotificationListener::NotificationListener()
    9394    {
    94         RegisterObject(NotificationListener);
     95        RegisterRootObject(NotificationListener);
     96    }
     97
     98    //----------------------------
     99    // PlayerTrigger
     100    //----------------------------
     101    PlayerTrigger::PlayerTrigger()
     102    {
     103        RegisterRootObject(PlayerTrigger);
     104
     105        this->player_ = NULL;
     106        this->isForPlayer_ = true;
    95107    }
    96108}

  • code/trunk/src/orxonox/interfaces/RadarViewable.cc

    r5693 r5738  
    3636#include "core/CoreIncludes.h"
    3737#include "tools/DynamicLines.h"
    38 #include "objects/worldentities/WorldEntity.h"
    39 #include "objects/Radar.h"
    40 #include "Map.h"
     38#include "worldentities/WorldEntity.h"
     39#include "Radar.h"
     40#include "overlays/Map.h"
    4141
    4242namespace orxonox

  • code/trunk/src/orxonox/overlays/CMakeLists.txt

    r5693 r5738  
    22  OrxonoxOverlay.cc
    33  OverlayGroup.cc
     4
     5  InGameConsole.cc
     6  Map.cc
    47)
    5 
    6 SET_SOURCE_FILES(OVERLAYS_SRC_FILES
    7   OverlayText.cc
    8   FadeoutText.cc
    9   GUIOverlay.cc
    10 )
    11 
    12 ADD_SUBDIRECTORY(debug)
    13 ADD_SUBDIRECTORY(hud)
    14 ADD_SUBDIRECTORY(stats)
    15 
    16 ORXONOX_ADD_LIBRARY(overlays
    17   MODULE
    18   FIND_HEADER_FILES
    19   DEFINE_SYMBOL
    20     "OVERLAYS_SHARED_BUILD"
    21   PCH_FILE
    22     ../OrxonoxPrecompiledHeaders.h
    23   LINK_LIBRARIES
    24     orxonox
    25   SOURCE_FILES ${OVERLAYS_SRC_FILES}
    26 )

  • code/trunk/src/orxonox/sound/SoundBase.cc

    r5695 r5738  
    3737#include "core/Core.h"
    3838#include "core/Resource.h"
    39 #include "orxonox/objects/worldentities/WorldEntity.h"
     39#include "worldentities/WorldEntity.h"
    4040#include "SoundManager.h"
    4141
    42 namespace orxonox 
     42namespace orxonox
    4343{
    4444    SoundBase::SoundBase(WorldEntity* entity)

  • code/trunk/src/orxonox/sound/SoundManager.cc

    r3370 r5738  
    3232
    3333#include "util/Math.h"
    34 #include "orxonox/CameraManager.h"
    35 #include "orxonox/objects/worldentities/Camera.h"
     34#include "CameraManager.h"
     35#include "graphics/Camera.h"
    3636#include "SoundBase.h"
    3737
    … …  
    146146        Vector3 at = orient.zAxis();
    147147
    148         ALfloat orientation[6] = { at.x, at.y, at.z, 
     148        ALfloat orientation[6] = { at.x, at.y, at.z,
    149149                                 up.x, up.y, up.z };
    150150
    … …  
    158158            (*i)->update();
    159159    }
    160    
     160
    161161    /**
    162162    * Check if sound is available
Note: See TracChangeset for help on using the changeset viewer.