Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 31, 2007, 4:25:06 PM (16 years ago)
Author:
nicolasc
Message:

merged FICN_test back to FICN

Location:
code/branches/FICN/src/orxonox
Files:
5 deleted
12 edited
13 copied

Legend:

Unmodified
Added
Removed

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

    r752 r768  
    1 PROJECT(Orxonox)
    2 
    3 ADD_SUBDIRECTORY(core)
    4 ADD_SUBDIRECTORY(hud)
    5 IF(NOT WIN32)
    6   ADD_SUBDIRECTORY(objects)
    7   ADD_SUBDIRECTORY(tools)
    8 ENDIF(NOT WIN32)
    9 ADD_SUBDIRECTORY(particle)
    10 
    11 INCLUDE_DIRECTORIES(tools)
    12 
    131SET( ORXONOX_SRC_FILES
     2  GraphicsEngine.cc
     3  Main.cc
    144  Orxonox.cc
    155  SpaceshipSteering.cc
    16   Main.cc
    17   GraphicsEngine.cc
     6  hud/HUD.cc
     7  particle/ParticleInterface.cc
     8  tools/BillboardSet.cc
     9  tools/Light.cc
     10  tools/Mesh.cc
     11  objects/Ambient.cc
     12  objects/Camera.cc
     13  objects/Explosion.cc
     14  objects/Fighter.cc
     15  objects/Model.cc
     16  objects/NPC.cc
     17  objects/Projectile.cc
     18  objects/Skybox.cc
     19  objects/SpaceShip.cc
     20# objects/SpaceshipSteeringObject.cc
     21# objects/test1.cc
     22# objects/test2.cc
     23# objects/test3.cc
     24  objects/WorldEntity.cc
     25  objects/weapon/AmmunitionDump.cc
     26  objects/weapon/BarrelGun.cc
     27  objects/weapon/BaseWeapon.cc
     28  objects/weapon/Bullet.cc
     29  objects/weapon/BulletManager.cc
     30  objects/weapon/WeaponStation.cc
    1831)
    1932
    20 IF(WIN32)
    21   SET( OBJECTS_SRC_FILES
    22     objects/WorldEntity.cc
    23     objects/test1.cc
    24     objects/test2.cc
    25     objects/test3.cc
    26     objects/Ambient.cc
    27     objects/Skybox.cc
    28     objects/Camera.cc
    29 #    objects/SpaceshipSteeringObject.cc
    30     objects/Fighter.cc
    31     objects/Model.cc
    32     objects/SpaceShip.cc
    33     objects/NPC.cc
    34     objects/Projectile.cc
    35     objects/weapon_system/AmmunitionDump.cc
    36     objects/weapon_system/BarrelGun.cc
    37     objects/weapon_system/BaseWeapon.cc
    38     objects/weapon_system/Bullet.cc
    39     objects/weapon_system/BulletManager.cc
    40     objects/weapon_system/WeaponStation.cc
    41     objects/Explosion.cc
    42     tools/BillboardSet.cc
    43     tools/Light.cc
    44     tools/Mesh.cc
    45   )
    46 ELSE(WIN32)
    47   SET(LINK_OBJECTS_LIBRARY objects)
    48   SET(LINK_TOOLS_LIBRARY tools)
    49 ENDIF(WIN32)
     33ADD_EXECUTABLE( main ${ORXONOX_SRC_FILES} )
    5034
    51 IF(WIN32)
    52 #  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
    53 ELSE(WIN32)
    54   ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})
    55 ENDIF(WIN32)
     35SET_TARGET_PROPERTIES( main PROPERTIES LINK_FLAGS "--no-undefined" )
    5636
    57 ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES} ${OBJECTS_SRC_FILES})
    58 
    59 SET_TARGET_PROPERTIES(../../bin/main PROPERTIES LINK_FLAGS "--no-undefined" )
    60 
    61 TARGET_LINK_LIBRARIES( ../../bin/main
     37TARGET_LINK_LIBRARIES( main
    6238  ${OGRE_LIBRARIES}
    6339  ${OIS_LIBRARIES}
    64   loader
     40  util
     41  core
    6542  audio
    6643  network
    67   core
    68   hud
    69   ${LINK_OBJECTS_LIBRARY}
    70   ${LINK_TOOLS_LIBRARY}
    71   util
    72   particle
     44  loader
    7345)
    7446

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

    r748 r768  
    7070#include "core/Debug.h"
    7171#include "hud/HUD.h"
    72 #include "objects/weapon_system/BulletManager.h"
     72#include "objects/weapon/BulletManager.h"
    7373#include "GraphicsEngine.h"
    7474

  • code/branches/FICN/src/orxonox/OrxonoxPlatform.h

    r729 r768  
    211211
    212212// disable: "conversion from 'double' to 'float', possible loss of data
    213 //#   pragma warning (disable : 4244)
     213#   pragma warning (disable : 4244)
     214
     215// disable: "conversion from 'size_t' to 'unsigned int', possible loss of data
     216#   pragma warning (disable : 4267)
    214217
    215218// disable: "truncation from 'double' to 'float'

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

    r742 r768  
    104104      if(speedRotateUpDown_ < 0)
    105105        speedRotateUpDown_ += accelerationRotateUpDown_*time;
    106       if(abs(speedRotateUpDown_)<accelerationRotateUpDown_*time)
     106      if(fabsf(speedRotateUpDown_)<accelerationRotateUpDown_*time)
    107107        speedRotateUpDown_ = 0;
    108108    }
    … …  
    128128      if(speedRotateRightLeft_ < 0)
    129129        speedRotateRightLeft_ += accelerationRotateRightLeft_*time;
    130       if(abs(speedRotateRightLeft_)<accelerationRotateRightLeft_*time)
     130      if(fabsf(speedRotateRightLeft_)<accelerationRotateRightLeft_*time)
    131131        speedRotateRightLeft_ = 0;
    132132    }
    … …  
    152152      if(speedLoopRightLeft_ < 0)
    153153        speedLoopRightLeft_ += accelerationLoopRightLeft_*time;
    154       if(abs(speedLoopRightLeft_)<accelerationLoopRightLeft_*time)
     154      if(fabsf(speedLoopRightLeft_)<accelerationLoopRightLeft_*time)
    155155        speedLoopRightLeft_ = 0;
    156156    }

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

    r733 r768  
    1 PROJECT(Orxonox)
    2 
    31SET( CORE_SRC_FILES
    42  BaseObject.cc
    … …  
    1715)
    1816
    19 IF(WIN32)
    20   ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
    21 ELSE(WIN32)
    22   ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
    23 ENDIF(WIN32)
     17ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
     18SET_TARGET_PROPERTIES( core PROPERTIES LINK_FLAGS "--no-undefined" )
     19
     20TARGET_LINK_LIBRARIES( core
     21  util
     22)

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

    r729 r768  
    55
    66#include "WorldEntity.h"
    7 #include "Timer.h"
     7#include "../tools/Timer.h"
    88
    99namespace orxonox

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

    r742 r768  
    3838#include "../Orxonox.h"
    3939#include "../particle/ParticleInterface.h"
    40 #include "weapon_system/AmmunitionDump.h"
    41 #include "weapon_system/BarrelGun.h"
     40#include "weapon/AmmunitionDump.h"
     41#include "weapon/BarrelGun.h"
    4242
    4343#include "Fighter.h"

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

    r729 r768  
    55
    66#include "WorldEntity.h"
    7 #include "Mesh.h"
     7#include "../tools/Mesh.h"
    88
    99class TiXmlElement; // Forward declaration

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

    r729 r768  
    55
    66#include "WorldEntity.h"
    7 #include "BillboardSet.h"
    8 #include "Timer.h"
     7#include "../tools/BillboardSet.h"
     8#include "../tools/Timer.h"
    99
    1010namespace orxonox

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

    r736 r768  
    88
    99#include "Model.h"
    10 #include "BillboardSet.h"
     10#include "../tools/BillboardSet.h"
    1111
    1212class TiXmlElement;          // Forward declaration

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

    r742 r768  
    1313#include "orxonox/core/BaseObject.h"
    1414#include "Tickable.h"
    15 #include "Mesh.h"
     15#include "../tools/Mesh.h"
    1616
    1717namespace orxonox

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

    r734 r768  
    33
    44#include "orxonox/core/BaseObject.h"
    5 #include "Timer.h"
     5#include "../tools/Timer.h"
    66
    77namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.