Changeset 7015 in orxonox.OLD for trunk/src/lib

Timestamp:

Feb 3, 2006, 2:42:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flare work

Location:

trunk/src/lib/graphics/effects

Files:

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

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

@@ -61 +61 @@
   PRINTF(0)("light is: %p\n", this->lightSource);
 
+  this->isVisible = true;
+
   if (root != NULL)
   {
@@ -66 +68 @@
     this->activate();
   }
+
+  this->setSourceVisibility(false);
+  this->isVisible = true;
+
 }
 
@@ -165 +171 @@
 
 
-bool LenseFlare::sourceVisible() const
-{
+void LenseFlare::setSourceVisibility(bool visibility)
+{
+  if (this->isVisible == visibility)
+    return;
 
   float dist = this->frustumPlane.distancePoint(this->lightSource->getAbsCoor());
-  if( dist < 0.0f)
-  {
-    std::vector<Billboard*>::const_iterator it = flares.begin(); it++;
-    for(; it != flares.end(); it++)
-      (*it)->setVisibility(true);
-    return true;
-  }
-
-  std::vector<Billboard*>::const_iterator it = flares.begin(); it++;
-  for(; it != flares.end(); it++)
-    (*it)->setVisibility(false);
-
-  return false;
+  PRINTF(0)("dist: %f\n", dist);
+  std::vector<Billboard*>::const_iterator it;
+    for(it = flares.begin(); it != flares.end(); it++)
+      (*it)->setVisibility(visibility);
+  this->isVisible = visibility;
 }
 
@@ -202 +202 @@
 
     //set the frustum plane
-  Vector psTarget = (State::getCameraTargetNode())->getAbsCoor();
-  Vector psCamera = (State::getCameraNode())->getAbsCoor();
-  Vector psCameraDir = psCamera - psTarget;
-  //PRINTF(0)("camera Dir: %f %f %f, camera: %f %f %f\n", psCameraDir.x, psCameraDir.y, psCameraDir.z, psCamera.x, psCamera.y, psCamera.z);
-  this->frustumPlane = Plane(psCameraDir, Vector(-70.0,0.0,0.0));
+
+  this->frustumPlane = State::getCamera()->getViewFrustum();
+
+  if (State::getCamera()->distance(lightSource) < 0)
+    this->setSourceVisibility(false);
+  else
+    this->setSourceVisibility(true);
 
 
   // 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->screenCenter;
@@ -242 +245 @@
   if( !this->bActivated)
     return;
-
-  this->sourceVisible();
-}
+}

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

@@ -44 +44 @@
   private:
     GLint charToFogMode(const char* mode);
-    bool sourceVisible() const;
+    void setSourceVisibility(bool visibility) ;
 
 
   private:
+    float                    isVisible;          //!< Checks visibility
     Light*                   lightSource;        //!< reference to the sun (or primary light source)
     std::vector<Billboard*>  flares;             //!< the flares array