Changeset 2184

Timestamp:

Nov 12, 2008, 11:43:48 AM (15 years ago)

Author:

rgrieder

Message:

Forgot to consider some files wile renaming StaticEntity to PositionableEntity again.

Location:

code/branches/physics/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/worldentities/Backlight.h (modified) (1 diff)
• objects/worldentities/Billboard.cc (modified) (1 diff)
• objects/worldentities/Billboard.h (modified) (2 diffs)
• objects/worldentities/Camera.cc (modified) (1 diff)
• objects/worldentities/Camera.h (modified) (1 diff)
• objects/worldentities/CameraPosition.cc (modified) (1 diff)
• objects/worldentities/CameraPosition.h (modified) (1 diff)
• objects/worldentities/Light.cc (modified) (1 diff)
• objects/worldentities/Light.h (modified) (2 diffs)
• objects/worldentities/Model.cc (modified) (1 diff)
• objects/worldentities/Model.h (modified) (1 diff)
• objects/worldentities/ParticleEmitter.cc (modified) (1 diff)
• objects/worldentities/ParticleEmitter.h (modified) (1 diff)
• objects/worldentities/SpawnPoint.cc (modified) (1 diff)
• objects/worldentities/SpawnPoint.h (modified) (1 diff)
• objects/worldentities/triggers/Trigger.cc (modified) (1 diff)
• objects/worldentities/triggers/Trigger.h (modified) (2 diffs)

code/branches/physics/src/orxonox/CMakeLists.txt

@@ -58 +58 @@
   objects/worldentities/WorldEntity.cc
   objects/worldentities/StaticEntity.cc
-  objects/worldentities/KinematicEntity.cc
-  objects/worldentities/DynamicEntity.cc
   objects/worldentities/MovableEntity.cc
+  objects/worldentities/PositionableEntity.cc
+  objects/worldentities/LinearEntity.cc
   objects/worldentities/ControllableEntity.cc
   objects/worldentities/Model.cc

code/branches/physics/src/orxonox/OrxonoxPrereqs.h

@@ -105 +105 @@
     class StaticEntity;
     class MovableEntity;
+    class PositionableEntity;
     class ControllableEntity;
+    class LinearEntity;
     class Sublevel;
 

code/branches/physics/src/orxonox/objects/worldentities/Backlight.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 #include "tools/BillboardSet.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Backlight : public StaticEntity
+    class _OrxonoxExport Backlight : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/Billboard.cc

@@ -38 +38 @@
     CreateFactory(Billboard);
 
-    Billboard::Billboard(BaseObject* creator) : StaticEntity(creator)
+    Billboard::Billboard(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Billboard);

code/branches/physics/src/orxonox/objects/worldentities/Billboard.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 #include "util/Math.h"
 #include "tools/BillboardSet.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport Billboard : public StaticEntity
+    class _OrxonoxExport Billboard : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/Camera.cc

@@ -47 +47 @@
     CreateFactory(Camera);
 
-    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
+    Camera::Camera(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Camera);

code/branches/physics/src/orxonox/objects/worldentities/Camera.h

@@ -33 +33 @@
 
 #include <OgrePrerequisites.h>
-#include "objects/worldentities/StaticEntity.h"
+#include "objects/worldentities/PositionableEntity.h"
 #include "objects/Tickable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Camera : public StaticEntity, public Tickable
+    class _OrxonoxExport Camera : public PositionableEntity, public Tickable
     {
         friend class CameraManager;

code/branches/physics/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -38 +38 @@
     CreateFactory(CameraPosition);
 
-    CameraPosition::CameraPosition(BaseObject* creator) : StaticEntity(creator)
+    CameraPosition::CameraPosition(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(CameraPosition);

code/branches/physics/src/orxonox/objects/worldentities/CameraPosition.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "objects/worldentities/StaticEntity.h"
+#include "objects/worldentities/PositionableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CameraPosition : public StaticEntity
+    class _OrxonoxExport CameraPosition : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/Light.cc

@@ -47 +47 @@
     CreateFactory(Light);
 
-    Light::Light(BaseObject* creator) : StaticEntity(creator)
+    Light::Light(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Light);

code/branches/physics/src/orxonox/objects/worldentities/Light.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 
 #include <string>
@@ -40 +40 @@
 namespace orxonox
 {
-    class _OrxonoxExport Light : public StaticEntity
+    class _OrxonoxExport Light : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/Model.cc

@@ -38 +38 @@
     CreateFactory(Model);
 
-    Model::Model(BaseObject* creator) : StaticEntity(creator)
+    Model::Model(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Model);

code/branches/physics/src/orxonox/objects/worldentities/Model.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 #include "tools/Mesh.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Model : public StaticEntity
+    class _OrxonoxExport Model : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -45 +45 @@
     CreateFactory(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(BaseObject* creator) : StaticEntity(creator)
+    ParticleEmitter::ParticleEmitter(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(ParticleEmitter);

code/branches/physics/src/orxonox/objects/worldentities/ParticleEmitter.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleEmitter : public StaticEntity
+    class _OrxonoxExport ParticleEmitter : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/SpawnPoint.cc

@@ -38 +38 @@
     CreateFactory(SpawnPoint);
 
-    SpawnPoint::SpawnPoint(BaseObject* creator) : StaticEntity(creator)
+    SpawnPoint::SpawnPoint(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(SpawnPoint);

code/branches/physics/src/orxonox/objects/worldentities/SpawnPoint.h

@@ -34 +34 @@
 #include "core/Identifier.h"
 #include "core/Template.h"
-#include "StaticEntity.h"
+#include "PositionableEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport SpawnPoint : public StaticEntity
+    class _OrxonoxExport SpawnPoint : public PositionableEntity
     {
         public:

code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -44 +44 @@
   CreateFactory(Trigger);
 
-  Trigger::Trigger(BaseObject* creator) : StaticEntity(creator)
+  Trigger::Trigger(BaseObject* creator) : PositionableEntity(creator)
   {
     RegisterObject(Trigger);

code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -36 +36 @@
 
 #include "objects/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "objects/worldentities/PositionableEntity.h"
 #include "tools/BillboardSet.h"
 
@@ -48 +48 @@
   };
 
-  class _OrxonoxExport Trigger : public StaticEntity, public Tickable
+  class _OrxonoxExport Trigger : public PositionableEntity, public Tickable
   {
     public: