Changeset 6885 in orxonox.OLD

Timestamp:

Jan 31, 2006, 4:06:11 AM (18 years ago)

Author:

patrick

Message:

trunk: implemented a working lense-flare

Location:

trunk/src/lib/graphics

Files:

• effects/lense_flare.cc (modified) (5 diffs)
• effects/lense_flare.h (modified) (1 diff)
• graphics_engine.cc (modified) (1 diff)

trunk/src/lib/graphics/effects/lense_flare.cc

@@ -139 +139 @@
   Billboard* bb = new Billboard(NULL);
   bb->setTexture(textureName);
+  bb->setSize(50, 50);
   this->flares.push_back(bb);
   PRINTF(0)("Added a Lenseflare Billboard with texture %s\n", textureName);
@@ -150 +151 @@
 
 
+bool LenseFlare::sourceVisible() const
+{}
+
 
 /**
@@ -159 +163 @@
     return;
 
+  // refetch light source information if needed
   if( unlikely( this->lightSource == NULL))
+  {
     this->lightSource = (LightManager::getInstance())->getLight(0);
-  else
-    this->lightSource->debug();
+    if( this->flares.size() > 0)
+      this->flares[0]->setBindNode(static_cast<PNode*>(this->lightSource));
+  }
+
 
   // always update the screen center, it could be, that the window is resized
   this->screenCenter = Vector(State::getResX()/2.0f, State::getResY()/2.0f, 0.0f);
   // flare vector is the direction from the center to the light source
-  this->flareVector = this->flares[0]->getAbsCoor2D();
+  this->flareVector = this->screenCenter - this->flares[0]->getAbsCoor2D();
   this->distance = this->flareVector.len();
   this->flareVector.normalize();
-
-  PRINTF(0)("Debug: screenCenter: %f, %f - flareVec: %f, %f\n", screenCenter.x, screenCenter.y, flareVector.x, flareVector.y);
 
   // now calculate the new coordinates of the billboards
@@ -179 +185 @@
   {
     // set the new position
-    (*it)->setAbsCoor2D(this->flareVector * this->flareMatrix[i * 2]);
+    if( i == 0)
+      continue;
+    (*it)->setAbsCoor2D( this->screenCenter + this->flareVector * this->flareMatrix[i * 2] * this->distance);
     PRINTF(0)("Tick flare %i @ (%f, %f)\n", i, (*it)->getAbsCoor2D().x, (*it)->getAbsCoor2D().y);
     // tick them
@@ -195 +203 @@
     return;
 
+  if( !this->sourceVisible())
+    return;
+
   std::vector<Billboard*>::const_iterator it;
   for( it = flares.begin(); it != flares.end(); it++)

trunk/src/lib/graphics/effects/lense_flare.h

@@ -43 +43 @@
   private:
     GLint charToFogMode(const char* mode);
+    bool sourceVisible() const;
 
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -176 +176 @@
   this->loadGraphicsEffect(ge);
 
-  ge->addFlare("pictures/lense_flares/lens1.jpg");
-  ge->addFlare("pictures/lense_flares/lens2.jpg");
-  ge->addFlare("pictures/lense_flares/lens3.jpg");
-  ge->addFlare("pictures/lense_flares/lens4.jpg");
-
+  ge->addFlare("pictures/lense_flare/lens1.png");
+  ge->addFlare("pictures/lense_flare/lens2.png");
+  ge->addFlare("pictures/lense_flare/lens3.png");
+  ge->addFlare("pictures/lense_flare/lens4.png");
 
   ge->activate();