Changeset 6980 in orxonox.OLD

Timestamp:

Feb 2, 2006, 1:57:21 PM (18 years ago)

Author:

patrick

Message:

trunk: lenseflares loadable

Location:

trunk/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (5 diffs)
• lib/graphics/effects/lense_flare.cc (modified) (4 diffs)
• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (1 diff)

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

@@ -37 +37 @@
  FogEffect::FogEffect(const TiXmlElement* root)
 {
-  PRINTF(0)("Fog Effect Created\n");
   this->setClassID(CL_FOG_EFFECT, "FogEffect");
 
@@ -44 +43 @@
   this->fogStart = 10.0f;
   this->fogEnd = 1000.0f;
-
 
   if (root != NULL)
@@ -55 +53 @@
  */
 FogEffect::~FogEffect()
-{}
+{
+  this->deactivate();
+}
 
 
@@ -63 +63 @@
 void FogEffect::loadParams(const TiXmlElement* root)
 {
-  PRINTF(0)(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.loadParms\n\n");
-
   GraphicsEffect::loadParams(root);
 
-   LoadParam(root, "fog-mode", this, FogEffect, setFogMode)
-       .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
 
-   LoadParam(root, "fog-density", this, FogEffect, setFogDensity)
-       .describe("sets the the fog density of the exponentionl functions");
+  LoadParam(root, "fog-mode", this, FogEffect, setFogMode)
+      .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
 
-   LoadParam(root, "fog-range", this, FogEffect, setFogRange)
-       .describe("sets the the range of the linear functions");
+  LoadParam(root, "fog-density", this, FogEffect, setFogDensity)
+      .describe("sets the the fog density of the exponentionl functions");
+
+  LoadParam(root, "fog-range", this, FogEffect, setFogRange)
+      .describe("sets the the range of the linear functions");
 }
 
@@ -90 +89 @@
 bool FogEffect::activate()
 {
-  printf("fog==============================================>>>>>>>>>>>>>>>>>>>>>>>>...\n\n");
   PRINTF(4)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity,
              this->fogStart, this->fogEnd);

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

@@ -46 +46 @@
  LenseFlare::LenseFlare(const TiXmlElement* root)
 {
-  if (root != NULL)
-    this->loadParams(root);
+  this->setClassID(CL_LENSE_FLARE, "LenseFlare");
 
   this->flareMatrix = new float[14];
@@ -60 +59 @@
 
   this->lightSource = (LightManager::getInstance())->getLight(0);
+  PRINTF(0)("light is: %p\n", this->lightSource);
+
+  if (root != NULL)
+  {
+    this->loadParams(root);
+    this->activate();
+  }
 }
 
@@ -81 +87 @@
   GraphicsEffect::loadParams(root);
 
-    LoadParam(root, "add-flare-texture", this, LenseFlare, addFlare)
+  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);
+}
 
 /**
@@ -151 +160 @@
     bb->setVisibility(true);
   }
+  PRINTF(0)("Finished adding\n", textureName);
 }
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -133 +133 @@
   .describe("loads a graphics effect");
 }
+
+
+
+
+/**
+ * @param root The XML-element to load GraphicsEffects from
+ */
+void GraphicsEngine::loadGraphicsEffects(const TiXmlElement* root)
+{
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    PRINTF(0)("element is: %s\n", element->Value());
+    Factory::fabricate(element);
+  }
+  LOAD_PARAM_END_CYCLE(element);
+}
+
 
 
@@ -711 +728 @@
   }
 }
-
-
-/**
- * @param root The XML-element to load GraphicsEffects from
- */
-void GraphicsEngine::loadGraphicsEffects(const TiXmlElement* root)
-{
-  LOAD_PARAM_START_CYCLE(root, element);
-  {
-    PRINTF(0)("element is: %s\n", element->Value());
-    Factory::fabricate(element);
-  }
-  LOAD_PARAM_END_CYCLE(element);
-}

trunk/src/story_entities/simple_game_menu.cc

@@ -199 +199 @@
     }
   }
-  this->menuSelected->getNullElement()->update2D(0.0f);
+  this->menuSelected->getNullElement()->update2D(0.1f);
   this->menuSelectedIndex = 0;
   this->menuSelected = this->menuLayer[0]->menuList[this->menuSelectedIndex];