Changeset 5728

Timestamp:

Aug 31, 2009, 9:30:55 PM (15 years ago)

Author:

landauf

Message:

Added a new module for unconnected object classes and/or specializations of basisclasses in the orxonox library. All classes are only created and used in XML and therefore aren't needed in the orxonox library itself.
Doesn't compile atm.

Location:

code/branches/libraries2/src

Files:

• modules/objects (added)
• modules/objects/Attacher.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/Attacher.cc)
• modules/objects/Attacher.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/Attacher.h)
• modules/objects/ForceField.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/ForceField.cc)
• modules/objects/ForceField.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/ForceField.h)
• modules/objects/Planet.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/Planet.cc)
• modules/objects/Planet.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/Planet.h)
• modules/objects/Script.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/Script.cc)
• modules/objects/Script.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/Script.h)
• modules/objects/collisionshapes (added)
• modules/objects/collisionshapes/BoxCollisionShape.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc)
• modules/objects/collisionshapes/BoxCollisionShape.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/BoxCollisionShape.h)
• modules/objects/collisionshapes/ConeCollisionShape.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc)
• modules/objects/collisionshapes/ConeCollisionShape.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/ConeCollisionShape.h)
• modules/objects/collisionshapes/PlaneCollisionShape.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc)
• modules/objects/collisionshapes/PlaneCollisionShape.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h)
• modules/objects/collisionshapes/SphereCollisionShape.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc)
• modules/objects/collisionshapes/SphereCollisionShape.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/collisionshapes/SphereCollisionShape.h)
• modules/objects/eventsystem (added)
• modules/objects/eventsystem/EventDispatcher.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventDispatcher.cc)
• modules/objects/eventsystem/EventDispatcher.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventDispatcher.h)
• modules/objects/eventsystem/EventListener.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventListener.cc)
• modules/objects/eventsystem/EventListener.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventListener.h)
• modules/objects/eventsystem/EventTarget.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventTarget.cc)
• modules/objects/eventsystem/EventTarget.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/EventTarget.h)
• modules/objects/triggers (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/triggers)
• modules/objects/triggers/CMakeLists.txt (copied) (copied from code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt)
• modules/objects/triggers/DistanceTrigger.cc (copied) (copied from code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc)
• modules/objects/triggers/DistanceTrigger.h (copied) (copied from code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h)
• modules/objects/triggers/PlayerTrigger.cc (deleted)
• modules/objects/triggers/PlayerTrigger.h (deleted)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/collisionshapes/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/worldentities/CMakeLists.txt (modified) (2 diffs)

code/branches/libraries2/src/orxonox/objects/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  EventListener.cc
-  EventDispatcher.cc
-  EventTarget.cc
   GlobalShader.cc
   Level.cc
   Radar.cc
   Scene.cc
-  Script.cc
 )
 

code/branches/libraries2/src/orxonox/objects/collisionshapes/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  BoxCollisionShape.cc
   CollisionShape.cc
   CompoundCollisionShape.cc
-  ConeCollisionShape.cc
-  PlaneCollisionShape.cc
-  SphereCollisionShape.cc
   WorldEntityCollisionShape.cc
 )

code/branches/libraries2/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -6 +6 @@
   ControllableEntity.cc
 
-  Attacher.cc
   Backlight.cc
   Billboard.cc
@@ -19 +18 @@
   ParticleEmitter.cc
   ParticleSpawner.cc
-  Planet.cc
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  ForceField.cc
 )
 
 ADD_SUBDIRECTORY(pawns)
-ADD_SUBDIRECTORY(triggers)