Changeset 11073 for code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc

Timestamp:

Jan 18, 2016, 10:12:53 PM (8 years ago)

Author:

landauf

Message:

merged branch 'shaders' into branch 'shaders_merge'

Location:

code/branches/shaders_merge

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/LensFlare.cc (copied) (copied from code/branches/shaders/src/orxonox/graphics/LensFlare.cc) (3 diffs)

code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(LensFlare);
+    RegisterClass(LensFlare);
     
-    LensFlare::LensFlare(BaseObject* creator) : StaticEntity(creator), scale_(1.0f), fadeOnViewBorder_(true), fadeResolution_(7), fadeExponent_(2.0f), colour_(new ColourValue(1.0f,0.9f,0.9f))
+    LensFlare::LensFlare(Context* context) : StaticEntity(context), scale_(1.0f), fadeOnViewBorder_(true), fadeResolution_(7), fadeExponent_(2.0f), colour_(new ColourValue(1.0f,0.9f,0.9f))
     {
         RegisterObject(LensFlare);
@@ -94 +94 @@
     void LensFlare::createBillboards()
     {
-        this->occlusionBillboard_ = new Billboard(this);
+        this->occlusionBillboard_ = new Billboard(this->getContext());
         this->occlusionBillboard_->setMaterial("lensflare/hoq");
         this->occlusionBillboard_->setVisible(false);
@@ -102 +102 @@
         
         for(std::vector<LensFlare::Lens*>::iterator it = lensConfiguration_->begin(); it != lensConfiguration_->end(); ++it) {
-            Billboard* lensPart=new Billboard(this);
+            Billboard* lensPart=new Billboard(this->getContext());
             lensPart->setMaterial(*(*it)->material_);
             lensPart->disableFrustumCulling();