Changeset 9629 for code/branches/core6/src/orxonox/graphics

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:

code/branches/core6/src/orxonox/graphics

Files:

• AnimatedModel.cc (modified) (1 diff)
• AnimatedModel.h (modified) (1 diff)
• Backlight.cc (modified) (1 diff)
• Backlight.h (modified) (1 diff)
• Billboard.cc (modified) (1 diff)
• Billboard.h (modified) (1 diff)
• BlinkingBillboard.cc (modified) (1 diff)
• BlinkingBillboard.h (modified) (1 diff)
• Camera.cc (modified) (1 diff)
• Camera.h (modified) (1 diff)
• FadingBillboard.cc (modified) (1 diff)
• FadingBillboard.h (modified) (1 diff)
• GlobalShader.cc (modified) (1 diff)
• GlobalShader.h (modified) (1 diff)
• Light.cc (modified) (1 diff)
• Light.h (modified) (1 diff)
• MeshLodInformation.cc (modified) (1 diff)
• MeshLodInformation.h (modified) (1 diff)
• Model.cc (modified) (1 diff)
• Model.h (modified) (1 diff)
• ParticleEmitter.cc (modified) (1 diff)
• ParticleEmitter.h (modified) (1 diff)
• ParticleSpawner.cc (modified) (1 diff)
• ParticleSpawner.h (modified) (1 diff)

code/branches/core6/src/orxonox/graphics/AnimatedModel.cc

@@ -41 +41 @@
     CreateFactory(AnimatedModel);
 
-    AnimatedModel::AnimatedModel(BaseObject* creator) : Model(creator)
+    AnimatedModel::AnimatedModel(Context* context) : Model(context)
     {
         RegisterObject(AnimatedModel);

code/branches/core6/src/orxonox/graphics/AnimatedModel.h

@@ -41 +41 @@
     {
         public:
-            AnimatedModel(BaseObject* creator);
+            AnimatedModel(Context* context);
             virtual ~AnimatedModel();
 

code/branches/core6/src/orxonox/graphics/Backlight.cc

@@ -47 +47 @@
     CreateFactory(Backlight);
 
-    Backlight::Backlight(BaseObject* creator) : FadingBillboard(creator)
+    Backlight::Backlight(Context* context) : FadingBillboard(context)
     {
         RegisterObject(Backlight);

code/branches/core6/src/orxonox/graphics/Backlight.h

@@ -41 +41 @@
     {
         public:
-            Backlight(BaseObject* creator);
+            Backlight(Context* context);
             virtual ~Backlight();
 

code/branches/core6/src/orxonox/graphics/Billboard.cc

@@ -40 +40 @@
     CreateFactory(Billboard);
 
-    Billboard::Billboard(BaseObject* creator) : StaticEntity(creator)
+    Billboard::Billboard(Context* context) : StaticEntity(context)
     {
         RegisterObject(Billboard);

code/branches/core6/src/orxonox/graphics/Billboard.h

@@ -44 +44 @@
     {
         public:
-            Billboard(BaseObject* creator);
+            Billboard(Context* context);
             virtual ~Billboard();
 

code/branches/core6/src/orxonox/graphics/BlinkingBillboard.cc

@@ -37 +37 @@
     CreateFactory(BlinkingBillboard);
 
-    BlinkingBillboard::BlinkingBillboard(BaseObject* creator) : Billboard(creator)
+    BlinkingBillboard::BlinkingBillboard(Context* context) : Billboard(context)
     {
         RegisterObject(BlinkingBillboard);

code/branches/core6/src/orxonox/graphics/BlinkingBillboard.h

@@ -41 +41 @@
     {
         public:
-            BlinkingBillboard(BaseObject* creator);
+            BlinkingBillboard(Context* context);
             virtual ~BlinkingBillboard();
 

code/branches/core6/src/orxonox/graphics/Camera.cc

@@ -48 +48 @@
     CreateFactory(Camera);
 
-    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
+    Camera::Camera(Context* context) : StaticEntity(context)
     {
         RegisterObject(Camera);

code/branches/core6/src/orxonox/graphics/Camera.h

@@ -46 +46 @@
 
         public:
-            Camera(BaseObject* creator);
+            Camera(Context* context);
             virtual ~Camera();
 

code/branches/core6/src/orxonox/graphics/FadingBillboard.cc

@@ -36 +36 @@
     CreateFactory(FadingBillboard);
 
-    FadingBillboard::FadingBillboard(BaseObject* creator) : Billboard(creator)
+    FadingBillboard::FadingBillboard(Context* context) : Billboard(context)
     {
         RegisterObject(FadingBillboard);

code/branches/core6/src/orxonox/graphics/FadingBillboard.h

@@ -42 +42 @@
     {
         public:
-            FadingBillboard(BaseObject* creator);
+            FadingBillboard(Context* context);
             virtual ~FadingBillboard();
 

code/branches/core6/src/orxonox/graphics/GlobalShader.cc

@@ -38 +38 @@
     CreateFactory(GlobalShader);
 
-    GlobalShader::GlobalShader(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    GlobalShader::GlobalShader(Context* context) : BaseObject(context), Synchronisable(context)
     {
         RegisterObject(GlobalShader);

code/branches/core6/src/orxonox/graphics/GlobalShader.h

@@ -41 +41 @@
     {
         public:
-            GlobalShader(BaseObject* creator);
+            GlobalShader(Context* context);
             virtual ~GlobalShader();
 

code/branches/core6/src/orxonox/graphics/Light.cc

@@ -49 +49 @@
     BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT   == (int)Light::Spotlight);
 
-    Light::Light(BaseObject* creator) : StaticEntity(creator)
+    Light::Light(Context* context) : StaticEntity(context)
     {
         RegisterObject(Light);

code/branches/core6/src/orxonox/graphics/Light.h

@@ -53 +53 @@
 
         public:
-            Light(BaseObject* creator);
+            Light(Context* context);
             virtual ~Light();
 

code/branches/core6/src/orxonox/graphics/MeshLodInformation.cc

@@ -40 +40 @@
     CreateFactory(MeshLodInformation);
 
-    MeshLodInformation::MeshLodInformation(BaseObject* creator)
-    : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)
+    MeshLodInformation::MeshLodInformation(Context* context)
+    : BaseObject(context), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15f)
     {
         RegisterObject(MeshLodInformation);

code/branches/core6/src/orxonox/graphics/MeshLodInformation.h

@@ -41 +41 @@
     {
         public:
-            MeshLodInformation(BaseObject* creator);
+            MeshLodInformation(Context* context);
             virtual ~MeshLodInformation();
 

code/branches/core6/src/orxonox/graphics/Model.cc

@@ -43 +43 @@
     CreateFactory(Model);
 
-    Model::Model(BaseObject* creator) :
-        StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)
+    Model::Model(Context* context) :
+        StaticEntity(context), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15f)
     {
         RegisterObject(Model);

code/branches/core6/src/orxonox/graphics/Model.h

@@ -41 +41 @@
     {
         public:
-            Model(BaseObject* creator);
+            Model(Context* context);
             virtual ~Model();
 

code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc

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

code/branches/core6/src/orxonox/graphics/ParticleEmitter.h

@@ -40 +40 @@
     {
         public:
-            ParticleEmitter(BaseObject* creator);
+            ParticleEmitter(Context* context);
             virtual ~ParticleEmitter();
 

code/branches/core6/src/orxonox/graphics/ParticleSpawner.cc

@@ -39 +39 @@
     CreateFactory(ParticleSpawner);
 
-    ParticleSpawner::ParticleSpawner(BaseObject* creator) : ParticleEmitter(creator)
+    ParticleSpawner::ParticleSpawner(Context* context) : ParticleEmitter(context)
     {
         RegisterObject(ParticleSpawner);

code/branches/core6/src/orxonox/graphics/ParticleSpawner.h

@@ -40 +40 @@
     {
         public:
-            ParticleSpawner(BaseObject* creator);
+            ParticleSpawner(Context* context);
             virtual ~ParticleSpawner();