Changeset 9406 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/graphics

Files:

• effects/atmospheric_engine.cc (modified) (2 diffs)
• effects/cloud_effect.cc (modified) (1 diff)
• effects/fog_effect.cc (modified) (1 diff)
• effects/graphics_effect.cc (modified) (1 diff)
• effects/lense_flare.cc (modified) (1 diff)
• effects/lightning_effect.cc (modified) (2 diffs)
• effects/rain_effect.cc (modified) (1 diff)
• effects/snow_effect.cc (modified) (8 diffs)
• effects/snow_effect.h (modified) (1 diff)
• effects/sun_effect.cc (modified) (1 diff)
• effects/volfog_effect.cc (modified) (1 diff)
• effects/weather_effect.cc (modified) (1 diff)
• graphics_engine.cc (modified) (5 diffs)
• graphics_engine.h (modified) (3 diffs)
• importer/bsp_file.cc (modified) (2 diffs)
• importer/grid.cc (modified) (1 diff)
• importer/interactive_model.cc (modified) (1 diff)
• importer/material.cc (modified) (7 diffs)
• importer/md2/md2Model.cc (modified) (1 diff)
• importer/md3/md3_animation_cfg.cc (modified) (5 diffs)
• importer/model.cc (modified) (1 diff)
• importer/primitive_model.cc (modified) (1 diff)
• importer/static_model.cc (modified) (9 diffs)
• importer/texture.cc (modified) (1 diff)
• importer/texture_sequence.cc (modified) (1 diff)
• importer/vertex_array_model.cc (modified) (4 diffs)
• render2D/element_2d.cc (modified) (12 diffs)
• render2D/image_plane.cc (modified) (1 diff)
• render2D/render_2d.cc (modified) (1 diff)
• shader.cc (modified) (1 diff)
• spatial_separation/quadtree.cc (modified) (1 diff)
• spatial_separation/quadtree_node.cc (modified) (1 diff)
• spatial_separation/spatial_separation.cc (modified) (1 diff)
• text_engine/limited_width_text.cc (modified) (1 diff)
• text_engine/multi_line_text.cc (modified) (1 diff)
• text_engine/text.cc (modified) (2 diffs)
• text_engine/text_engine.cc (modified) (3 diffs)

trunk/src/lib/graphics/effects/atmospheric_engine.cc

@@ -25 +25 @@
 
 
-using namespace std;
+
 
 /**
@@ -116 +116 @@
         std::list<BaseObject*>::const_iterator it;
         for (it = weatherEffects->begin(); it != weatherEffects->end(); it++) {
-            /*      printf("%s::%s \n", (*it)->getClassName(), (*it)->getName());*/
+            /*      printf("%s::%s \n", (*it)->getClassCName(), (*it)->getName());*/
             dynamic_cast<WeatherEffect*>(*it)->tick(dt);
         }

trunk/src/lib/graphics/effects/cloud_effect.cc

@@ -40 +40 @@
 float     CloudEffect::fadeTime;
 
-using namespace std;
+
 
 SHELL_COMMAND(activate, CloudEffect, activateCloud);

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -28 +28 @@
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(FogEffect, CL_FOG_EFFECT,

trunk/src/lib/graphics/effects/graphics_effect.cc

@@ -23 +23 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/effects/lense_flare.cc

@@ -34 +34 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/effects/lightning_effect.cc

@@ -34 +34 @@
 SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(LightningEffect, CL_LIGHTNING_EFFECT,
@@ -130 +130 @@
 
     //load sound
-    if (this->thunderBuffer != NULL)
-        ResourceManager::getInstance()->unload(this->thunderBuffer);
     this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
 

trunk/src/lib/graphics/effects/rain_effect.cc

@@ -39 +39 @@
 SHELL_COMMAND(stopraining, RainEffect, stopRaining);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(RainEffect, CL_RAIN_EFFECT,

trunk/src/lib/graphics/effects/snow_effect.cc

@@ -1 +1 @@
 /*
-        orxonox - the future of 3D-vertical-scrollers
-
-        Copyright (C) 2004 orx
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2, or (at your option)
-        any later version.
+        orxonox - the future of 3D-vertical-scrollers
+
+        Copyright (C) 2004 orx
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2, or (at your option)
+        any later version.
 
 ### File Specific:
-        main-programmer: hdavid, amaechler
+        main-programmer: hdavid, amaechler
 */
 
@@ -35 +35 @@
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);
 
-using namespace std;
 
 CREATE_SCRIPTABLE_CLASS(SnowEffect, CL_SNOW_EFFECT,
@@ -46 +45 @@
 SnowEffect::SnowEffect(const TiXmlElement* root)
 {
-        this->setClassID(CL_SNOW_EFFECT, "SnowEffect");
-
-        this->init();
-
-        if (root != NULL)
-                this->loadParams(root);
-
-        //load wind sound
-        if (this->snowWindForce >= 1) {
-                if (this->windBuffer != NULL)
-                        ResourceManager::getInstance()->unload(this->windBuffer);
-          this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
-        }
+        this->setClassID(CL_SNOW_EFFECT, "SnowEffect");
+
+        this->init();
+
+        if (root != NULL)
+                this->loadParams(root);
+
+        this->windBuffer = NULL;
+        //load wind sound
+        if (this->snowWindForce >= 1) {
+          this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
+        }
 
   if(snowActivate) {
-                this->activate();
+                this->activate();
     SnowEffect::snowParticles->precache((int) this->snowLife);
   }
@@ -69 +67 @@
 SnowEffect::~SnowEffect()
 {
-        this->deactivate();
+        this->deactivate();
 }
 
@@ -76 +74 @@
 void SnowEffect::loadParams(const TiXmlElement* root)
 {
-        WeatherEffect::loadParams(root);
-
-        LoadParam(root, "numParticles", this, SnowEffect, numParticles);
-        LoadParam(root, "materialTexture", this, SnowEffect, materialTexture);
-        LoadParam(root, "lifeSpans", this, SnowEffect, lifeSpan);
-        LoadParam(root, "radius", this, SnowEffect, radius);
-        LoadParam(root, "mass", this, SnowEffect, mass);
-        LoadParam(root, "emissionRate", this, SnowEffect, emissionRate);
-        LoadParam(root, "emissionVelocity", this, SnowEffect, emissionVelocity);
-        LoadParam(root, "wind", this, SnowEffect, wind);
-        LoadParam(root, "size", this, SnowEffect, size);
-        LoadParam(root, "coord", this, SnowEffect, coord);
+        WeatherEffect::loadParams(root);
+
+        LoadParam(root, "numParticles", this, SnowEffect, numParticles);
+        LoadParam(root, "materialTexture", this, SnowEffect, materialTexture);
+        LoadParam(root, "lifeSpans", this, SnowEffect, lifeSpan);
+        LoadParam(root, "radius", this, SnowEffect, radius);
+        LoadParam(root, "mass", this, SnowEffect, mass);
+        LoadParam(root, "emissionRate", this, SnowEffect, emissionRate);
+        LoadParam(root, "emissionVelocity", this, SnowEffect, emissionVelocity);
+        LoadParam(root, "wind", this, SnowEffect, wind);
+        LoadParam(root, "size", this, SnowEffect, size);
+        LoadParam(root, "coord", this, SnowEffect, coord);
   LoadParam(root, "cloudcolor", this, SnowEffect, setCloudColor);
   LoadParam(root, "skycolor", this, SnowEffect, setSkyColor);
   LoadParam(root, "fadetime", this, SnowEffect, setFadeTime);
 
-        LOAD_PARAM_START_CYCLE(root, element);
-        {
-                LoadParam_CYCLE(element, "option", this, SnowEffect, setSnowOption);
-        }
-        LOAD_PARAM_END_CYCLE(element);
+        LOAD_PARAM_START_CYCLE(root, element);
+        {
+                LoadParam_CYCLE(element, "option", this, SnowEffect, setSnowOption);
+        }
+        LOAD_PARAM_END_CYCLE(element);
 }
 
 void SnowEffect::init()
 {
-        this->emitter = new PlaneEmitter();
-
-        // Default values
-        this->snowActivate = false;
-        this->snowMove = false;
-        this->particles = 12000;
-        this->texture = "maps/snow_flake_01_32x32.png";
-        this->snowLife = 8;
-        this->randomLife = 2;
-        this->snowRadius = 3.5;
-        this->randomRadius = 1;
-        this->snowMass = 1.0;
-        this->randomMass = 0.3;
-        this->rate = 900;
-        this->velocity = -100;
-        this->randomVelocity = 5;
-        this->angle = 0.5;
-        this->randomAngle = 0.2;
-        this->alpha = 0.5;
-        this->snowSize = Vector2D(2500, 2500);
-        this->snowCoord = Vector(100,450,400);
-        this->snowWindForce = 1;
-  
+        this->emitter = new PlaneEmitter();
+
+        // Default values
+        this->snowActivate = false;
+        this->snowMove = false;
+        this->particles = 12000;
+        this->texture = "maps/snow_flake_01_32x32.png";
+        this->snowLife = 8;
+        this->randomLife = 2;
+        this->snowRadius = 3.5;
+        this->randomRadius = 1;
+        this->snowMass = 1.0;
+        this->randomMass = 0.3;
+        this->rate = 900;
+        this->velocity = -100;
+        this->randomVelocity = 5;
+        this->angle = 0.5;
+        this->randomAngle = 0.2;
+        this->alpha = 0.5;
+        this->snowSize = Vector2D(2500, 2500);
+        this->snowCoord = Vector(100,450,400);
+        this->snowWindForce = 1;
+
   this->fadeTime = 10;
   this->cloudColor = Vector(0.2f, 0.2f, 0.2f);
@@ -131 +129 @@
 void SnowEffect::activate()
 {
-        PRINTF(3)("Activating SnowEffect\n");
-
-        this->snowActivate = true;
-
-        SnowEffect::snowParticles = new SpriteParticles(particles);
-        SnowEffect::snowParticles->setName("SnowEffectTrailParticles");
-        SnowEffect::snowParticles->setMaterialTexture(texture);
-        SnowEffect::snowParticles->setLifeSpan(snowLife, randomLife);
-        SnowEffect::snowParticles->setRadius(0.0, snowRadius, randomRadius);
-        SnowEffect::snowParticles->setRadius(0.2, snowRadius, randomRadius*0.8);
-        SnowEffect::snowParticles->setRadius(1.0, snowRadius, randomRadius*0.5);
-        SnowEffect::snowParticles->setMass(0, snowMass, randomMass);
-        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
-        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
-        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
-
-        this->emitter->setSystem(SnowEffect::snowParticles);
-
-        this->emitter->setRelCoor(snowCoord);
-        this->emitter->setEmissionRate(rate);
-        this->emitter->setEmissionVelocity(velocity, randomVelocity);
-        this->emitter->setSpread(angle * this->snowWindForce , randomAngle * this->snowWindForce);
-        this->emitter->setSize(snowSize);
+        PRINTF(3)("Activating SnowEffect\n");
+
+        this->snowActivate = true;
+
+        SnowEffect::snowParticles = new SpriteParticles(particles);
+        SnowEffect::snowParticles->setName("SnowEffectTrailParticles");
+        SnowEffect::snowParticles->setMaterialTexture(texture);
+        SnowEffect::snowParticles->setLifeSpan(snowLife, randomLife);
+        SnowEffect::snowParticles->setRadius(0.0, snowRadius, randomRadius);
+        SnowEffect::snowParticles->setRadius(0.2, snowRadius, randomRadius*0.8);
+        SnowEffect::snowParticles->setRadius(1.0, snowRadius, randomRadius*0.5);
+        SnowEffect::snowParticles->setMass(0, snowMass, randomMass);
+        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
+        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
+        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+
+        this->emitter->setSystem(SnowEffect::snowParticles);
+
+        this->emitter->setRelCoor(snowCoord);
+        this->emitter->setEmissionRate(rate);
+        this->emitter->setEmissionVelocity(velocity, randomVelocity);
+        this->emitter->setSpread(angle * this->snowWindForce , randomAngle * this->snowWindForce);
+        this->emitter->setSize(snowSize);
 
   if (this->snowWindForce != 0)
     this->soundSource.play(this->windBuffer, 0.1f * this->snowWindForce, true);
-  
+
   // Store cloud- and sky color before the snow
   this->oldCloudColor = CloudEffect::cloudColor;
@@ -171 +169 @@
 void SnowEffect::deactivate()
 {
-        PRINTF(3)("Deactivating SnowEffect\n");
-
-        this->snowActivate = false;
-        this->emitter->setSystem(NULL);
-
-        if (this->windBuffer != NULL)
-                ResourceManager::getInstance()->unload(this->windBuffer);
-  
+        PRINTF(3)("Deactivating SnowEffect\n");
+
+        this->snowActivate = false;
+        this->emitter->setSystem(NULL);
+
+        if (this->windBuffer != NULL)
+                ResourceManager::getInstance()->unload(this->windBuffer);
+
   // Restore the old cloud- and sky color
   CloudEffect::changeCloudColor(this->oldCloudColor, this->fadeTime);
@@ -186 +184 @@
 void SnowEffect::draw() const
 {
-        if (!this->snowActivate)
-                return;
+        if (!this->snowActivate)
+                return;
 }
 
 void SnowEffect::tick(float dt)
 {
-        if (!this->snowActivate)
-                return;
-
-        /*
-        float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
-
-        if(activated)
-        {
-        if(distance > 0.3*snowSize.x || distance > 0.3*snowSize.y)
-                        this->deactivate();
-        else if(distance > 0.25*snowSize.x || distance > 0.25*snowSize.y)
-        this->alpha = 0.15;
-        else if(distance > 0.2*snowSize.x || distance > 0.2*snowSize.y)
-        this->alpha = 0.25;
-        else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
-        this->alpha = 0.4;
-
-        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
-        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
-        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
-        }
-        else
-        {
-        if(distance < 0.3*snowSize.x || distance < 0.3*snowSize.y )
-        this->activate();
-        if( distance < 0.25*snowSize.x || distance < 0.25*snowSize.y )
-        this->alpha = 0.25;
-        else if( distance < 0.2*snowSize.x || distance < 0.2*snowSize.y )
-        this->alpha = 0.4;
-        else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
-        this->alpha = 0.5;
-
-        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
-        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
-        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
-        }*/
-
-        if (this->snowMove) {
-                this->snowCoord = State::getCameraNode()->getAbsCoor();
-                this->emitter->setRelCoor(this->snowCoord.x , this->snowCoord.y+300, this->snowCoord.z);
-        }
-}
+        if (!this->snowActivate)
+                return;
+
+        /*
+        float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
+
+        if(activated)
+        {
+        if(distance > 0.3*snowSize.x || distance > 0.3*snowSize.y)
+                        this->deactivate();
+        else if(distance > 0.25*snowSize.x || distance > 0.25*snowSize.y)
+        this->alpha = 0.15;
+        else if(distance > 0.2*snowSize.x || distance > 0.2*snowSize.y)
+        this->alpha = 0.25;
+        else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
+        this->alpha = 0.4;
+
+        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
+        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
+        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+        }
+        else
+        {
+        if(distance < 0.3*snowSize.x || distance < 0.3*snowSize.y )
+        this->activate();
+        if( distance < 0.25*snowSize.x || distance < 0.25*snowSize.y )
+        this->alpha = 0.25;
+        else if( distance < 0.2*snowSize.x || distance < 0.2*snowSize.y )
+        this->alpha = 0.4;
+        else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
+        this->alpha = 0.5;
+
+        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
+        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
+        SnowEffect::snowParticles->setColor(1, .0, .0, .0, .0);
+        }*/
+
+        if (this->snowMove) {
+                this->snowCoord = State::getCameraNode()->getAbsCoor();
+                this->emitter->setRelCoor(this->snowCoord.x , this->snowCoord.y+300, this->snowCoord.z);
+        }
+}

trunk/src/lib/graphics/effects/snow_effect.h

@@ -101 +101 @@
 
 private:
-    int         particles;
+    int               particles;
     std::string       texture;
-    float       snowLife, randomLife;
-    float       snowRadius, randomRadius;
-    float       snowMass, randomMass;
-    float         rate;
-    float         velocity, randomVelocity;
-    float         angle, randomAngle;
-    float         alpha;
-    float         fadeTime;
-    Vector        snowCoord;
-    Vector2D      snowSize;
-    int       snowWindForce;
+    float             snowLife, randomLife;
+    float             snowRadius, randomRadius;
+    float             snowMass, randomMass;
+    float             rate;
+    float             velocity, randomVelocity;
+    float             angle, randomAngle;
+    float             alpha;
+    float             fadeTime;
+    Vector            snowCoord;
+    Vector2D          snowSize;
+    int               snowWindForce;
 
-    bool        snowMove;
-    bool        snowActivate;
+    bool              snowMove;
+    bool              snowActivate;
 
     PlaneEmitter*     emitter;
 
     static SpriteParticles*   snowParticles;
-    OrxSound::SoundSource   soundSource;
+    OrxSound::SoundSource     soundSource;
     OrxSound::SoundBuffer*    windBuffer;
 
-    Vector oldSkyColor;
-    Vector oldCloudColor;
-    Vector skyColor;
-    Vector cloudColor;
+    Vector            oldSkyColor;
+    Vector            oldCloudColor;
+    Vector            skyColor;
+    Vector            cloudColor;
 };
 

trunk/src/lib/graphics/effects/sun_effect.cc

@@ -21 +21 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/effects/volfog_effect.cc

@@ -47 +47 @@
 
 
-using namespace std;
+
 
 CREATE_FACTORY(VolFogEffect, CL_VOLFOG_EFFECT);

trunk/src/lib/graphics/effects/weather_effect.cc

@@ -21 +21 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -50 +50 @@
  #include "static_model.h"
 #endif
-using namespace std;
 
 SHELL_COMMAND(wireframe, GraphicsEngine, wireframe);
-
+SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
 
 /**
@@ -67 +66 @@
   this->bDisplayFPS = false;
   this->bAntialiasing = false;
+  this->bDedicated = false;
   this->minFPS = 9999;
   this->maxFPS = 0;
@@ -164 +164 @@
   MultiType textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "1");
   Texture::setTextureEnableState(textures.getBool());
+
+  // check it is a dedicated network node: so no drawings are made
+  MultiType dedicated = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_NO_RENDER, "0");
+  this->bDedicated = dedicated.getBool();
 
   // searching for a usefull resolution
@@ -604 +608 @@
 }
 
+/**
+ * this draws the graphics engines graphics effecs
+ */
 void GraphicsEngine::draw() const
 {
-  //  LightManager::getInstance()->draw();
-
-  if (this->graphicsEffects != NULL)
+  if( this->graphicsEffects != NULL)
   {
     //draw the graphics effects
-    list<BaseObject*>::const_iterator it;
+    std::list<BaseObject*>::const_iterator it;
     for (it = this->graphicsEffects->begin(); it != this->graphicsEffects->end(); it++)
       dynamic_cast<GraphicsEffect*>(*it)->draw();
@@ -618 +623 @@
   Render2D::getInstance()->draw(E2D_LAYER_BOTTOM, E2D_LAYER_ABOVE_ALL);
   Shader::restoreShader();
+}
+
+
+void GraphicsEngine::toggleFPSdisplay()
+{
+  this->displayFPS(!this->bDisplayFPS);
 }
 

trunk/src/lib/graphics/graphics_engine.h

@@ -46 +46 @@
     void toggleFullscreen();
     static void setBackgroundColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha = 1.0);
+    inline bool isDedicated() { return this->bDedicated; }
 
     inline void setAntialiasing(bool flag) { this->bAntialiasing = flag; }
@@ -74 +75 @@
     void drawBackgroundElements() const;
     void draw() const;
+    void toggleFPSdisplay();
     void displayFPS(bool display);
 
@@ -113 +115 @@
     bool                       particlesEnabled;   //!< If particles should be enabled.
     bool                       bAntialiasing;      //!< true if antialiasing enabled
+    bool                       bDedicated;         //!< true if this server is a dedicated server and should not render the scene
 
     int                        particlesValue;     //!< How many particles

trunk/src/lib/graphics/importer/bsp_file.cc

@@ -40 +40 @@
 #include <vector>
 
-using namespace std;
+
 
 
@@ -96 +96 @@
   if (stat( name , &results) == 0) {
     PRINTF(0)("BSP FILE: Datei %s gefunden. \n", name);
-    ifstream bspFile (name, ios::in | ios::binary);
+    std::ifstream bspFile (name, std::ios::in | std::ios::binary);
     bspFile.read(this->header, 260);
     PRINTF(0)("BSP FILE: BSPVersion: %i. \n", ((int *)(header) )[1]);

trunk/src/lib/graphics/importer/grid.cc

@@ -18 +18 @@
 #include "grid.h"
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/importer/interactive_model.cc

@@ -20 +20 @@
 #include "glincl.h"
 
-using namespace std;
+
 
 /**

trunk/src/lib/graphics/importer/material.cc

@@ -88 +88 @@
 Material::~Material()
 {
-  PRINTF(5)("delete Material %s.\n", this->getName());
+  PRINTF(5)("delete Material %s.\n", this->getCName());
 
   if (this->ambientTexture != NULL)
@@ -217 +217 @@
 void Material::setIllum (int illum)
 {
-  PRINTF(4)("setting illumModel of Material %s to %i\n", this->getName(), illum);
+  PRINTF(4)("setting illumModel of Material %s to %i\n", this->getCName(), illum);
   this->illumModel = illum;
 }
@@ -229 +229 @@
 void Material::setDiffuse (float r, float g, float b)
 {
-  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->diffuse = Color(r, g, b, this->diffuse.a() );
 }
@@ -242 +242 @@
 void Material::setAmbient (float r, float g, float b)
 {
-  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->ambient = Color(r, g, b, 1.0);
 }
@@ -254 +254 @@
 void Material::setSpecular (float r, float g, float b)
 {
-  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->specular = Color (r, g, b, 1.0);
 }
@@ -273 +273 @@
 void Material::setTransparency (float trans)
 {
-  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->getName(), trans);
+  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->getCName(), trans);
   this->diffuse.a() = trans;
 }
@@ -455 +455 @@
 void Material::debug() const
 {
-  PRINT(0)("Debug Material: %s\n", this->getName());
+  PRINT(0)("Debug Material: %s\n", this->getCName());
   PRINT(0)("illumModel: %d ; ShiniNess %f\n", this->illumModel, shininess);
   PRINT(0)("diffuseColor: "); diffuse.debug();

trunk/src/lib/graphics/importer/md2/md2Model.cc

@@ -22 +22 @@
 
 
-using namespace std;
+
 
 //! the model anorms

trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc

@@ -19 +19 @@
 #include "md3_animation.h"
 
-#include "tokenizer.h"
+#include "substring.h"
 #include "helper_functions.h"
 
 #include "debug.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-
-using namespace std;
+
+
+
 
 namespace md3
@@ -100 +98 @@
         if( inHeader && line.find("sex") == 0) {
           //parse line: sex [m | f | ...]
-          std::vector<std::string> tokens;
-          Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
+          SubString tokens(line, " \t\n\r\f/");
 
           std::string sexStr = tokens.back();
@@ -117 +114 @@
         else if( inHeader && line.find("headoffset") == 0) {
           // parse line: headoffset X Y Z
-          std::vector<std::string> tokens;
-          Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
+          SubString tokens(line, " \t\n\r\f/");
 
           float z = atof(tokens.back().c_str()); tokens.pop_back();
@@ -130 +126 @@
         else if( inHeader && line.find("footsteps") == 0) {
           //parse line: footsteps [normal | mech | ...]
-          std::vector<std::string> tokens;
-          Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
+          SubString tokens (line, " \t\n\r\f/");
 
           this->footsteps = tokens.back();
@@ -190 +185 @@
     // parse the line:
     // first frame, num frames, looping frames, frames per second (fps)
-    std::vector<std::string> tokens;
-    Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
+    SubString tokens(line, " \t\n\r\f/");
 
     anim->fps = atoi(tokens.back().c_str()); tokens.pop_back();

trunk/src/lib/graphics/importer/model.cc

@@ -20 +20 @@
 #include "glincl.h"
 
-using namespace std;
+
 
 /**

trunk/src/lib/graphics/importer/primitive_model.cc

@@ -21 +21 @@
 #include "debug.h"
 
-using namespace std;
+
 
 /**

trunk/src/lib/graphics/importer/static_model.cc

@@ -23 +23 @@
 #include <stdarg.h>
 
-using namespace std;
+
 
 
@@ -161 +161 @@
 {
   PRINTF(4)("Deleting Model ");
-  if (this->getName())
-  {
-    PRINT(4)("%s\n", this->getName());
+  if (!this->getName().empty())
+  {
+    PRINT(4)("%s\n", this->getCName());
   }
   else
@@ -178 +178 @@
 
   //! @todo do we really have to delete this material??
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for(modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
   {
@@ -214 +214 @@
 void StaticModel::rebuild()
 {
-  PRINTF(3)("Rebuilding Model '%s'\n", this->getName());
+  PRINTF(3)("Rebuilding Model '%s'\n", this->getCName());
   this->finalize();
 }
@@ -266 +266 @@
     tmpGroup = tmpGroup->next;
   }
-  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->getName());
+  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->getCName());
   return;
 }
@@ -291 +291 @@
     tmpGroup = tmpGroup->next;
   }
-  PRINTF(2)("Model Named %s in %s not Found.\n", groupName.c_str(), this->getName());
+  PRINTF(2)("Model Named %s in %s not Found.\n", groupName.c_str(), this->getCName());
   return;
 }
@@ -358 +358 @@
 Material* StaticModel::findMaterialByName(const std::string& materialName)
 {
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for  (modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
     if (materialName == (*modMat)->material->getName())
@@ -748 +748 @@
         {
           tmpFace->material->select();
-          PRINTF(5)("using material %s for coming Faces.\n", tmpFace->material->getName());
+          PRINTF(5)("using material %s for coming Faces.\n", tmpFace->material->getCName());
         }
       }
@@ -840 +840 @@
       else if( tmpFace->vertexCount > 4) {
         if (!warned)        {
-          PRINTF(2)("This model (%s) got over 4 vertices per face <=> conflicts in the CD engine!\n", this->getName());
+          PRINTF(2)("This model (%s) got over 4 vertices per face <=> conflicts in the CD engine!\n", this->getCName());
           warned = true;
         }

trunk/src/lib/graphics/importer/texture.cc

@@ -230 +230 @@
   if (this->data->getStoredImage() != NULL)
   {
-    PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
+    PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassCName(), this->getCName());
     this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
   }

trunk/src/lib/graphics/importer/texture_sequence.cc

@@ -225 +225 @@
 bool TextureSequence::rebuild()
 {
-  PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassName(), this->getName());
+  PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassCName(), this->getCName());
 
   for (unsigned int i = 0; i < this->textures.size(); i++)

trunk/src/lib/graphics/importer/vertex_array_model.cc

@@ -23 +23 @@
 #include "tc.h"
 
-using namespace std;
+
 
 /////////////
@@ -116 +116 @@
 VertexArrayModel::~VertexArrayModel()
 {
-  PRINTF(4)("Deleting VertexArrayModel %s\n", this->getName());
+  PRINTF(4)("Deleting VertexArrayModel %s\n", this->getCName());
 }
 
@@ -127 +127 @@
 void VertexArrayModel::draw() const
 {
-  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
+  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getCName());
   glEnableClientState(GL_VERTEX_ARRAY );
   glEnableClientState(GL_TEXTURE_COORD_ARRAY );
@@ -343 +343 @@
 void VertexArrayModel::debug() const
 {
-  PRINT(0)("VertexArrayModel (%s): debug\n", this->getName());
+  PRINT(0)("VertexArrayModel (%s): debug\n", this->getCName());
   PRINT(0)("Stripes: %d; Indices: %d; Vertices: %d; Normals %d; TextCoords %d; Colors %d\n",
             this->stripes.size(),

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -104 +104 @@
       deleteNode = tmp;
       tmp++;
-      //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassName(), this->getName());
+      //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassCName(), this->getName());
       if ((this->parentMode & E2D_PROHIBIT_CHILD_DELETE) ||
           ((*deleteNode)->parentMode & E2D_PROHIBIT_DELETE_WITH_PARENT))
@@ -214 +214 @@
   {
     PRINTF(2)("Unable to set %s to layer %s, because it's parent(%s) is of higher layer %s\n",
-              this->getName(),
+              this->getCName(),
               Element2D::layer2DToChar(layer),
-              this->parent->getName(),
+              this->parent->getCName(),
               Element2D::layer2DToChar(this->parent->getLayer()));
     layer = this->parent->getLayer();
@@ -602 +602 @@
       {
         PRINTF(2)("Layer '%s' of Child(%s::%s) lower than parents(%s::%s) layer '%s'. updating...\n",
-                  Element2D::layer2DToChar(child->getLayer()),child->getClassName(), child->getName(),
-                  this->getClassName(), this->getName(), Element2D::layer2DToChar(this->layer));
+                  Element2D::layer2DToChar(child->getLayer()),child->getClassCName(), child->getCName(),
+                  this->getClassCName(), this->getCName(), Element2D::layer2DToChar(this->layer));
         child->layer = this->layer;
         this->children.push_front(child);
@@ -627 +627 @@
     {
       PRINTF(1)("Tried to reparent2D to own child '%s::%s' to '%s::%s'.\n",
-                this->getClassName(), this->getName(), child->getClassName(), child->getName());
+                this->getClassCName(), this->getCName(), child->getClassCName(), child->getCName());
       child->parent = NULL;
     }
@@ -701 +701 @@
     {
       (*reparenter)->reparent2D();
-      PRINTF(5)("REPARENTED TO: %s::%s\n",(*reparenter)->getParent2D()->getClassName(),(*reparenter)->getParent2D()->getName());
+      PRINTF(5)("REPARENTED TO: %s::%s\n",(*reparenter)->getParent2D()->getClassCName(),(*reparenter)->getParent2D()->getCName());
     }
   }
@@ -723 +723 @@
   else
     PRINTF(2)("Not Found Element2D's (%s::%s) new Parent by Name: %s\n",
-              this->getClassName(), this->getName(), parentName.c_str());
+              this->getClassCName(), this->getCName(), parentName.c_str());
 }
 
@@ -865 +865 @@
         Vector2D tmp = *this->toCoordinate;
         this->setRelCoor2D(tmp);
-        PRINTF(5)("SmoothMove of %s finished\n", this->getName());
+        PRINTF(5)("SmoothMove of %s finished\n", this->getCName());
       }
     }
@@ -879 +879 @@
         float tmp = *this->toDirection;
         this->setRelDir2D(tmp);
-        PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
+        PRINTF(5)("SmoothRotate of %s finished\n", this->getCName());
       }
     }
@@ -893 +893 @@
         delete this->toSize;
         this->toSize = NULL;
-        PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
+        PRINTF(5)("SmoothRotate of %s finished\n", this->getCName());
       }
     }
@@ -900 +900 @@
     this->lastAbsCoordinate = this->absCoordinate;
 
-    PRINTF(5)("Element2D::update - %s - (%f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y);
+    PRINTF(5)("Element2D::update - %s - (%f, %f)\n", this->getCName(), this->absCoordinate.x, this->absCoordinate.y);
 
 
@@ -937 +937 @@
                  projectPos+1,
                  projectPos+2);
-      //       printf("%s::%s  == %f %f %f :: %f %f\n", this->getClassName(), this->getName(),
+      //       printf("%s::%s  == %f %f %f :: %f %f\n", this->getClassCName(), this->getName(),
       //              this->bindNode->getAbsCoor().x,
       //              this->bindNode->getAbsCoor().y,
@@ -1026 +1026 @@
     PRINT(0)(" -");
   PRINT(0)("E2D(%s::%s);AC:(%0.2f, %0.2f);RC:(%0.2f, %0.2f);AD(%0.2f)->%s;Layer:(%s)\n",
-           this->getClassName(),
-           this->getName(),
+           this->getClassCName(),
+           this->getCName(),
            this->absCoordinate.x,
            this->absCoordinate.y,

trunk/src/lib/graphics/render2D/image_plane.cc

@@ -25 +25 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -22 +22 @@
 #include "element_2d.h"
 
-using namespace std;
+
 
 /**

trunk/src/lib/graphics/shader.cc

@@ -32 +32 @@
 #endif
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/spatial_separation/quadtree.cc

@@ -24 +24 @@
 #include "debug.h"
 
-using namespace std;
+
 #define QUADTREE_MATERIAL_COUNT       4
 

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -26 +26 @@
 #include "util/list.h"
 
-using namespace std;
+
 
 

trunk/src/lib/graphics/spatial_separation/spatial_separation.cc

@@ -23 +23 @@
 #include "compiler.h"
 
-using namespace std;
+
 
 

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

@@ -160 +160 @@
 void LimitedWidthText::debug() const
 {
-  printf("Debug %s::%s \n", this->getClassName(), this->getName() );
+  printf("Debug %s::%s \n", this->getClassCName(), this->getCName() );
 }

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

@@ -152 +152 @@
 void MultiLineText::debug() const
 {
- printf("Debug %s::%s: %d lines\n", this->getClassName(), this->getName(), this->getLineCount());
+ printf("Debug %s::%s: %d lines\n", this->getClassCName(), this->getCName(), this->getLineCount());
 
  std::string tmpText = this->text();

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

@@ -28 +28 @@
  */
 Text::Text(const std::string& fontFile, unsigned int textSize)
-    : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
+    // : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
 {
   this->setClassID(CL_TEXT, "Text");
 
   // initialize this Text
+  this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
   this->_size = textSize;
   this->setSizeY2D(textSize);
@@ -278 +279 @@
 void Text::debug() const
 {
-  PRINT(0)("=== TEXT: %s (with Font:'%s')  displaying %s ===\n", this->getName(), this->_font.getName(), this->_text.c_str());
+  PRINT(0)("=== TEXT: %s (with Font:'%s')  displaying %s ===\n", this->getCName(), this->_font.getCName(), this->_text.c_str());
   //  PRINT(0)("Color: r=%0.2f g=%0.2f b=%0.2f a=%0.2f\n", this->_color.r(), this->_color.g(), this->_color.b(), this->_color.a());
 }

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

@@ -26 +26 @@
 #include "font.h"
 
-using namespace std;
+
 
 #include <stdlib.h>
@@ -122 +122 @@
 void TextEngine::debug() const
 {
-  const list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
+  const std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
@@ -130 +130 @@
     PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->size());
 
-    list<BaseObject*>::const_iterator text;
+    std::list<BaseObject*>::const_iterator text;
     for ( text = textList->begin(); text != textList->end(); text++)
       dynamic_cast<Text*>(*text)->debug();