Changeset 4320 in orxonox.OLD

Timestamp:

May 27, 2005, 1:13:42 AM (19 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

Files:

• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• lib/coord/helper_parent.cc (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/light.cc (modified) (2 diffs)
• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_engine.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (1 diff)
• proto/proto_class.cc (modified) (1 diff)
• proto/proto_singleton.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/animation/animation_player.cc (modified) (1 diff)
• util/garbage_collector.cc (modified) (1 diff)
• util/object_manager.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• util/track/track_manager.cc (modified) (1 diff)
• util/track/track_node.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (2 diffs)
• world_entities/character_attributes.cc (modified) (1 diff)
• world_entities/satellite.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -88 +88 @@
 void GLMenuImageScreen::init ()
 {
-  this->setClassID(CL_GLMENU_IMAGE_SCREEN);
+  this->setClassID(CL_GLMENU_IMAGE_SCREEN, "GLMenuImageScreen");
 
   // Select Our VU Meter Background Texture

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);

orxonox/trunk/src/proto/proto_class.cc

@@ -27 +27 @@
 ProtoClass::ProtoClass () 
 {
-   this->setClassName ("ProtoClass");
+   this->setClassID(CL_PROTO_ID, "ProtoClass"); 
+
+   /* If you make a new class, what is most probably the case when you write this file
+      don't forget to:
+       1. Add the new file new_class.cc to the ./src/Makefile.am
+       2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
+
+      Advanced Topics:
+      - if you want to let your object be managed via the ObjectManager make sure to read
+        the object_manager.h header comments. You will use this most certanly only if you
+        make many objects of your class, like a weapon bullet.
+   */
 }
 

orxonox/trunk/src/proto/proto_singleton.cc

@@ -26 +26 @@
 ProtoSingleton::ProtoSingleton () 
 {
-   this->setClassName ("ProtoSingleton");
+   this->setClassName("ProtoSingleton");
+   this->setClassID(CL_PROTO_ID, "ProtoSingleton"); 
 
+   /* If you make a new class, what is most probably the case when you write this file
+      don't forget to:
+       1. Add the new file new_class.cc to the ./src/Makefile.am
+       2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
+
+      Advanced Topics:
+      - if you want to let your object be managed via the ObjectManager make sure to read
+        the object_manager.h header comments. You will use this most certanly only if you
+        make many objects of your class, like a weapon bullet.
+   */
 }
 

orxonox/trunk/src/story_entities/world.cc

@@ -196 +196 @@
 void World::constuctorInit(char* name, int worldID)
 {
-  this->setClassID(CL_WORLD);
+  this->setClassID(CL_WORLD, "World");
 
   //this->worldName = name;

orxonox/trunk/src/util/animation/animation_player.cc

@@ -28 +28 @@
 AnimationPlayer::AnimationPlayer () 
 {
-   this->setClassID(CL_ANIMATION_PLAYER);
+   this->setClassID(CL_ANIMATION_PLAYER, "AnimationPlayer");
 
    this->animationList = new tList<Animation>();

orxonox/trunk/src/util/garbage_collector.cc

@@ -38 +38 @@
 GarbageCollector::GarbageCollector () 
 {
-   this->setClassID(CL_GARBAGE_COLLECTOR);
+   this->setClassID(CL_GARBAGE_COLLECTOR, "GarbageCollector");
    this->time = 0;
    this->delay = 1.5f; /* clean up all 5.0 seconds */

orxonox/trunk/src/util/object_manager.cc

@@ -29 +29 @@
 ObjectManager::ObjectManager () 
 {
-  this->setClassID(CL_OBJECT_MANAGER);
+  this->setClassID(CL_OBJECT_MANAGER, "ObjectManager");
   
   this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];

orxonox/trunk/src/util/resource_manager.cc

@@ -38 +38 @@
 ResourceManager::ResourceManager () 
 {
-   this->setClassID(CL_RESOURCE_MANAGER);
+   this->setClassID(CL_RESOURCE_MANAGER, "ResourceManager");
    this->dataDir = NULL;
    this->setDataDir("./");

orxonox/trunk/src/util/track/track_manager.cc

@@ -370 +370 @@
 TrackManager::TrackManager(void)
 {
-  this->setClassID(CL_TRACK_MANAGER);
-  
+  this->setClassID(CL_TRACK_MANAGER, "TrackManager");
   
   TrackManager::singletonRef = this; // do this because otherwise the TrackNode cannot get The instance of the TrackManager

orxonox/trunk/src/util/track/track_node.cc

@@ -32 +32 @@
 TrackNode::TrackNode () 
 {
-  this->setClassID(CL_TRACK_NODE);
+  this->setClassID(CL_TRACK_NODE, "TrackNode");
   this->setName("TrackNode"); /* absolete but still used... */
 

orxonox/trunk/src/world_entities/camera.cc

@@ -33 +33 @@
 Camera::Camera(void)
 {
-  this->setClassID(CL_CAMERA);
+  this->setClassID(CL_CAMERA, "Camera");
   this->target = new CameraTarget();
 
@@ -190 +190 @@
 CameraTarget::CameraTarget()
 {
-  this->setClassID(CL_CAMERA_TARGET);
+  this->setClassID(CL_CAMERA_TARGET, "CameraTarget");
   this->setMode(PNODE_MOVEMENT);
 }

orxonox/trunk/src/world_entities/character_attributes.cc

@@ -29 +29 @@
 CharacterAttributes::CharacterAttributes () 
 {
-   this->setClassID(CL_CHARACTER_ATTRIBUTES);
+   this->setClassID(CL_CHARACTER_ATTRIBUTES, "CharacterAttributes");
 }
 

orxonox/trunk/src/world_entities/satellite.cc

@@ -31 +31 @@
 Satellite::Satellite (Vector axis, float speed)
 {
-  this->setClassID(CL_SATELLITE);
+  this->setClassID(CL_SATELLITE, "Satellite");
   this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
   this->speed = speed;

orxonox/trunk/src/world_entities/skybox.cc

@@ -62 +62 @@
 void SkyBox::preInit(void)
 {
-  this->setClassID(CL_SKYBOX);
+  this->setClassID(CL_SKYBOX, "SkyBox");
   this->skyModel = NULL;
   this->material = new Material*[6];

orxonox/trunk/src/world_entities/terrain.cc

@@ -77 +77 @@
 void Terrain::init(void)
 {
-  this->setClassID(CL_TERRAIN);
+  this->setClassID(CL_TERRAIN, "Terrain");
   this->objectList = 0;
 }

orxonox/trunk/src/world_entities/test_entity.cc

@@ -28 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {  
+  this->setClassID(CL_TEST_ENTITY, "TestEntity");
   this->md2Model = new MD2Model();
   this->md2Model->loadModel(ResourceManager::getFullName("models/tris.md2"));

orxonox/trunk/src/world_entities/test_gun.cc

@@ -45 +45 @@
   :  Weapon (parent, coordinate, direction) 
 {
+  this->setClassID(CL_TEST_GUN, "TestGun");
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
   this->idleTime = 0.2f;

orxonox/trunk/src/world_entities/world_entity.cc

@@ -30 +30 @@
 WorldEntity::WorldEntity(const TiXmlElement* root)
 {
-  this->setClassID(CL_WORLD_ENTITY);
+  this->setClassID(CL_WORLD_ENTITY, "WorldEntity");
   this->model = NULL;