Changeset 2044 for code/branches/objecthierarchy/src/orxonox/objects/worldentities

Timestamp:

Oct 29, 2008, 11:37:19 AM (16 years ago)

Author:

landauf

Message:

added some new graphical classes

Location:

code/branches/objecthierarchy/src/orxonox/objects/worldentities

Files:

• Backlight.h (modified) (1 diff)
• Billboard.cc (added)
• Billboard.h (added)
• BlinkingBillboard.cc (added)
• BlinkingBillboard.h (added)
• Light.cc (added)
• Light.h (added)
• Model.h (modified) (1 diff)
• ParticleSpawner.h (modified) (1 diff)

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

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

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

@@ -47 +47 @@
             virtual void changedVisibility();
 
+            inline const Mesh& getMesh() const
+                { return this->mesh_; }
+
             inline void setMeshSource(const std::string& meshname)
                 { this->meshSrc_ = meshname; this->changedMesh(); }
             inline const std::string& getMeshSource() const
                 { return this->meshSrc_; }
-            inline const Mesh& getMesh() const
-                { return this->mesh_; }
 
             inline void setCastShadows(bool bCastShadows)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "WorldEntity.h"
+#include "PositionableEntity.h"
 #include "tools/Timer.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleSpawner : public WorldEntity
+    class _OrxonoxExport ParticleSpawner : public PositionableEntity
     {
         public: