Changeset 6752 in orxonox.OLD

Timestamp:

Jan 26, 2006, 12:54:07 AM (18 years ago)

Author:

patrick

Message:

network: work flush, merge work

Location:

branches/network/src/lib/graphics

Files:

• effects/fog_effect.cc (modified) (1 diff)
• graphics_engine.cc (modified) (3 diffs)
• graphics_engine.h (modified) (1 diff)

branches/network/src/lib/graphics/effects/fog_effect.cc

@@ -71 +71 @@
  */
 bool FogEffect::activate()
-{}
+{
+/*  glEnable(GL_FOG);
+  {
+    GLfloat fogColor[4] = {0.5, 0.5, 1.0};
+
+    GLint fogMode = GL_EXP;
+    glFogi(GL_FOG_MODE, fogMode);
+    glFogfv(GL_FOG_COLOR, fogColor);
+    gfFogf(GL_FOG_DENSITY, 0.35f);
+
+
+  }*/
+}
 
 

branches/network/src/lib/graphics/graphics_engine.cc

@@ -655 +655 @@
       break;
   }
-
 }
 
@@ -663 +662 @@
  * @param effect the GraphicsEffect to add
  */
-void GraphicsEngine::loadGraphicsEffect(GraphicsEffect* effect)
-{}
+bool GraphicsEngine::loadGraphicsEffect(GraphicsEffect* effect)
+{
+  list<GraphicsEffect*>::iterator it;
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+    if( (*it) == effect)
+      return false;
+
+  this->graphicsEffects.push_back(effect);
+
+  return true;
+}
 
 
@@ -671 +679 @@
  * @param effect the GraphicsEffect to remove
  */
-void GraphicsEngine::unloadGraphicsEffect(GraphicsEffect* effect)
-{}
+bool GraphicsEngine::unloadGraphicsEffect(GraphicsEffect* effect)
+{
+  list<GraphicsEffect*>::iterator it;
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+  {
+    if( (*it) == effect)
+    {
+      this->graphicsEffects.erase(it);
+      return true;
+    }
+  }
+
+  return false;
+}
+

branches/network/src/lib/graphics/graphics_engine.h

@@ -83 +83 @@
     void process(const Event  &event);
 
-    void loadGraphicsEffect(GraphicsEffect* effect);
-    void unloadGraphicsEffect(GraphicsEffect* effect);
+    bool loadGraphicsEffect(GraphicsEffect* effect);
+    bool unloadGraphicsEffect(GraphicsEffect* effect);