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

Timestamp:

May 24, 2006, 11:34:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Ok the Element2D-renderer works, and hides Elements, that are behind the Camera

Location:

trunk/src/lib/graphics

Files:

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

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

@@ -61 +61 @@
   PRINTF(0)("light is: %p\n", this->lightSource);
 
-  this->isVisible = true;
-
   if (root != NULL)
   {
@@ -69 +67 @@
   }
 
+  this->bVisible = true;
   this->setSourceVisibility(false);
-  this->isVisible = true;
 
 }
@@ -161 +159 @@
   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());
 
@@ -167 +167 @@
   {
     bb->setBindNode(static_cast<PNode*>(this->lightSource));
-    bb->setVisibility(true);
   }
 
@@ -176 +175 @@
 void LenseFlare::setSourceVisibility(bool visibility)
 {
-//   if (this->isVisible == visibility)
-//     return;
-
-  float dist = this->frustumPlane.distancePoint(this->lightSource->getAbsCoor());
-  PRINTF(0)("dist: %f\n", dist);
+   if (this->bVisible == visibility)
+     return;
+
   std::vector<ImagePlane*>::const_iterator it;
-    for(it = flares.begin(); it != flares.end(); it++)
+    for(it = ++flares.begin(); it != flares.end(); it++)
       (*it)->setVisibility(visibility);
-  this->isVisible = visibility;
+  this->bVisible = visibility;
 }
 
@@ -205 +202 @@
 
     //set the frustum plane
-
-//   this->frustumPlane = State::getCamera()->getViewFrustum();
-//
-//   if (State::getCamera()->distance(lightSource) < 0)
-//     this->setSourceVisibility(false);
-//   else
-//     this->setSourceVisibility(true);
+  if (!flares.empty())
+    this->setSourceVisibility(this->flares[0]->isVisible());
 
 

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

@@ -48 +48 @@
 
   private:
-    float                    isVisible;          //!< Checks visibility
+    bool                     bVisible;          //!< Checks visibility
     Light*                   lightSource;        //!< reference to the sun (or primary light source)
     std::vector<ImagePlane*>  flares;             //!< the flares array

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

@@ -883 +883 @@
       {
         this->bCurrentlyVisible = true;
-        printf("OK \n");
       }
 
@@ -1034 +1033 @@
 void Element2D::draw2D(E2D_LAYER from, E2D_LAYER to) const
 {
-  if (this->bVisible && this->bCurrentlyVisible)
+  if (this->isVisible())
     this->draw();
   if (this->children.size() > 0)