Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/light.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/light.cc (modified) (4 diffs)

trunk/src/lib/graphics/light.cc

@@ -22 +22 @@
 #include "glincl.h"
 #include "vector.h"
-#include "parser/tinyxml/tinyxml.h"
-#include "util/loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 #include "util/loading/factory.h"
 #include "debug.h"
 
-CREATE_FACTORY(Light, CL_LIGHT);
+#include "class_id_DEPRECATED.h"
+
+ObjectListDefinitionID(Light, CL_LIGHT);
+CREATE_FACTORY(Light);
 
 //! Definition of the Lights and their Names
@@ -51 +53 @@
   PRINTF(4)("initializing Light number %d.\n", this->lightNumber);
 
+  this->registerObject(this, Light::_objectList);
+
   this->lightNumber = LightManager::getInstance()->registerLight(this);
 
-  this->setClassID(CL_LIGHT, "Light");
   char tmpName[10];
   sprintf(tmpName, "Light[%d]", this->lightNumber);
@@ -211 +214 @@
 ** LIGHT-MANAGER **
 ******************/
+ObjectListDefinition(LightManager);
 /**
  *  standard constructor for a Light
@@ -216 +220 @@
 LightManager::LightManager ()
 {
-  this->setClassID(CL_LIGHT_MANAGER, "LightManager");
+  this->registerObject(this, LightManager::_objectList);
 
   glEnable (GL_LIGHTING);