Changeset 8457 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/lense_flare.cc

Timestamp:

Jun 15, 2006, 1:43:24 PM (18 years ago)

Author:

amaechler

Message:

atmospheric: void etc bugfixes

File:

• branches/atmospheric_engine/src/lib/graphics/effects/lense_flare.cc (modified) (10 diffs)

branches/atmospheric_engine/src/lib/graphics/effects/lense_flare.cc

@@ -44 +44 @@
  * @param root The XML-element to load the LenseFlare from
  */
- LenseFlare::LenseFlare(const TiXmlElement* root)
-{
-  this->setClassID(CL_LENSE_FLARE, "LenseFlare");
-
-  this->flareMatrix = new float[14];
-  /*          length                      image scale */
-  this->flareMatrix[0] = 1.0f; this->flareMatrix[1] = 1.0f;
-  this->flareMatrix[2] = 0.5f; this->flareMatrix[3] = 0.5f;
-  this->flareMatrix[4] = 0.33f; this->flareMatrix[5] = 0.25f;
-  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.15f;
-  this->flareMatrix[12] = -1.82f; this->flareMatrix[13] = 0.25f;
-
-  this->lightSource = (LightManager::getInstance())->getLight(0);
-  PRINTF(0)("light is: %p\n", this->lightSource);
-
-  if (root != NULL)
-  {
-    this->loadParams(root);
-    this->activate();
-  }
-
-  this->bVisible = true;
-  this->setSourceVisibility(false);
+LenseFlare::LenseFlare(const TiXmlElement* root) {
+    this->setClassID(CL_LENSE_FLARE, "LenseFlare");
+
+    this->flareMatrix = new float[14];
+    /*          length                      image scale */
+    this->flareMatrix[0] = 1.0f;
+    this->flareMatrix[1] = 1.0f;
+    this->flareMatrix[2] = 0.5f;
+    this->flareMatrix[3] = 0.5f;
+    this->flareMatrix[4] = 0.33f;
+    this->flareMatrix[5] = 0.25f;
+    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.15f;
+    this->flareMatrix[12] = -1.82f;
+    this->flareMatrix[13] = 0.25f;
+
+    this->lightSource = (LightManager::getInstance())->getLight(0);
+    PRINTF(0)("light is: %p\n", this->lightSource);
+
+    if (root != NULL) {
+        this->loadParams(root);
+        this->activate();
+    }
+
+    this->bVisible = true;
+    this->setSourceVisibility(false);
 
 }
@@ -76 +81 @@
  *  destroys a LenseFlare
  */
-LenseFlare::~LenseFlare()
-{
-  std::vector<ImagePlane*>::iterator it;
-  for( it = flares.begin(); it != flares.end(); it++)
-    delete (*it);
+LenseFlare::~LenseFlare() {
+    std::vector<ImagePlane*>::iterator it;
+    for( it = flares.begin(); it != flares.end(); it++)
+        delete (*it);
 }
 
@@ -87 +91 @@
  * @param root The XML-element to load the LenseFlare from
  */
-void LenseFlare::loadParams(const TiXmlElement* root)
-{
-  GraphicsEffect::loadParams(root);
-
-  LOAD_PARAM_START_CYCLE(root, element);
-  {
-    LoadParam_CYCLE(element, "add-flare-texture", this, LenseFlare, addFlare)
+void LenseFlare::loadParams(const TiXmlElement* root) {
+    GraphicsEffect::loadParams(root);
+
+    LOAD_PARAM_START_CYCLE(root, element);
+    {
+        LoadParam_CYCLE(element, "add-flare-texture", this, LenseFlare, addFlare)
         .describe("adds a lensflare texture to the engine");
-  }
-  LOAD_PARAM_END_CYCLE(element);
+    }
+    LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -103 +106 @@
  * initializes the fog effect
  */
-bool LenseFlare::init()
-{}
+void LenseFlare::init() {}
 
 
@@ -110 +112 @@
  * activates the fog effect
  */
-bool LenseFlare::activate()
-{
-  this->bActivated = true;
+void LenseFlare::activate() {
+    this->bActivated = true;
 }
 
@@ -119 +120 @@
  * deactivates the fog effect
  */
-bool LenseFlare::deactivate()
-{
-  this->bActivated = false;
+void LenseFlare::deactivate() {
+    this->bActivated = false;
 }
 
@@ -129 +129 @@
  * @param mode the mode character
  */
-GLint LenseFlare::stringToFogMode(const std::string& mode)
-{}
+GLint LenseFlare::stringToFogMode(const std::string& mode) {
+    return 0;
+}
 
 
@@ -145 +146 @@
  *  7th: Texture of the third burst
  */
-void LenseFlare::addFlare(const std::string& textureName)
-{
-  if( this->flares.size() > LF_MAX_FLARES)
-  {
-    PRINTF(2)("You tried to add more than %i lense flares, ignoring\n", LF_MAX_FLARES);
-    return;
-  }
-
-  ImagePlane* bb = new ImagePlane(NULL);
-  if (this->flares.empty())
-    bb->setLayer(E2D_LAYER_BELOW_ALL);
-  bb->setTexture(textureName);
-  bb->setSize(50, 50);
-  this->flares.push_back(bb);
-  bb->setVisibility(true);
-
-  PRINTF(4)("Added a Lenseflare ImagePlane with texture %s\n", textureName.c_str());
-
-  // the first flare belongs to the light source
-  if( this->flares.size() == 1 && this->lightSource != NULL)
-  {
-    bb->setBindNode(static_cast<PNode*>(this->lightSource));
-  }
-
-  PRINTF(4)("Finished adding\n");
-}
-
-
-void LenseFlare::setSourceVisibility(bool visibility)
-{
-   if (this->bVisible == visibility)
-     return;
-
-  std::vector<ImagePlane*>::const_iterator it;
+void LenseFlare::addFlare(const std::string& textureName) {
+    if( this->flares.size() > LF_MAX_FLARES) {
+        PRINTF(2)("You tried to add more than %i lense flares, ignoring\n", LF_MAX_FLARES);
+        return;
+    }
+
+    ImagePlane* bb = new ImagePlane(NULL);
+    if (this->flares.empty())
+        bb->setLayer(E2D_LAYER_BELOW_ALL);
+    bb->setTexture(textureName);
+    bb->setSize(50, 50);
+    this->flares.push_back(bb);
+    bb->setVisibility(true);
+
+    PRINTF(4)("Added a Lenseflare ImagePlane with texture %s\n", textureName.c_str());
+
+    // the first flare belongs to the light source
+    if( this->flares.size() == 1 && this->lightSource != NULL) {
+        bb->setBindNode(static_cast<PNode*>(this->lightSource));
+    }
+
+    PRINTF(4)("Finished adding\n");
+}
+
+
+void LenseFlare::setSourceVisibility(bool visibility) {
+    if (this->bVisible == visibility)
+        return;
+
+    std::vector<ImagePlane*>::const_iterator it;
     for(it = ++flares.begin(); it != flares.end(); it++)
-      (*it)->setVisibility(visibility);
-  this->bVisible = visibility;
+        (*it)->setVisibility(visibility);
+    this->bVisible = visibility;
 }
 
@@ -188 +185 @@
  * tick the effect
  */
-void LenseFlare::tick(float dt)
-{
-  if( unlikely(!this->bActivated || this->flares.size() == 0))
-    return;
-
-  // refetch light source information if needed
-  if( unlikely( this->lightSource == NULL))
-  {
-    this->lightSource = (LightManager::getInstance())->getLight(0);
-    if( this->flares.size() > 0)
-      this->flares[0]->setBindNode(static_cast<PNode*>(this->lightSource));
-  }
+void LenseFlare::tick(float dt) {
+    if( unlikely(!this->bActivated || this->flares.size() == 0))
+        return;
+
+    // refetch light source information if needed
+    if( unlikely( this->lightSource == NULL)) {
+        this->lightSource = (LightManager::getInstance())->getLight(0);
+        if( this->flares.size() > 0)
+            this->flares[0]->setBindNode(static_cast<PNode*>(this->lightSource));
+    }
 
     //set the frustum plane
-  if (!flares.empty())
-    this->setSourceVisibility(this->flares[0]->isVisible());
-
-
-  // always update the screen center, it could be, that the window is resized
-  this->screenCenter = Vector2D(State::getResX()/2.0f, State::getResY()/2.0f);
-
-  // flare vector is the direction from the center to the light source
-  this->flareVector = this->flares[0]->getAbsCoor2D() - this->screenCenter;
-  this->distance = this->flareVector.len();
-  this->flareVector.normalize();
-
-  // now calculate the new coordinates of the billboards
-  std::vector<ImagePlane*>::iterator it;
-  int i;
-  for( it = flares.begin(), i = 0; it != flares.end(); it++, i++)
-  {
-    // set the new position
-    if( i == 0)
-      continue;
-
-    (*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);
-  }
+    if (!flares.empty())
+        this->setSourceVisibility(this->flares[0]->isVisible());
+
+
+    // always update the screen center, it could be, that the window is resized
+    this->screenCenter = Vector2D(State::getResX()/2.0f, State::getResY()/2.0f);
+
+    // flare vector is the direction from the center to the light source
+    this->flareVector = this->flares[0]->getAbsCoor2D() - this->screenCenter;
+    this->distance = this->flareVector.len();
+    this->flareVector.normalize();
+
+    // now calculate the new coordinates of the billboards
+    std::vector<ImagePlane*>::iterator it;
+    int i;
+    for( it = flares.begin(), i = 0; it != flares.end(); it++, i++) {
+        // set the new position
+        if( i == 0)
+            continue;
+
+        (*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);
+    }
 }
 
@@ -233 +227 @@
  * draws the LenseFlares
  */
-void LenseFlare::draw() const
-{
-  if( !this->bActivated)
-    return;
-}
+void LenseFlare::draw() const {
+    if( !this->bActivated)
+        return;
+}