Changeset 4737 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 30, 2005, 1:13:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: lights now register themselves at the LightManager, as it is with all other engines too

Location:

orxonox/trunk/src/lib/graphics

Files:

• light.cc (modified) (3 diffs)
• light.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/light.cc

@@ -79 +79 @@
 
 /**
- * \brief initializes a Light
- */
-void Light::init()
-{
-}
-
-/**
  * \param root The XML-element to load the Light from
  */
@@ -241 +234 @@
   glDisable(GL_LIGHTING);
 
-  // this will be done either by PNode-tree as each light is one of them
-  //  for (int i = 0; i < NUMBEROFLIGHTS; i++)
-  //    this->deleteLight(i);
+  for (int i = 0; i < NUMBEROFLIGHTS; i++)
+    if (this->lights[i])
+      delete lights[i];
   delete lights;
   LightManager::singletonRef = NULL;
@@ -315 +308 @@
     if (this->lights[i] == light)
     {
-      this->lights[i] == NULL;
+      this->lights[i] = NULL;
+      return;
     }
   }

orxonox/trunk/src/lib/graphics/light.h

@@ -29 +29 @@
   virtual ~Light(void);
 
-  void init();
   void loadParams(const TiXmlElement* root);