Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 341


Ignore:
Timestamp:
Nov 28, 2007, 9:54:59 PM (16 years ago)
Author:
rgrieder
Message:
  • removed folder src/class_hierarchy
  • removed a few unnec. files in src/
  • added a few files in src/orxonox to make weapon system and hud work
  • restructured all CMLs
  • adjusted all the #include directives (only one include directory now: src)
  • moved ENET library linkage to CML in src/orxonox
Location:
code/branches/FICN
Files:
10 deleted
32 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/CMakeLists.txt

    r337 r341  
    5454
    5555#Sets the search paths for the linking
    56 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy)
     56LINK_DIRECTORIES(
     57        ${OGRE_LIB_DIR}
     58        ${OIS_LIB_DIR}
     59        ${CEGUI_LIB_DIR}
     60        ${CEGUI_OGRE_LIB_DIR}
     61        ${ENet_LIBRARY}
     62        ${Boost_LIBRARY_DIRS}
     63)
    5764
    5865#Sets the search path for include files
    59 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
     66INCLUDE_DIRECTORIES(
     67        ${OGRE_INCLUDE_DIR}
     68        ${OIS_INCLUDE_DIR}
     69        ${CEGUI_INCLUDE_DIR}
     70        ${CEGUI_OGRE_INCLUDE_DIR}
     71        ${ENet_INCLUDE_DIR}
     72        ${Boost_INCLUDE_DIRS}
     73)
    6074
    6175

  • code/branches/FICN/src/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 ADD_SUBDIRECTORY(orxonox)
     3INCLUDE_DIRECTORIES(.)
     4
    45ADD_SUBDIRECTORY(loader)
    56ADD_SUBDIRECTORY(network)
    6 ADD_SUBDIRECTORY(class_hierarchy)
    7 
    8 # =======
    9 # PROJECT(Orxonox)
    10 #
    11 # # create a few variables to simplify life
    12 #
    13 # SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc spaceship_steering.cc)
    14 # SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h spaceship_steering.h )
    15 #
    16 # #Creates an executable
    17 # ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
    18 # #Links the executable against OGRE and OIS
    19 # TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
    20 #
    21 # >>>>>>> .merge-right.r318
     7ADD_SUBDIRECTORY(orxonox)

  • code/branches/FICN/src/loader/CMakeLists.txt

    r337 r341  
    22
    33# TODO find a cleaner way to include xmlParser
    4 SET(SRC_FILES LevelLoader.cc ../xml/xmlParser.cc)
    5 # SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
     4SET( LOADER_SRC_FILES
     5        LevelLoader.cc
     6        ../xml/xmlParser.cc
     7)
    68
    7 INCLUDE_DIRECTORIES(..)
    8 
    9 ADD_LIBRARY(loader ${SRC_FILES} ${INC_FILES})
     9ADD_LIBRARY(loader ${LOADER_SRC_FILES})

  • code/branches/FICN/src/loader/LevelLoader.cc

    r164 r341  
    33
    44#include "LevelLoader.h"
    5 #include "../xml/xmlParser.h"
     5#include "xml/xmlParser.h"
    66
    77using namespace std;

  • code/branches/FICN/src/loader/LevelLoader.h

    r164 r341  
    99#include <iostream>
    1010
    11 #include "../xml/xmlParser.h"
     11#include "xml/xmlParser.h"
    1212
    1313#ifndef __MODULE_LEVELLOADER__

  • code/branches/FICN/src/loader/Light.cc

    r164 r341  
    11
    2 #include "../xml/xmlParser.h"
     2#include "xml/xmlParser.h"
    33#include "Light.h"
    44

  • code/branches/FICN/src/loader/Light.h

    r164 r341  
    11
    2 #include "../xml/xmlParser.h"
     2#include "xml/xmlParser.h"
    33
    44#ifndef __MODULE_LIGHT__

  • code/branches/FICN/src/loader/LightManager.cc

    r164 r341  
    11
    2 #include "../xml/xmlParser.h"
     2#include "xml/xmlParser.h"
    33#include "LightManager.h"
    44

  • code/branches/FICN/src/loader/LightManager.h

    r164 r341  
    11#include <vector>
    22
    3 #include "../xml/xmlParser.h"
     3#include "xml/xmlParser.h"
    44#include "Light.h"
    55

  • code/branches/FICN/src/network/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 SET(SRC_FILES Client.cc ConnectionManager.cc PacketBuffer.cc PacketGenerator.cc Synchronisable.cc ClientConnection.cc GameStateManager.cc PacketDecoder.cc Server.cc)
     3SET( NETWORK_SRC_FILES
     4        Client.cc
     5        ClientConnection.cc
     6        ConnectionManager.cc
     7        GameStateManager.cc
     8        PacketBuffer.cc
     9        PacketDecoder.cc
     10        PacketGenerator.cc
     11        Server.cc
     12        Synchronisable.cc
     13)
    414
    5 INCLUDE_DIRECTORIES(..)
    6 
    7 ADD_LIBRARY(network ${SRC_FILES} ${ENet_LIBRARY})
     15ADD_LIBRARY(network ${NETWORK_SRC_FILES})

  • code/branches/FICN/src/network/PacketDecoder.cc

    r337 r341  
    77*/
    88
    9 #include "enet/enet.h"
     9#include <enet/enet.h>
    1010#include "PacketManager.h"
    1111#include <iostream>

  • code/branches/FICN/src/network/PacketGenerator.cc

    r337 r341  
    88
    99#include "PacketManager.h"
    10 #include "enet/enet.h"
     10#include <enet/enet.h>
    1111#include <iostream>
    1212#include <list>

  • code/branches/FICN/src/network/PacketManager.h

    r337 r341  
    33
    44#include <enet/enet.h>
    5 #include <network/GameStateManager.h>
     5#include "GameStateManager.h"
    66
    77//enum netowk generaly used to set the type ID of a packet

  • code/branches/FICN/src/network/dummyserver.cc

    r337 r341  
    66
    77#include <iostream>
    8 #include "enet/enet.h"
     8#include <enet/enet.h>
    99#include "ConnectionManager.h"
    1010#include "PacketManager.h"

  • code/branches/FICN/src/orxonox/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 SET(SRC_FILES orxonox.cc spaceship_steering.cc)
     3SET( ORXONOX_SRC_FILES
     4        orxonox.cc
     5        spaceship_steering.cc
     6)
    47
    5 ADD_EXECUTABLE(../../bin/main ${SRC_FILES})
     8ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES})
    69
    7 TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader )
    8 
    9 INCLUDE_DIRECTORIES(..)
    1010
    1111ADD_SUBDIRECTORY(core)
     12ADD_SUBDIRECTORY(hud)
    1213ADD_SUBDIRECTORY(objects)
    13 ADD_SUBDIRECTORY(hud)
    1414ADD_SUBDIRECTORY(weapon)
     15
     16
     17TARGET_LINK_LIBRARIES( ../../bin/main
     18        ${OGRE_LIBRARIES}
     19        ${OIS_LIBRARIES}
     20        ${ENet_LIBRARY}
     21        loader
     22        network
     23        core
     24        hud
     25        objects
     26        weapon
     27)

  • code/branches/FICN/src/orxonox/core/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 SET(SRC_FILES IdentifierList.cc Identifier.cc MetaObjectList.cc Factory.cc OrxonoxClass.cc)
     3SET( CORE_SRC_FILES
     4        Factory.cc
     5        IdentifierList.cc
     6        Identifier.cc
     7        MetaObjectList.cc
     8        OrxonoxClass.cc
     9)
    410
    5 ADD_LIBRARY(core ${SRC_FILES})
     11ADD_LIBRARY(core ${CORE_SRC_FILES})

  • code/branches/FICN/src/orxonox/hud/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 SET(SRC_FILES hud_overlay.cc test_overlay.cc)
     3SET( HUD_SRC_FILES
     4        hud_overlay.cc
     5        test_overlay.cc
     6)
    47
    5 ADD_LIBRARY(objects ${SRC_FILES})
     8LINK_DIRECTORIES(.)
     9
     10ADD_LIBRARY(hud ${HUD_SRC_FILES})

  • code/branches/FICN/src/orxonox/hud/hud_overlay.h

    r340 r341  
    3333#include "OgrePrerequisites.h"
    3434
    35 #include "../orxonox_prerequisites.h"
     35#include "orxonox/orxonox_prerequisites.h"
    3636
    3737

  • code/branches/FICN/src/orxonox/hud/test_overlay.h

    r340 r341  
    3333#include "OgrePrerequisites.h"
    3434
    35 #include "../orxonox_prerequisites.h"
     35#include "orxonox/orxonox_prerequisites.h"
    3636
    3737

  • code/branches/FICN/src/orxonox/objects/BaseObject.h

    r258 r341  
    22#define _BaseObject_H__
    33
    4 #include "../core/IdentifierIncludes.h"
     4#include "orxonox/core/IdentifierIncludes.h"
    55
    66namespace orxonox

  • code/branches/FICN/src/orxonox/objects/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 SET(SRC_FILES BaseObject.cc test1.cc test2.cc test3.cc)
     3SET( OBJECTS_SRC_FILES
     4        BaseObject.cc
     5        test1.cc
     6        test2.cc
     7        test3.cc
     8)
    49
    5 ADD_LIBRARY(objects ${SRC_FILES})
     10ADD_LIBRARY(objects ${OBJECTS_SRC_FILES})

  • code/branches/FICN/src/orxonox/orxonox.cc

    r340 r341  
    4242#include "loader/LevelLoader.h"
    4343
    44 #include "orxonox.h"
    45 
    46 #include "Flocking.h"
    47 
    4844#include "spaceship_steering.h"
    4945SpaceshipSteering* steering;
    50 
    5146
    5247

  • code/branches/FICN/src/orxonox/weapon/CMakeLists.txt

    r337 r341  
    11PROJECT(Orxonox)
    22
    3 # create a few variables to simplify life
    4 SET( WEAPON_SRC
     3SET( WEAPON_SRC_FILES
    54        ammunition_dump.cc
    65        barrel_gun.cc
    … …  
    1110)
    1211
    13 INCLUDE_DIRECTORIES(..)
    14 
    15 ADD_LIBRARY(weapon ${WEAPON_SRC})
     12ADD_LIBRARY(weapon ${WEAPON_SRC_FILES})

  • code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc

    r337 r341  
    2626 */
    2727
    28 #include "run_manager.h"
     28#include "orxonox/run_manager.h"
    2929
    3030#include "ammunition_dump.h"

  • code/branches/FICN/src/orxonox/weapon/ammunition_dump.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636

  • code/branches/FICN/src/orxonox/weapon/barrel_gun.cc

    r337 r341  
    3333#include "OgreSceneManager.h"
    3434
     35#include "orxonox/inertial_node.h"
     36
    3537#include "bullet.h"
    3638#include "bullet_manager.h"
    37 #include "inertial_node.h"
    3839#include "ammunition_dump.h"
    3940#include "base_weapon.h"

  • code/branches/FICN/src/orxonox/weapon/barrel_gun.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636

  • code/branches/FICN/src/orxonox/weapon/base_weapon.cc

    r337 r341  
    3333#include "OgreSceneManager.h"
    3434
     35#include "orxonox/inertial_node.h"
     36#include "orxonox/run_manager.h"
     37
    3538#include "bullet.h"
    3639#include "bullet_manager.h"
    37 #include "inertial_node.h"
    3840#include "ammunition_dump.h"
    39 #include "run_manager.h"
    4041
    4142#include "base_weapon.h"

  • code/branches/FICN/src/orxonox/weapon/base_weapon.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636

  • code/branches/FICN/src/orxonox/weapon/bullet.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636

  • code/branches/FICN/src/orxonox/weapon/bullet_manager.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636

  • code/branches/FICN/src/orxonox/weapon/weapon_station.h

    r337 r341  
    3232#include "OgrePrerequisites.h"
    3333
    34 #include "orxonox_prerequisites.h"
     34#include "orxonox/orxonox_prerequisites.h"
    3535
    3636
Note: See TracChangeset for help on using the changeset viewer.