Changeset 6888 in orxonox.OLD

Timestamp:

Jan 31, 2006, 4:38:57 AM (18 years ago)

Author:

patrick

Message:

trunk: the flare now look good, but occlusion culling missing Lenseflare will be displayed also if the sun is not visible

Location:

trunk/src/lib/graphics

Files:

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

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

@@ -54 +54 @@
   this->flareMatrix[6] = 0.125f; this->flareMatrix[7] = 1.0f;
   this->flareMatrix[8] = -0.5f; this->flareMatrix[9] = 0.5f;
-  this->flareMatrix[10] = -0.25f; this->flareMatrix[11] = 0.25f;
-  this->flareMatrix[12] = 1.82f; this->flareMatrix[13] = 0.25f;
+  this->flareMatrix[10] = -0.25f; this->flareMatrix[11] = 0.15f;
+  this->flareMatrix[12] = -1.82f; this->flareMatrix[13] = 0.25f;
 
   this->lightSource = (LightManager::getInstance())->getLight(0);
@@ -178 +178 @@
   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->screenCenter - this->flares[0]->getAbsCoor2D();
+  this->flareVector = this->flares[0]->getAbsCoor2D() - this->screenCenter;
+  this->flareVector.z = 0.0f;
   this->distance = this->flareVector.len();
   this->flareVector.normalize();
@@ -190 +191 @@
     if( i == 0)
       continue;
+    PRINTF(0)("calculus: (%f %f %f) * %f * %f\n", this->flareVector.x, this->flareVector.y, this->flareVector.z, this->flareMatrix[i * 2], this->distance);
     (*it)->setAbsCoor2D( this->screenCenter + this->flareVector * this->flareMatrix[i * 2] * this->distance);
+    (*it)->setSize2D(50.0f * this->flareMatrix[i * 2 + 1], 50.0f * this->flareMatrix[i * 2 + 1]);
     PRINTF(5)("Tick flare %i @ (%f, %f)\n", i, (*it)->getAbsCoor2D().x, (*it)->getAbsCoor2D().y);
     // tick them

trunk/src/lib/graphics/graphics_engine.cc

@@ -176 +176 @@
   this->loadGraphicsEffect(ge);
 
+  ge->addFlare("pictures/lense_flare/lens1.png"); //sun
+  ge->addFlare("pictures/lense_flare/lens2.png"); //first halo
+  ge->addFlare("pictures/lense_flare/lens1.png"); //small birst
+  ge->addFlare("pictures/lense_flare/lens3.png"); //second halo
+  ge->addFlare("pictures/lense_flare/lens4.png");
   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();