Changeset 6884 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2006, 3:28:26 AM (19 years ago)

Author:

patrick

Message:

trunk: working on the lenseflare

Location:

trunk/src

Files:

• lib/graphics/effects/lense_flare.cc (modified) (6 diffs)
• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/light.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)

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

@@ -29 +29 @@
 
 #include "render2D/billboard.h"
+
+#include "light.h"
 
 using namespace std;
@@ -54 +56 @@
   this->flareMatrix[10] = -0.25f; this->flareMatrix[11] = 0.25f;
   this->flareMatrix[12] = 1.82f; this->flareMatrix[13] = 0.25f;
+
+  this->lightSource = (LightManager::getInstance())->getLight(0);
 }
 
@@ -127 +131 @@
 void LenseFlare::addFlare(const char* textureName)
 {
-  if( this->flares.size() < LF_MAX_FLARES)
+  if( this->flares.size() > LF_MAX_FLARES)
   {
     PRINTF(2)("You tried to add more than %i lense flares, ignoring\n", LF_MAX_FLARES);
@@ -154 +158 @@
   if( unlikely(!this->bActivated || this->flares.size() == 0))
     return;
+
+  if( unlikely( this->lightSource == NULL))
+    this->lightSource = (LightManager::getInstance())->getLight(0);
+  else
+    this->lightSource->debug();
+
   // 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);
@@ -160 +170 @@
   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
@@ -168 +180 @@
     // set the new position
     (*it)->setAbsCoor2D(this->flareVector * this->flareMatrix[i * 2]);
-    PRINTF(0)("Drawing flare %i @ (%f, %f)\n", i, (this->flareVector * this->flareMatrix[i * 2]).x, (this->flareVector * this->flareMatrix[i * 2]).y);
+    PRINTF(0)("Tick flare %i @ (%f, %f)\n", i, (*it)->getAbsCoor2D().x, (*it)->getAbsCoor2D().y);
     // tick them
     (*it)->tick(dt);

trunk/src/lib/graphics/graphics_engine.cc

@@ -38 +38 @@
 #include "effects/graphics_effect.h"
 #include "effects/fog_effect.h"
+#include "effects/lense_flare.h"
 
 #include "shell_command.h"
@@ -171 +172 @@
 //   fe->activate();
 //   PRINTF(0)("--------------------------------------------------------------\n");
+
+  LenseFlare* ge = new LenseFlare();
+  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->activate();
 }
 
@@ -610 +622 @@
   Shader::restoreShader();
 
-  //draw the graphics
+  //draw the graphics effects
   list<GraphicsEffect*>::const_iterator it;
   for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)

trunk/src/lib/graphics/light.cc

@@ -337 +337 @@
 }
 
+
+Light* LightManager::getLight(int lightNumber) const
+{
+  if( lightNumber < NUMBEROFLIGHTS)
+    return this->lights[lightNumber];
+
+  return NULL;
+}
+
 /**
  *  draws all the Lights in their appropriate position

trunk/src/story_entities/simple_game_menu.cc

@@ -230 +230 @@
       ie->setBindNode((const PNode*)NULL);
       ie->setRelCoor2D(State::getResX() / 2.0f + 250.0f, State::getResY() / 2.0f, 0.0f);
-      ie->setSize2D(100.0f, 75.0f);
+      ie->setSize2D(140.0f, 105.0f);
       this->menuLayer[1]->screenshootList.push_back(ie);
     }