Changeset 6889 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Jan 31, 2006, 1:21:29 PM (18 years ago)

Author:

patrick

Message:

trunk: lenseflare is not drawn if behind the camera

Location:

trunk/src/lib/graphics

Files:

• effects/lense_flare.cc (modified) (6 diffs)
• effects/lense_flare.h (modified) (2 diffs)
• render2D/billboard.cc (modified) (1 diff)

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

@@ -31 +31 @@
 
 #include "light.h"
+#include "camera.h"
 
 using namespace std;
@@ -147 +148 @@
   {
     bb->setBindNode(static_cast<PNode*>(this->lightSource));
+    bb->setVisibility(true);
   }
 }
@@ -154 +156 @@
 {
 
-  return true;
+  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;
 }
 
@@ -173 +188 @@
       this->flares[0]->setBindNode(static_cast<PNode*>(this->lightSource));
   }
+
+    //set the frustum plane
+  Vector psTarget = (State::getCameraTarget())->getAbsCoor();
+  Vector psCamera = (State::getCamera())->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));
 
 
@@ -191 +213 @@
     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]);
@@ -209 +231 @@
     return;
 
-  if( !this->sourceVisible())
-    return;
-
-  std::vector<Billboard*>::const_iterator it;
-  for( it = flares.begin(); it != flares.end(); it++)
-    (*it)->draw();
-}
+  this->sourceVisible();
+}

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

@@ -12 +12 @@
 
 #include "vector.h"
+#include "plane.h"
 
 
@@ -55 +56 @@
 
     float*                   flareMatrix;
+    Plane                    frustumPlane;       //!< plane that marks the view frustum
 };
 

trunk/src/lib/graphics/render2D/billboard.cc

@@ -149 +149 @@
 void Billboard::draw() const
 {
+  if( !this->isVisible())
+    return;
+
   glPushMatrix();