Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/lib

Timestamp:

May 27, 2005, 7:14:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

Location:

orxonox/branches/physics/src/lib

Files:

• coord/helper_parent.cc (modified) (1 diff)
• coord/p_node.h (modified) (1 diff)
• coord/pilot_node.cc (copied) (copied from orxonox/trunk/src/lib/coord/pilot_node.cc)
• coord/pilot_node.h (copied) (copied from orxonox/trunk/src/lib/coord/pilot_node.h)
• 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_entity.cc (deleted)
• lang/base_entity.h (deleted)
• lang/base_object.cc (modified) (3 diffs)
• lang/base_object.h (modified) (3 diffs)

orxonox/branches/physics/src/lib/coord/helper_parent.cc

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

orxonox/branches/physics/src/lib/coord/p_node.h

@@ -93 +93 @@
   const char* getName ();
 
-
   void debug ();
 

orxonox/branches/physics/src/lib/graphics/graphics_engine.cc

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

orxonox/branches/physics/src/lib/graphics/light.cc

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

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

@@ -30 +30 @@
                   float velocity)
 {
-   this->setClassName ("ParticleEmitter");
+   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
 
    this->type = EMITTER_DOT;

orxonox/branches/physics/src/lib/graphics/particles/particle_engine.cc

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

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

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

orxonox/branches/physics/src/lib/graphics/text_engine.cc

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

orxonox/branches/physics/src/lib/lang/base_object.cc

@@ -30 +30 @@
 {
   this->className = NULL;
+  this->id = -1;
   this->finalized = false;
 }
@@ -42 +43 @@
 }
 
-void BaseObject::setClassName (const char* className)
+
+/**
+   \brief sets the class identifiers
+   \param a number for the class from class_list.h enumeration
+   \param the class name
+*/
+void BaseObject::setClassID(int id, const char* className)
+{
+  this->id = id;
+  this->className = className;
+}
+
+
+/**
+   \brief sets the class identifier
+   \param a number for the class from class_list.h enumeration
+*/
+void BaseObject::setClassID (int id)
+{
+  this->id = id;
+}
+
+
+/**
+   \brief sets the class identifiers
+   \param the class name
+*/
+void BaseObject::setClassName(const char* className)
 {
   this->className = className;
 }
 
+
+/**
+   \brief sets the class identifiers
+   \param a number for the class from class_list.h enumeration
+   \param the class name
+*/
 bool BaseObject::isA (char* className)
 {
@@ -54 +88 @@
 }
 
+
 /*
-bool BaseObject::isFinalized()
-{
-  
-}
+  \brief this finalizes an object and makes it ready to be garbage collected
 */
-
 void BaseObject::finalize()
 {

orxonox/branches/physics/src/lib/lang/base_object.h

@@ -9 +9 @@
 
 #include "stdincl.h"
-
+#include "class_list.h"
 
 class BaseObject {
@@ -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 this->className;};
+  inline int getClassID(void) const { return this->id; }
   bool isA (char* className);
 
@@ -25 +29 @@
 
  private:
-  const char* className;
-  bool finalized;
+  const char*    className;                       //!< the name of the class 
+  int            id;                              //!< this is the id from the class_list.h enumeration
+  bool           finalized;                       //!< is true if the object is ready to be garbage collected
 };