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

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/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• light.cc (modified) (2 diffs)
• particles/particle_emitter.cc (modified) (1 diff)
• particles/particle_engine.cc (modified) (1 diff)
• particles/particle_system.cc (modified) (1 diff)
• text_engine.cc (modified) (2 diffs)

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