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

Timestamp:

May 27, 2005, 1:13:42 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now string name of a class works parallel to the int id representation and is only used for documentation purposes

Location:

orxonox/trunk/src/lib

Files:

• coord/helper_parent.cc (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (1 diff)
• graphics/light.cc (modified) (2 diffs)
• graphics/particles/particle_emitter.cc (modified) (1 diff)
• graphics/particles/particle_engine.cc (modified) (1 diff)
• graphics/particles/particle_system.cc (modified) (1 diff)
• graphics/text_engine.cc (modified) (2 diffs)
• lang/base_object.cc (modified) (2 diffs)
• lang/base_object.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/helper_parent.cc

@@ -30 +30 @@
 HelperParent::HelperParent () 
 {
-   this->setClassID(CL_HELPER_PARENT);
+   this->setClassID(CL_HELPER_PARENT, "HelperParent");
 }
 

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

@@ -34 +34 @@
   this->minFPS = 9999;
   this->maxFPS = 0;
-  this->setClassID(CL_GRAPHICS_ENGINE);
+  this->setClassID(CL_GRAPHICS_ENGINE, "GraphicsEngine");
 
   this->fullscreen = false;

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

@@ -34 +34 @@
 Light::Light(int lightNumber)
 {
-  this->setClassID(CL_LIGHT);
+  this->setClassID(CL_LIGHT, "Light");
   char tmpName[7];
   sprintf(tmpName, "Light%d", lightNumber);
@@ -205 +205 @@
 LightManager::LightManager () 
 {
-  this->setClassID(CL_LIGHT_MANAGER);
+  this->setClassID(CL_LIGHT_MANAGER, "LightManager");
 
   glEnable (GL_LIGHTING);

orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc

@@ -30 +30 @@
                   float velocity)
 {
-   this->setClassID(CL_PARTICLE_EMITTER);
+   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
    this->direction = direction;
    this->setSpread(angle);

orxonox/trunk/src/lib/graphics/particles/particle_engine.cc

@@ -30 +30 @@
 ParticleEngine::ParticleEngine () 
 {
-   this->setClassID(CL_PARTICLE_ENGINE);
+   this->setClassID(CL_PARTICLE_ENGINE, "ParticleEngine");
 
    this->systemList = new tList<ParticleSystem>;

orxonox/trunk/src/lib/graphics/particles/particle_system.cc

@@ -34 +34 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
-   this->setClassID(CL_PARTICLE_SYSTEM);
+   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
    this->material = NULL;
    this->name = NULL;

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

@@ -51 +51 @@
 Text::Text(Font* font, int type)
 {
-  this->setClassID(CL_TEXT);
+  this->setClassID(CL_TEXT, "Text");
 
   // initialize this Text
@@ -802 +802 @@
 TextEngine::TextEngine () 
 {
-   this->setClassID(CL_TEXT_ENGINE);
+   this->setClassID(CL_TEXT_ENGINE, "TextEngine");
    this->enableFonts();
 

orxonox/trunk/src/lib/lang/base_object.cc

@@ -42 +42 @@
 }
 
+void BaseObject::setClassID(int id, const char* className)
+{
+  this->id = id;
+  this->className = className;
+}
+
 
 void BaseObject::setClassID (int id)
@@ -48 +54 @@
 }
 
+void BaseObject::setClassName(const char* className)
+{
+  this->className = className;
+}
 
 

orxonox/trunk/src/lib/lang/base_object.h

@@ -17 +17 @@
   virtual ~BaseObject ();
 
-  //void setClassName (const char* className);
   void setClassID(int id);
+  void setClassName(const char* className);
+  void setClassID(int id, const char* className);
 
-  inline const char* getClassName(void) const { return "";};
+  inline const char* getClassName(void) const { return this->className;};
   inline int getClassID(void) const { return this->id; }
   bool isA (char* className);