Changeset 7221 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (3 diffs)
• creatures/md2_creature.h (modified) (1 diff)
• elements/image_entity.cc (modified) (1 diff)
• elements/image_entity.h (modified) (1 diff)
• elements/text_element.cc (modified) (1 diff)
• elements/text_element.h (modified) (1 diff)
• movie_entity.cc (modified) (1 diff)
• movie_entity.h (modified) (1 diff)
• planet.cc (modified) (4 diffs)
• planet.h (modified) (3 diffs)
• power_ups/param_power_up.cc (modified) (1 diff)
• power_ups/param_power_up.h (modified) (2 diffs)
• power_ups/power_up.cc (modified) (6 diffs)
• power_ups/power_up.h (modified) (2 diffs)
• power_ups/weapon_power_up.cc (modified) (1 diff)
• power_ups/weapon_power_up.h (modified) (1 diff)
• projectiles/projectile.cc (modified) (2 diffs)
• projectiles/projectile.h (modified) (1 diff)
• recorder.cc (modified) (18 diffs)
• recorder.h (modified) (3 diffs)
• skybox.cc (modified) (8 diffs)
• skybox.h (modified) (3 diffs)
• space_ships/helicopter.cc (modified) (3 diffs)
• space_ships/helicopter.h (modified) (1 diff)
• space_ships/hover.cc (modified) (2 diffs)
• space_ships/hover.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (2 diffs)
• space_ships/turbine_hover.h (modified) (1 diff)
• terrain.cc (modified) (10 diffs)
• terrain.h (modified) (2 diffs)
• weapons/aim.cc (modified) (1 diff)
• weapons/aim.h (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/crosshair.cc (modified) (2 diffs)
• weapons/crosshair.h (modified) (1 diff)
• weapons/weapon.cc (modified) (6 diffs)
• weapons/weapon.h (modified) (4 diffs)
• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (2 diffs)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -52 +52 @@
  * @param fileName the name of the File to load the MD2Creature from (absolute path)
  */
-MD2Creature::MD2Creature(const char* fileName)
+MD2Creature::MD2Creature(const std::string& fileName)
 {
   this->init();
@@ -59 +59 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName);
+    PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName.c_str());
     return;
   }
@@ -255 +255 @@
   this->shiftCoor (move);
 
-  if( this->bJump)
+  if( this->bJump && likely(this->getModel(0) != NULL))
   {
     ((MD2Model*)this->getModel(0))->setAnim(JUMP);
   }
-  else if( this->bFire)
+  else if( this->bFire && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
   }
-  else if( fabs(move.len()) > 0.0f)
+  else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnim(RUN);
   }
-  else
+  else if (likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);

trunk/src/world_entities/creatures/md2_creature.h

@@ -19 +19 @@
   public:
 
-    MD2Creature(const char* fileName);
+    MD2Creature(const std::string& fileName);
     MD2Creature(const TiXmlElement* root = NULL);
     virtual ~MD2Creature();

trunk/src/world_entities/elements/image_entity.cc

@@ -106 +106 @@
  * @param textureFile The texture-file to load onto the crosshair
  */
-void ImageEntity::setTexture(const char* textureFile)
+void ImageEntity::setTexture(const std::string& textureFile)
 {
   this->material->setDiffuseMap(textureFile);

trunk/src/world_entities/elements/image_entity.h

@@ -30 +30 @@
 
   void setSize(float sizeX, float sizeY);
-  void setTexture(const char* textureFile);
+  void setTexture(const std::string& textureFile);
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };

trunk/src/world_entities/elements/text_element.cc

@@ -70 +70 @@
 }
 
-void TextElement::setText(const char* text)
+void TextElement::setText(const std::string& text)
 {
   Text::setText(text);
 }
 
-void TextElement::setFont(const char* font)
+void TextElement::setFont(const std::string& font)
 {
   Text::setFont(font, (unsigned int)this->getSizeY2D());

trunk/src/world_entities/elements/text_element.h

@@ -29 +29 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setText(const char* text);
-  void setFont(const char* font);
+  void setText(const std::string& text);
+  void setFont(const std::string& font);
 
  private:

trunk/src/world_entities/movie_entity.cc

@@ -74 +74 @@
 }
 
-void MovieEntity::loadMovie(const char* filename)
+void MovieEntity::loadMovie(const std::string& filename)
 {
   if(media_container->loadMedia(filename))

trunk/src/world_entities/movie_entity.h

@@ -37 +37 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    void loadMovie(const char* filename);
+    void loadMovie(const std::string& filename);
     void setAxis(float axis);
     void setRotation(float rotation);

trunk/src/world_entities/planet.cc

@@ -45 +45 @@
   this->toList(OM_GROUP_01);
 
-  this->material = new Material();
   //this->material->setIllum(20);
   //this->material->setAmbient(0.1, 0.1, 0.1);
@@ -71 +70 @@
 {
   PRINTF(5)("Deleting Planet\n");
-  if( this->material)
-    delete this->material;
 }
 
@@ -92 +89 @@
  * @param textureName the top texture.
 */
-void Planet::setTexture(const char* textureName)
+void Planet::setTexture(const std::string& textureName)
 {
-  this->material->setDiffuseMap(textureName);
+  this->material.setDiffuseMap(textureName);
 }
 
@@ -124 +121 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->material->select();
+  this->material.select();
 
 //   /WorldEntity::draw();

trunk/src/world_entities/planet.h

@@ -9 +9 @@
 /* INCLUDES */
 #include "world_entity.h"
-
+#include "material.h"
 /* FORWARD DECLARATION */
-class Material;
 class Texture;
 
@@ -26 +25 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* textureName);
+  void setTexture(const std::string& textureName);
 
 
@@ -34 +33 @@
 
  private:
-  Material*       material;        //!< Materials for the Planet. sorted by number (0-5) top, bottom, left, right, front, back
+  Material        material;        //!< Materials for the Planet. sorted by number (0-5) top, bottom, left, right, front, back
   Texture*        texture;         //!< Textures for the CubeMap.
 

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -81 +81 @@
 }
 
-void ParamPowerUp::setType(const char* type)
+void ParamPowerUp::setType(const std::string& type)
 {
   for(int i = 0; i < POWERUP_PARAM_size; ++i) {
-    if(strcmp(type, paramTypes[i]) == 0) {
+    if(type == paramTypes[i]) {
       this->type = (EnumParamPowerUpType)i;
       break;

trunk/src/world_entities/power_ups/param_power_up.h

@@ -28 +28 @@
   void setMaxValue(float value);
   void setMinValue(float value);
-  void setType(const char* type);
+  void setType(const std::string& type);
   EnumParamPowerUpType getType();
   float getValue();
@@ -43 +43 @@
 
 private:
-  static const char* paramTypes[];
-  EnumParamPowerUpType type;
-  float value;
-  float max_value;
-  float min_value;
+  EnumParamPowerUpType    type;
+  float                   value;
+  float                   max_value;
+  float                   min_value;
+
+  static const char*      paramTypes[];
+
 };
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -33 +33 @@
   this->respawnStart = 10;
   this->model = NULL;
-/*  if(!PowerUp::sphereModel) {*/
+  /*  if(!PowerUp::sphereModel) {*/
 
   Model* sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
@@ -75 +75 @@
 
 
-void PowerUp::loadPickupSound(const char* pickupSound)
+void PowerUp::loadPickupSound(const std::string& pickupSound)
 {
   if (this->pickupBuffer != NULL)
     ResourceManager::getInstance()->unload(this->pickupBuffer);
 
-  else if (pickupSound != NULL)
-{
-  this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
-  if (this->pickupBuffer != NULL)
-  {
-    PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound, this->getName());
-  }
-  else
-  {
-    PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound, this->getName());
-  }
-}
+  else if (!pickupSound.empty())
+  {
+    this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+    if (this->pickupBuffer != NULL)
+    {
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getName());
+    }
+    else
+    {
+      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getName());
+    }
+  }
   else
     this->pickupBuffer = NULL;
 }
 
-void PowerUp::loadRespawnSound(const char* respawnSound)
+void PowerUp::loadRespawnSound(const std::string& respawnSound)
 {
   if (this->respawnBuffer != NULL)
     ResourceManager::getInstance()->unload(this->respawnBuffer);
 
-  else if (respawnSound != NULL)
+  else if (!respawnSound.empty())
   {
     this->respawnBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
     if (this->respawnBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getName());
     }
   }
@@ -128 +128 @@
         this->soundSource.play(this->pickupBuffer);
 
-      switch(respawnType) {
-        case RESPAWN_NONE:
-          this->toList(OM_DEAD);
-          break;
-        case RESPAWN_TIME:
-          this->toList(OM_DEAD_TICK);
-          this->respawnTime = this->respawnStart;
-          break;
+      switch(respawnType)
+      {
+      case RESPAWN_NONE:
+        this->toList(OM_DEAD);
+        break;
+      case RESPAWN_TIME:
+        this->toList(OM_DEAD_TICK);
+        this->respawnTime = this->respawnStart;
+        break;
       }
     }
@@ -141 +142 @@
 }
 
-void PowerUp::tick(float dt) {
-  if(this->getOMListNumber() != OM_COMMON) {
+void PowerUp::tick(float dt)
+{
+  if(this->getOMListNumber() != OM_COMMON)
+  {
     this->respawnTime -= dt;
     if(this->respawnTime <= 0)
@@ -157 +160 @@
 void PowerUp::draw() const
 {
-  if(this->model != NULL) {
+  if(this->model != NULL)
+  {
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -172 +176 @@
 }
 
-const char* PowerUp::respawnTypes[] = {
-  "none",
-  "time"
-};
-
-void PowerUp::setRespawnType(const char* type)
-{
-  for(int i = 0; i < RESPAWN_size; ++i) {
-    if(!strcmp(type, respawnTypes[i])) {
+const char* PowerUp::respawnTypes[] =
+  {
+    "none",
+    "time"
+  };
+
+
+void PowerUp::setRespawnType(const std::string& type)
+{
+  for(int i = 0; i < RESPAWN_size; ++i)
+  {
+    if(type == respawnTypes[i])
+    {
       this->respawnType = (PowerUpRespawn)i;
       break;

trunk/src/world_entities/power_ups/power_up.h

@@ -26 +26 @@
   void collidesWith (WorldEntity* entity, const Vector& location);
 
-  void loadPickupSound(const char* pickupSound);
-  void loadRespawnSound(const char* pickupSound);
+  void loadPickupSound(const std::string& pickupSound);
+  void loadRespawnSound(const std::string& respawnSound);
 
   virtual void draw () const;
   virtual void tick(float dt);
-  void setRespawnType(const char* type);
+  void setRespawnType(const std::string& type);
   void setRespawnTime(const float respawn);
 
@@ -45 +45 @@
 
 private:
-  SoundSource    soundSource;
-  SoundBuffer*   pickupBuffer;
-  SoundBuffer*   respawnBuffer;
-  Material* sphereMaterial;
-  PowerUpRespawn respawnType;
-  float respawnTime;
-  float respawnStart;
-  static const char* respawnTypes[];
+  SoundSource         soundSource;
+  SoundBuffer*        pickupBuffer;
+  SoundBuffer*        respawnBuffer;
+  Material*           sphereMaterial;
+  PowerUpRespawn      respawnType;
+  float               respawnTime;
+  float               respawnStart;
+  static const char*  respawnTypes[];
 
-  WorldEntity* collider;
+  WorldEntity*        collider;
 };
 

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -92 +92 @@
 }
 
-void WeaponPowerUp::setWeaponClass(const char* name)
+void WeaponPowerUp::setWeaponClass(const std::string& name)
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
   if (this->weapon == NULL)
   {
-    PRINTF(1)("Unable to load Weapon. %s\n", name);
+    PRINTF(1)("Unable to load Weapon. %s\n", name.c_str());
     this->weapon = dynamic_cast<Weapon*>(Factory::fabricate("Turret"));
   }

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -22 +22 @@
 
   Weapon* getWeapon();
-  void setWeaponClass(const char* name);
+  void setWeaponClass(const std::string& name);
 
   virtual int writeBytes(const byte* data, int length, int sender);

trunk/src/world_entities/projectiles/projectile.cc

@@ -61 +61 @@
 
 
-void Projectile::loadExplosionSound(const char* explosionSound)
+void Projectile::loadExplosionSound(const std::string& explosionSound)
 {
   if (this->explosionBuffer != NULL)
     ResourceManager::getInstance()->unload(this->explosionBuffer);
 
-  else if (explosionSound != NULL)
+  else if (!explosionSound.empty())
   {
     this->explosionBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
     if (this->explosionBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getName());
     }
   }
@@ -83 +83 @@
 
 
-void Projectile::loadEngineSound(const char* engineSound)
+void Projectile::loadEngineSound(const std::string& engineSound)
 {
   if (this->engineBuffer != NULL)
     ResourceManager::getInstance()->unload(this->engineBuffer);
 
-  else if (engineSound != NULL)
+  else if (!engineSound.empty())
   {
     this->engineBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
     if (this->engineBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound, this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound, this->getName());
+      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getName());
     }
   }

trunk/src/world_entities/projectiles/projectile.h

@@ -26 +26 @@
     void setLifeSpan(float lifeSpan);
 
-    void loadExplosionSound(const char* explosionSound);
-    void loadEngineSound(const char* engineSound);
+    void loadExplosionSound(const std::string& explosionSound);
+    void loadEngineSound(const std::string& engineSound);
     void setMinEnergy(float energyMin);
     /** @returns the minimal charched energy */

trunk/src/world_entities/recorder.cc

@@ -54 +54 @@
 
   LoadParam(root, "duration", this, Recorder, setStreamDuration);
+
   LoadParam(root, "fps", this, Recorder, setFPS);
+
   LoadParam(root, "name", this, Recorder, initVideo);
 }
@@ -71 +73 @@
 
 
-void Recorder::initVideo(const char* filename)
+void Recorder::initVideo(const std::string& filename)
 {
   frame_count = 0;
@@ -78 +80 @@
 
   // auto detect the output format from the name, default is mpeg
-  output_format = guess_format(NULL, filename, NULL);
+  output_format = guess_format(NULL, filename.c_str(), NULL);
   if (!output_format)
   {
@@ -93 +95 @@
 
   format_context->oformat = output_format;
-  snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename);
+  snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename.c_str());
 
   // add video stream using the default format codec and initialize the codec
@@ -104 +106 @@
 
   // print some information
-  dump_format(format_context, 0, filename, 1);
+  dump_format(format_context, 0, filename.c_str(), 1);
 
   // now that all the parameters are set, we can open the
@@ -110 +112 @@
   if(video_stream)
     this->openVideo();
-  
+
   // open the output file, if needed
   if(!(output_format->flags & AVFMT_NOFILE))
   {
-    if(url_fopen(&format_context->pb, filename, URL_WRONLY) < 0)
-      PRINTF(1)("Could not open %s\n", filename);
+    if(url_fopen(&format_context->pb, filename.c_str(), URL_WRONLY) < 0)
+      PRINTF(1)("Could not open %s\n", filename.c_str());
   }
 
   // write the stream header, if any
-  av_write_header(format_context); 
+  av_write_header(format_context);
 }
 
@@ -129 +131 @@
   av_free(buffer);
 
-  // write the trailer, if any 
+  // write the trailer, if any
   av_write_trailer(format_context);
-  
+
   // free the streams
   for(int i = 0; i < format_context->nb_streams; i++)
@@ -175 +177 @@
 
 void Recorder::allocPicture()
-{ 
+{
   picture = avcodec_alloc_frame();
   if(!picture)
@@ -189 +191 @@
       return;
   }
-  avpicture_fill((AVPicture *)picture, picture_buf, 
+  avpicture_fill((AVPicture *)picture, picture_buf,
                   codec_context->pix_fmt, width, height);
 
@@ -211 +213 @@
   if (!video_stream)
     PRINTF(1)("Could not alloc stream\n");
-  
+
   codec_context = video_stream->codec;
   codec_context->codec_id = output_format->video_codec;
@@ -219 +221 @@
   codec_context->bit_rate = 400000;
   // resolution must be a multiple of two
-  codec_context->width = State::getResX();  
+  codec_context->width = State::getResX();
   codec_context->height = State::getResY();
 
@@ -229 +231 @@
   // timebase should be 1/framerate and timestamp increments should be
   // identically 1
-  codec_context->time_base.den = (int)stream_frame_rate;  
+  codec_context->time_base.den = (int)stream_frame_rate;
   codec_context->time_base.num = 1;
   codec_context->gop_size = 12;  // emit one intra frame every twelve frames at most
@@ -235 +237 @@
 
   if (codec_context->codec_id == CODEC_ID_MPEG1VIDEO)
-      // needed to avoid using macroblocks in which some coeffs overflow 
-      // this doesnt happen with normal video, it just happens here as the 
+      // needed to avoid using macroblocks in which some coeffs overflow
+      // this doesnt happen with normal video, it just happens here as the
       // motion of the chroma plane doesnt match the luma plane
       codec_context->mb_decision=2;
@@ -275 +277 @@
 {
   int out_size, err;
-  
+
   codec_context = video_stream->codec;
-  
+
   if(frame_count >= stream_nb_frames)
   {
@@ -287 +289 @@
     this->fillYuvImage();
 
-  
+
   if(format_context->oformat->flags & AVFMT_RAWPICTURE)
   {
@@ -293 +295 @@
     // futur for that
     av_init_packet(&packet);
-    
+
     packet.flags |= PKT_FLAG_KEY;
     packet.stream_index= video_stream->index;
     packet.data= (uint8_t *)picture;
     packet.size= sizeof(AVPicture);
-    
+
     err = av_write_frame(format_context, &packet);
   }
@@ -309 +311 @@
     {
       av_init_packet(&packet);
-      
+
       packet.pts= av_rescale_q(codec_context->coded_frame->pts, codec_context->time_base, video_stream->time_base);
       if(codec_context->coded_frame->key_frame)
@@ -316 +318 @@
       packet.data= buffer;
       packet.size= out_size;
-      
+
       // write the compressed frame in the media file
       err = av_write_frame(format_context, &packet);

trunk/src/world_entities/recorder.h

@@ -20 +20 @@
 class Recorder : public WorldEntity
 {
-  private:
-    AVFrame* picture;
-    uint8_t* buffer;
-    int frame_count;
-    int buffer_size;
-
-    AVOutputFormat* output_format;
-    AVFormatContext* format_context;
-    AVCodecContext* codec_context;
-    AVCodec *codec;
-    AVStream* video_stream;
-    AVPacket packet;
-    double video_pts;
-
-    uint8_t *picture_buf;
-    int size;
-
-    int height;
-    int width;
-    float time;
-
-    float stream_duration;
-    float stream_frame_rate;
-    int stream_nb_frames;
-
-AVFrame* RGB_frame;
   public:
     Recorder (const TiXmlElement* root = NULL);
@@ -56 +30 @@
 
   private:
-    void initVideo(const char* filename);
+    void initVideo(const std::string& filename);
     void addVideoStream();
     void openVideo();
@@ -66 +40 @@
     void setStreamDuration(float duration);
     void setFPS(float fps);
+
+
+  private:
+    AVFrame*            picture;
+    uint8_t*            buffer;
+    int                 frame_count;
+    int                 buffer_size;
+
+    AVOutputFormat*     output_format;
+    AVFormatContext*    format_context;
+    AVCodecContext*     codec_context;
+    AVCodec*            codec;
+    AVStream*           video_stream;
+    AVPacket            packet;
+    double              video_pts;
+
+    uint8_t*            picture_buf;
+    int                 size;
+
+    int                 height;
+    int                 width;
+    float               time;
+
+    float               stream_duration;
+    float               stream_frame_rate;
+    int                 stream_nb_frames;
+
+    AVFrame*            RGB_frame;
 };
 

trunk/src/world_entities/skybox.cc

@@ -38 +38 @@
  * @param fileName the file to take as input for the SkyBox
 */
-SkyBox::SkyBox(const char* fileName)
+SkyBox::SkyBox(const std::string& fileName)
 {
   this->preInit();
-  if (fileName)
+  if (!fileName.empty())
     this->setTextureAndType(fileName, ".jpg");
   this->postInit();
@@ -89 +89 @@
   this->setParentMode(PNODE_MOVEMENT);
 
-  this->textureName = NULL;
+  this->textureName = "";
 }
 
@@ -106 +106 @@
   for (int i = 0; i < 6; i++)
   {
-    if( this->material[i])
+    if (this->material[i])
       delete this->material[i];
-    if( this->cubeTexture[i])
+    if (this->cubeTexture[i])
       ResourceManager::getInstance()->unload(this->cubeTexture[i]);
   }
 }
+
+void SkyBox::setTexture(const std::string& name)
+{
+  this->textureName = name;
+  this->setTextureAndType (name, "jpg");
+};
+
 
 /**
@@ -122 +129 @@
                "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
 */
-void SkyBox::setTextureAndType(const char* name, const char* extension)
-{
-  char* top    = new char[strlen(name)+strlen(extension)+ 10];
-  char* bottom = new char[strlen(name)+strlen(extension)+ 10];
-  char* left   = new char[strlen(name)+strlen(extension)+ 10];
-  char* right  = new char[strlen(name)+strlen(extension)+ 10];
-  char* front  = new char[strlen(name)+strlen(extension)+ 10];
-  char* back   = new char[strlen(name)+strlen(extension)+ 10];
-
-  sprintf(top, "%s_top.%s", name, extension);
-  sprintf(bottom, "%s_bottom.%s", name, extension);
-  sprintf(left, "%s_left.%s", name, extension);
-  sprintf(right, "%s_right.%s", name, extension);
-  sprintf(front, "%s_front.%s", name, extension);
-  sprintf(back, "%s_back.%s", name, extension);
+void SkyBox::setTextureAndType(const std::string& name, const std::string& extension)
+{
+  std::string top = name + "_top." + extension;
+  std::string bottom = name + "_bottom." + extension;
+  std::string left = name + "_left." + extension;
+  std::string right = name + "_right." + extension;
+  std::string front = name + "_front." + extension;
+  std::string back = name + "_back." + extension;
 
   this->setTextures(top, bottom, left, right, front, back);
-
-  // deleted alocated memory of this function
-  delete []top;
-  delete []bottom;
-  delete []left;
-  delete []right;
-  delete []front;
-  delete []back;
 }
 
@@ -158 +150 @@
  * @param back the back texture.
 */
-void SkyBox::setTextures(const char* top, const char* bottom, const char* left,
-                          const char* right, const char* front, const char* back)
+void SkyBox::setTextures(const std::string& top, const std::string& bottom, const std::string& left,
+                          const std::string& right, const std::string& front, const std::string& back)
 {
   this->material[0]->setDiffuseMap(top);
@@ -171 +163 @@
 }
 
-void SkyBox::loadCubeMapTextures(const char* top, const char* bottom, const char* left,
-                                  const char* right, const char* front, const char* back)
+void SkyBox::loadCubeMapTextures(const std::string& top, const std::string& bottom, const std::string& left,
+                                  const std::string& right, const std::string& front, const std::string& back)
 {
   this->cubeTexture[0] = (Texture*)ResourceManager::getInstance()->load(top, RP_LEVEL, IMAGE, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT);
@@ -304 +296 @@
 
   SYNCHELP_READ_FLOAT( size, NWT_SB_SIZE );
-  if ( textureName )
+  if ( !this->textureName.empty() )
   {
-    delete[] textureName;
-    textureName = NULL;
+    textureName = "";
   }
-  SYNCHELP_READ_STRINGM( textureName, NWT_SB_TEXTURENAME );
+  char* texName;
+  SYNCHELP_READ_STRINGM( texName, NWT_SB_TEXTURENAME );
 
   this->setSize( size );
-  this->setTextureAndType( textureName, "jpg" );
+  this->setTextureAndType( texName, "jpg" );
   this->rebuild();
 
@@ -338 +330 @@
 
     SYNCHELP_WRITE_FLOAT(this->size, NWT_SB_SIZE);
-    SYNCHELP_WRITE_STRING(this->textureName, NWT_SB_TEXTURENAME);
+    SYNCHELP_WRITE_STRING(this->textureName.c_str(), NWT_SB_TEXTURENAME);
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/skybox.h

@@ -28 +28 @@
 {
  public:
-  SkyBox(const char* fileName = NULL);
+  SkyBox(const std::string& fileName = "");
   SkyBox(const TiXmlElement* root);
 
@@ -44 +44 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* name) { if (textureName) delete[] textureName; textureName = new char[strlen(name)+1]; strcpy(textureName, name); this->setTextureAndType (name, "jpg"); };
+  void setTexture(const std::string& name);
 
-  void setTextureAndType(const char* name, const char* extension);
-  void setTextures(const char* top, const char* bottom, const char* left,
-                   const char* right, const char* front, const char* back);
+  void setTextureAndType(const std::string& name, const std::string& extension);
+  void setTextures(const std::string& top, const std::string& bottom, const std::string& left,
+                   const std::string& right, const std::string& front, const std::string& back);
 
-  void loadCubeMapTextures(const char* top, const char* bottom, const char* left,
-                           const char* right, const char* front, const char* back);
+  void loadCubeMapTextures(const std::string& top, const std::string& bottom, const std::string& left,
+                           const std::string& right, const std::string& front, const std::string& back);
 
   GLuint getTexture(SKY_SIDE side) const { return (this->material[side]) ? this->material[side]->getDiffuseTexture(): 0; };
@@ -71 +71 @@
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.
   float           textureSize;     //!< this is the length of a texture (assumes a square texture)
-  char*           textureName;     //!< Name of the Texture
+  std::string     textureName;     //!< Name of the Texture
 
 };

trunk/src/world_entities/space_ships/helicopter.cc

@@ -55 +55 @@
  * @param fileName the name of the File to load the helicopter from (absolute path)
  */
-Helicopter::Helicopter(const char* fileName)
+Helicopter::Helicopter(const std::string& fileName)
 {
   this->init();
@@ -62 +62 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName);
+    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName.c_str());
     return;
   }
@@ -110 +110 @@
   this->loadModel("models/ships/helicopter_#.obj", 1.0);
 
-  EventHandler::getInstance()->grabEvents(true);
+  //EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;

trunk/src/world_entities/space_ships/helicopter.h

@@ -17 +17 @@
 
     Helicopter();
-    Helicopter(const char* fileName);
+    Helicopter(const std::string& fileName);
     Helicopter(const TiXmlElement* root);
     virtual ~Helicopter();

trunk/src/world_entities/space_ships/hover.cc

@@ -47 +47 @@
  * @param fileName the name of the File to load the hover from (absolute path)
  */
-Hover::Hover(const char* fileName)
+Hover::Hover(const std::string& fileName)
 {
   this->init();
@@ -54 +54 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Hover.\n", fileName);
+    PRINTF(2)("Loading file %s failed for Hover.\n", fileName.c_str());
     return;
   }

trunk/src/world_entities/space_ships/hover.h

@@ -14 +14 @@
   public:
 
-    Hover(const char* fileName);
+    Hover(const std::string& fileName);
     Hover(const TiXmlElement* root = NULL);
     virtual ~Hover();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -69 +69 @@
  * @param fileName the name of the File to load the spaceship from (absolute path)
  */
-SpaceShip::SpaceShip(const char* fileName)
+SpaceShip::SpaceShip(const std::string& fileName)
 {
   this->init();
@@ -76 +76 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for spaceship.\n", fileName);
+    PRINTF(2)("Loading file %s failed for spaceship.\n", fileName.c_str());
     return;
   }

trunk/src/world_entities/space_ships/space_ship.h

@@ -21 +21 @@
 
   public:
-    SpaceShip(const char* fileName);
+    SpaceShip(const std::string& fileName);
     SpaceShip(const TiXmlElement* root = NULL);
     virtual ~SpaceShip();

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -49 +49 @@
  * @param fileName the name of the File to load the turbine_hover from (absolute path)
  */
-TurbineHover::TurbineHover(const char* fileName)
+TurbineHover::TurbineHover(const std::string& fileName)
 {
   this->init();
@@ -56 +56 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName);
+    PRINTF(2)("Loading file %s failed for TurbineHover.\n", fileName.c_str());
     return;
   }

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -18 +18 @@
   public:
 
-    TurbineHover(const char* fileName);
+    TurbineHover(const std::string& fileName);
     TurbineHover(const TiXmlElement* root = NULL);
     virtual ~TurbineHover();

trunk/src/world_entities/terrain.cc

@@ -48 +48 @@
     this->loadParams(root);
 
-//  if (this->model != NULL)
-    //this->ssp = new SpatialSeparation((Model*)this->model, 10.0f);
+  //  if (this->model != NULL)
+  //this->ssp = new SpatialSeparation((Model*)this->model, 10.0f);
 }
 
@@ -59 +59 @@
    this either loads out of an OBJ-file, or loads a heightmap if no .obj-extension is found.
 */
-Terrain::Terrain(const char* fileName)
+Terrain::Terrain(const std::string& fileName)
 {
   this->init();
 
-  if (!strstr(fileName, ".obj") || !strstr(fileName, ".OBJ") )
-    {
-      this->loadModel(fileName);
-    }
+  if (fileName.rfind(".obj" ) != -1 || fileName.rfind(".OBJ") != -1 )
+  {
+    this->loadModel(fileName);
+  }
   else
-    {
-      // load the hightMap here.
-    }
+  {
+    // load the hightMap here.
+  }
 }
 
@@ -98 +98 @@
 
   if(this->heightMap)
-        delete heightMap;
+    delete heightMap;
 }
 
@@ -122 +122 @@
 
   LoadParam(root, "scale", this, Terrain, setScale)
-      .describe("The scale in x,y,z direction");
+  .describe("The scale in x,y,z direction");
 
   LoadParam(root, "texture", this, Terrain, loadTexture)
-      .describe("The name of the Texture for this heightMap");
+  .describe("The name of the Texture for this heightMap");
 
   LoadParam(root, "vegetation", this, Terrain, loadVegetation)
-      .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
+  .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
 
   LoadParam(root, "height-map", this, Terrain, loadHeightMap)
-      .describe("The HeightMap, splitted into two strings seperated by ','. 1: HeighMap, 2: ColorMap");
+  .describe("The HeightMap, splitted into two strings seperated by ','. 1: HeighMap, 2: ColorMap");
 
 }
@@ -140 +140 @@
 }
 
-void Terrain::loadHeightMap(const char* heightMapFile, const char* colorMap)
+void Terrain::loadHeightMap(const std::string& heightMapFile, const std::string& colorMap)
 {
   if (this->heightMap != NULL)
@@ -146 +146 @@
   this->heightMap = NULL;
 
-  char* hmName = ResourceManager::getFullName(heightMapFile);
-  char* hmColorName = ResourceManager::getFullName(colorMap);
+  std::string hmName = ResourceManager::getFullName(heightMapFile);
+  std::string hmColorName = ResourceManager::getFullName(colorMap);
 
 
   this->heightMap = new HeightMap(hmName, hmColorName);
-//   heightMap->scale(Vector(43.0f,4.7f,43.0f));
+  //   heightMap->scale(Vector(43.0f,4.7f,43.0f));
   heightMap->scale(this->terrainScale);
   heightMap->setAbsCoor(this->getAbsCoor());
   heightMap->load();
-  delete[] hmName;
-  delete[] hmColorName;
-
-}
-
-
-void Terrain::loadTexture(const char* textureName)
-{
-   PRINTF(0)("Load texture: %s\n", textureName);
-
-   heightMapMaterial->setDiffuse(1.0,1.0,1.0);
-   heightMapMaterial->setAmbient(1.0,1.0,1.0 );
-   heightMapMaterial->setSpecular(1.0,1.0,1.0);
-   heightMapMaterial->setShininess(.5);
-   heightMapMaterial->setTransparency(1.0);
-
-   heightMapMaterial->setDiffuseMap(textureName);
-   heightMapMaterial->setAmbientMap(textureName);
-   heightMapMaterial->setSpecularMap(textureName);
-}
-
-
-
-void Terrain::loadVegetation(const char* vegetationFile)
-{
-  PRINTF(0)("loadVegetation: %s\n", vegetationFile);
+}
+
+
+void Terrain::loadTexture(const std::string& textureName)
+{
+  PRINTF(4)("Load texture: %s\n", textureName.c_str());
+
+  heightMapMaterial->setDiffuse(1.0,1.0,1.0);
+  heightMapMaterial->setAmbient(1.0,1.0,1.0 );
+  heightMapMaterial->setSpecular(1.0,1.0,1.0);
+  heightMapMaterial->setShininess(.5);
+  heightMapMaterial->setTransparency(1.0);
+
+  heightMapMaterial->setDiffuseMap(textureName);
+  //   heightMapMaterial->setAmbientMap(textureName);
+  //   heightMapMaterial->setSpecularMap(textureName);
+}
+
+
+
+void Terrain::loadVegetation(const std::string& vegetationFile)
+{
+  PRINTF(4)("loadVegetation: %s\n", vegetationFile.c_str());
   if (this->vegetation)
     ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
-  if (vegetationFile != NULL)
-  {
-    PRINTF(4)("fetching %s\n", vegetationFile);
+  if (!vegetationFile.empty())
+  {
+    PRINTF(4)("fetching %s\n", vegetationFile.c_str());
     this->vegetation = dynamic_cast<Model*>(ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN));
   }
@@ -205 +202 @@
                 this->getAbsCoor ().z);
   /* rotate */
- // Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  // Vector tmpRot = this->getAbsDir().getSpacialAxis();
   //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
@@ -227 +224 @@
 
 
-/*
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glLoadIdentity();
-  Vector camera =   State::getCameraNode()->getAbsCoor(); // Go on here ..........!!!
-
-  float height =    heightMap->getHeight(camera.x, camera.z);
-
-  glEnable (GL_COLOR_MATERIAL) ;
-  glBegin(GL_QUADS);            // Draw The Cube Using quads
-  glColor3f(0.0f,1.0f,0.0f);  // Color Blue
-  glVertex3f(camera.x + 63.0f,Terrain->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
-  glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
-  glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
-  glVertex3f(camera.x+ 63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
-  glEnd();                      // End Drawing The Plan
-
-  glPopMatrix();*/
-
-
-/* THIS IS ONLY FOR DEBUGGING INFORMATION */
+  /*
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+    Vector camera =   State::getCameraNode()->getAbsCoor(); // Go on here ..........!!!
+
+    float height =    heightMap->getHeight(camera.x, camera.z);
+
+    glEnable (GL_COLOR_MATERIAL) ;
+    glBegin(GL_QUADS);            // Draw The Cube Using quads
+    glColor3f(0.0f,1.0f,0.0f);  // Color Blue
+    glVertex3f(camera.x + 63.0f,Terrain->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
+    glVertex3f(camera.x+ 63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
+    glEnd();                      // End Drawing The Plan
+
+    glPopMatrix();*/
+
+
+  /* THIS IS ONLY FOR DEBUGGING INFORMATION */
   if (this->ssp != NULL)
     this->ssp->drawQuadtree();
@@ -257 +254 @@
   // if the terrain is the Terrain of Dave
   if (debugTerrain == TERRAIN_DAVE)
-    {
-      objectList = glGenLists(1);
-      glNewList (objectList, GL_COMPILE);
-
-      glColor3f(1.0,0,0);
-
-      int sizeX = 100;
-      int sizeZ = 80;
-      float length = 1000;
-      float width = 200;
-      float widthX = float (length /sizeX);
-      float widthZ = float (width /sizeZ);
-
-      float height [sizeX][sizeZ];
-      Vector normal_vectors[sizeX][sizeZ];
-
-
-      for ( int i = 0; i<sizeX-1; i+=1)
-        for (int j = 0; j<sizeZ-1;j+=1)
-          //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
+  {
+    objectList = glGenLists(1);
+    glNewList (objectList, GL_COMPILE);
+
+    glColor3f(1.0,0,0);
+
+    int sizeX = 100;
+    int sizeZ = 80;
+    float length = 1000;
+    float width = 200;
+    float widthX = float (length /sizeX);
+    float widthZ = float (width /sizeZ);
+
+    float height [sizeX][sizeZ];
+    Vector normal_vectors[sizeX][sizeZ];
+
+
+    for ( int i = 0; i<sizeX-1; i+=1)
+      for (int j = 0; j<sizeZ-1;j+=1)
+        //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
 #ifdef __WIN32__
-          height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5;
+        height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5;
 #else
-      height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5;
+        height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5;
 #endif
 
-      //Die Huegel ein wenig glaetten
-      for (int h=1; h<2;h++)
-        for (int i=1;i<sizeX-2 ;i+=1 )
-          for(int j=1;j<sizeZ-2;j+=1)
-            height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
-
-      //Berechnung von normalen Vektoren
-      for(int i=1;i<sizeX-2;i+=1)
-        for(int j=1;j<sizeZ-2 ;j+=1)
-          {
-            Vector v1 = Vector (widthX*(1),      height[i][j],      widthZ*(j) );
-            Vector v2 = Vector (widthX*(i-1),    height[i-1][j],    widthZ*(j));
-            Vector v3 = Vector (widthX*(i),      height[i][j+1],    widthZ*(j+1));
-            Vector v4 = Vector (widthX*(i+1),    height[i+1][j],    widthZ*(j));
-            Vector v5 = Vector (widthX*(i),      height[i][j-1],    widthZ*(j-1));
-
-            Vector c1 = v2 - v1;
-            Vector c2 = v3 - v1;
-            Vector c3=  v4 - v1;
-            Vector c4 = v5 - v1;
-            Vector zero = Vector (0,0,0);
-            normal_vectors[i][j]=c1.cross(v3-v5)+c2.cross(v4-v2)+c3.cross(v5-v3)+c4.cross(v2-v4);
-            normal_vectors[i][j].normalize();
-          }
-
-      glBegin(GL_QUADS);
-      int snowheight=3;
-      for ( int i = 0; i<sizeX; i+=1)
-        for (int j = 0; j<sizeZ;j+=1)
-          {
-            Vector v1 = Vector (widthX*(i),      height[i][j]-20,       widthZ*(j)  -width/2);
-            Vector v2 = Vector (widthX*(i+1),    height[i+1][j]-20,     widthZ*(j)  -width/2);
-            Vector v3 = Vector (widthX*(i+1),    height[i+1][j+1]-20,   widthZ*(j+1)-width/2);
-            Vector v4 = Vector (widthX*(i),      height[i][j+1]-20,     widthZ*(j+1)-width/2);
-            float a[3];
-            if(height[i][j]<snowheight){
-              a[0]=0;
-              a[1]=1.0-height[i][j]/10-.3;
-              a[2]=0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            }
-            else{
-              a[0]=1.0;
-              a[1]=1.0;
-              a[2]=1.0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-
-            }
-            glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
-            glVertex3f(v1.x, v1.y, v1.z);
-            if(height[i+1][j]<snowheight){
-              a[0]=0;
-              a[1] =1.0-height[i+1][j]/10-.3;
-              a[2]=0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            }
-            else{
-              a[0]=1.0;
-              a[1]=1.0;
-              a[2]=1.0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-
-            }
-            glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
-            glVertex3f(v2.x, v2.y, v2.z);
-            if(height[i+1][j+1]<snowheight){
-              a[0]=0;
-              a[1] =1.0-height[i+1][j+1]/10-.3;
-              a[2]=0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            }
-            else{
-              a[0]=1.0;
-              a[1]=1.0;
-              a[2]=1.0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-
-
-            }
-            glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
-            glVertex3f(v3.x, v3.y, v3.z);
-            if(height[i][j+1]<snowheight){
-              a[0]=0;
-              a[1] =1.0-height[i+1][j+1]/10-.3;
-              a[2]=0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            }
-            else{
-              a[0]=1.0;
-              a[1]=1.0;
-              a[2]=1.0;
-              glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
-            }
-            glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
-            glVertex3f(v4.x, v4.y, v4.z);
-
-          }
-      glEnd();
-      glEndList();
-    }
+    //Die Huegel ein wenig glaetten
+    for (int h=1; h<2;h++)
+      for (int i=1;i<sizeX-2 ;i+=1 )
+        for(int j=1;j<sizeZ-2;j+=1)
+          height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
+
+    //Berechnung von normalen Vektoren
+    for(int i=1;i<sizeX-2;i+=1)
+      for(int j=1;j<sizeZ-2 ;j+=1)
+      {
+        Vector v1 = Vector (widthX*(1),      height[i][j],      widthZ*(j) );
+        Vector v2 = Vector (widthX*(i-1),    height[i-1][j],    widthZ*(j));
+        Vector v3 = Vector (widthX*(i),      height[i][j+1],    widthZ*(j+1));
+        Vector v4 = Vector (widthX*(i+1),    height[i+1][j],    widthZ*(j));
+        Vector v5 = Vector (widthX*(i),      height[i][j-1],    widthZ*(j-1));
+
+        Vector c1 = v2 - v1;
+        Vector c2 = v3 - v1;
+        Vector c3=  v4 - v1;
+        Vector c4 = v5 - v1;
+        Vector zero = Vector (0,0,0);
+        normal_vectors[i][j]=c1.cross(v3-v5)+c2.cross(v4-v2)+c3.cross(v5-v3)+c4.cross(v2-v4);
+        normal_vectors[i][j].normalize();
+      }
+
+    glBegin(GL_QUADS);
+    int snowheight=3;
+    for ( int i = 0; i<sizeX; i+=1)
+      for (int j = 0; j<sizeZ;j+=1)
+      {
+        Vector v1 = Vector (widthX*(i),      height[i][j]-20,       widthZ*(j)  -width/2);
+        Vector v2 = Vector (widthX*(i+1),    height[i+1][j]-20,     widthZ*(j)  -width/2);
+        Vector v3 = Vector (widthX*(i+1),    height[i+1][j+1]-20,   widthZ*(j+1)-width/2);
+        Vector v4 = Vector (widthX*(i),      height[i][j+1]-20,     widthZ*(j+1)-width/2);
+        float a[3];
+        if(height[i][j]<snowheight)
+        {
+          a[0]=0;
+          a[1]=1.0-height[i][j]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else
+        {
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+
+        }
+        glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
+        glVertex3f(v1.x, v1.y, v1.z);
+        if(height[i+1][j]<snowheight)
+        {
+          a[0]=0;
+          a[1] =1.0-height[i+1][j]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else
+        {
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+
+        }
+        glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
+        glVertex3f(v2.x, v2.y, v2.z);
+        if(height[i+1][j+1]<snowheight)
+        {
+          a[0]=0;
+          a[1] =1.0-height[i+1][j+1]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else
+        {
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+
+
+        }
+        glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
+        glVertex3f(v3.x, v3.y, v3.z);
+        if(height[i][j+1]<snowheight)
+        {
+          a[0]=0;
+          a[1] =1.0-height[i+1][j+1]/10-.3;
+          a[2]=0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        else
+        {
+          a[0]=1.0;
+          a[1]=1.0;
+          a[2]=1.0;
+          glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+        }
+        glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
+        glVertex3f(v4.x, v4.y, v4.z);
+
+      }
+    glEnd();
+    glEndList();
+  }
 
   if (debugTerrain == TERRAIN_BENSCH)
-    {
-      /*
-        this->model = (OBJModel*) new Model();
-      this->model->setName("CUBE");
-      this->model->addVertex (-0.5, -0.5, 0.5);
-      this->model->addVertex (0.5, -0.5, 0.5);
-      this->model->addVertex (-0.5, 0.5, 0.5);
-      this->model->addVertex (0.5, 0.5, 0.5);
-      this->model->addVertex (-0.5, 0.5, -0.5);
-      this->model->addVertex (0.5, 0.5, -0.5);
-      this->model->addVertex (-0.5, -0.5, -0.5);
-      this->model->addVertex (0.5, -0.5, -0.5);
-
-      this->model->addVertexTexture (0.0, 0.0);
-      this->model->addVertexTexture (1.0, 0.0);
-      this->model->addVertexTexture (0.0, 1.0);
-      this->model->addVertexTexture (1.0, 1.0);
-      this->model->addVertexTexture (0.0, 2.0);
-      this->model->addVertexTexture (1.0, 2.0);
-      this->model->addVertexTexture (0.0, 3.0);
-      this->model->addVertexTexture (1.0, 3.0);
-      this->model->addVertexTexture (0.0, 4.0);
-      this->model->addVertexTexture (1.0, 4.0);
-      this->model->addVertexTexture (2.0, 0.0);
-      this->model->addVertexTexture (2.0, 1.0);
-      this->model->addVertexTexture (-1.0, 0.0);
-      this->model->addVertexTexture (-1.0, 1.0);
-
-      this->model->finalize();
-      */
-    }
+  {
+    /*
+      this->model = (OBJModel*) new Model();
+    this->model->setName("CUBE");
+    this->model->addVertex (-0.5, -0.5, 0.5);
+    this->model->addVertex (0.5, -0.5, 0.5);
+    this->model->addVertex (-0.5, 0.5, 0.5);
+    this->model->addVertex (0.5, 0.5, 0.5);
+    this->model->addVertex (-0.5, 0.5, -0.5);
+    this->model->addVertex (0.5, 0.5, -0.5);
+    this->model->addVertex (-0.5, -0.5, -0.5);
+    this->model->addVertex (0.5, -0.5, -0.5);
+
+    this->model->addVertexTexture (0.0, 0.0);
+    this->model->addVertexTexture (1.0, 0.0);
+    this->model->addVertexTexture (0.0, 1.0);
+    this->model->addVertexTexture (1.0, 1.0);
+    this->model->addVertexTexture (0.0, 2.0);
+    this->model->addVertexTexture (1.0, 2.0);
+    this->model->addVertexTexture (0.0, 3.0);
+    this->model->addVertexTexture (1.0, 3.0);
+    this->model->addVertexTexture (0.0, 4.0);
+    this->model->addVertexTexture (1.0, 4.0);
+    this->model->addVertexTexture (2.0, 0.0);
+    this->model->addVertexTexture (2.0, 1.0);
+    this->model->addVertexTexture (-1.0, 0.0);
+    this->model->addVertexTexture (-1.0, 1.0);
+
+    this->model->finalize();
+    */
+  }
 }
 
@@ -453 +458 @@
 
 void Terrain::writeDebug( ) const
-{
-}
+  {}
 
 void Terrain::readDebug( ) const
-{
-}
+  {}
 
 float Terrain::getHeight(float x, float y)
 {
-        if(this->heightMap != NULL)
-                return (this->heightMap->getHeight(x, y));
-        return 0;
-}
+  if(this->heightMap != NULL)
+    return (this->heightMap->getHeight(x, y));
+  return 0;
+}

trunk/src/world_entities/terrain.h

@@ -29 +29 @@
  public:
   Terrain(const TiXmlElement* root = NULL);
-  Terrain(const char* fileName);
+  Terrain(const std::string& fileName);
   Terrain(DebugTerrain debugTerrain);
   virtual ~Terrain();
@@ -41 +41 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadVegetation(const char* vegetationFile);
+  void loadVegetation(const std::string& vegetationFile);
 
-  void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
-  void loadTexture(const char* textureName);
+  void loadHeightMap(const std::string& heightMapFile, const std::string& colorMap);
+  void loadTexture(const std::string& textureName);
   void setScale(float x, float y, float z);
 

trunk/src/world_entities/weapons/aim.cc

@@ -147 +147 @@
  * @param textureFile The texture-file to load onto the crosshair
  */
-void Aim::setTexture(const char* textureFile)
+void Aim::setTexture(const std::string& textureFile)
 {
   this->material->setDiffuseMap(textureFile);

trunk/src/world_entities/weapons/aim.h

@@ -46 +46 @@
 
   void setSize(float size);
-  void setTexture(const char* textureFile);
+  void setTexture(const std::string& textureFile);
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   inline void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -168 +168 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->getModel()->draw();
+  if (this->getModel())
+    this->getModel()->draw();
   glPopMatrix();
 }

trunk/src/world_entities/weapons/crosshair.cc

@@ -79 +79 @@
   EventListener::loadParams(root);
 
-  LoadParam(root, "texture", this, Crosshair, setTexture)
+  LoadParam(root, "texture", this->material, Material, setDiffuseMap)
       .describe("the texture-file to load onto the Crosshair");
 
@@ -103 +103 @@
  * @param textureFile The texture-file to load onto the crosshair
  */
-void Crosshair::setTexture(const char* textureFile)
+void Crosshair::setTexture(const std::string& textureFile)
 {
   this->material->setDiffuseMap(textureFile);

trunk/src/world_entities/weapons/crosshair.h

@@ -31 +31 @@
 
   void setSize(float size);
-  void setTexture(const char* textureFile);
+  void setTexture(const std::string& textureFile);
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };

trunk/src/world_entities/weapons/weapon.cc

@@ -165 +165 @@
  * @param projectile the Name of the Projectile.
  */
-void Weapon::setProjectileTypeC(const char* projectile)
-{
-  if (projectile == NULL)
-    return;
+void Weapon::setProjectileTypeC(const std::string& projectile)
+{
   FastFactory* tmpFac = FastFactory::searchFastFactory(projectile);
   if (tmpFac != NULL)
@@ -176 +174 @@
   else
   {
-    PRINTF(1)("Projectile %s does not exist for weapon %s\n", projectile, this->getName());
+    PRINTF(1)("Projectile %s does not exist for weapon %s\n", projectile.c_str(), this->getName());
   }
 }
@@ -232 +230 @@
  * @param soundFile the soundFile's relative position to the data-directory (will be looked for by the ResourceManager)
  */
-void Weapon::setActionSound(WeaponAction action, const char* soundFile)
+void Weapon::setActionSound(WeaponAction action, const std::string& soundFile)
 {
   if (action >= WA_ACTION_COUNT)
@@ -239 +237 @@
     ResourceManager::getInstance()->unload(this->soundBuffers[action]);
 
-  else if (soundFile != NULL)
+  else if (!soundFile.empty())
   {
     this->soundBuffers[action] = (SoundBuffer*)ResourceManager::getInstance()->load(soundFile, WAV);
     if (this->soundBuffers[action] != NULL)
     {
-      PRINTF(4)("Loaded sound %s to action %s.\n", soundFile, actionToChar(action));
+      PRINTF(4)("Loaded sound %s to action %s.\n", soundFile.c_str(), actionToChar(action));
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action));
+      PRINTF(2)("Failed to load sound %s to %s.\n.", soundFile.c_str(), actionToChar(action));
     }
   }
@@ -613 +611 @@
  * @return The Action if known, WA_NONE otherwise.
  */
-WeaponAction Weapon::charToAction(const char* action)
-{
-  if (!strcmp(action, "none"))
+WeaponAction Weapon::charToAction(const std::string& action)
+{
+  if (action == "none")
     return WA_NONE;
-  else if (!strcmp(action, "shoot"))
+  else if (action == "shoot")
     return WA_SHOOT;
-  else if (!strcmp(action, "charge"))
+  else if (action == "charge")
     return WA_CHARGE;
-  else if (!strcmp(action, "reload"))
+  else if (action == "reload")
     return WA_RELOAD;
-  else if (!strcmp(action, "acitvate"))
+  else if (action == "acitvate")
     return WA_ACTIVATE;
-  else if (!strcmp(action, "deactivate"))
+  else if (action == "deactivate")
     return WA_DEACTIVATE;
-  else if (!strcmp(action, "special1"))
+  else if (action == "special1")
     return WA_SPECIAL1;
   else
   {
-    PRINTF(2)("action %s could not be identified.\n", action);
+    PRINTF(2)("action %s could not be identified.\n", action.c_str());
     return WA_NONE;
   }
@@ -674 +672 @@
  * @return The State if known, WS_NONE otherwise.
  */
-WeaponState Weapon::charToState(const char* state)
-{
-  if (!strcmp(state, "none"))
+WeaponState Weapon::charToState(const std::string& state)
+{
+  if (state == "none")
     return WS_NONE;
-  else if (!strcmp(state, "shooting"))
+  else if (state == "shooting")
     return WS_SHOOTING;
-  else if (!strcmp(state, "charging"))
+  else if (state == "charging")
     return WS_CHARGING;
-  else if (!strcmp(state, "reloading"))
+  else if (state == "reloading")
     return WS_RELOADING;
-  else if (!strcmp(state, "activating"))
+  else if (state == "activating")
     return WS_ACTIVATING;
-  else if (!strcmp(state, "deactivating"))
+  else if (state == "deactivating")
     return WS_DEACTIVATING;
-  else if (!strcmp(state, "inactive"))
+  else if (state == "inactive")
     return WS_INACTIVE;
-  else if (!strcmp(state, "idle"))
+  else if (state == "idle")
     return WS_IDLE;
   else
   {
-    PRINTF(2)("state %s could not be identified.\n", state);
+    PRINTF(2)("state %s could not be identified.\n", state.c_str());
     return WS_NONE;
   }

trunk/src/world_entities/weapons/weapon.h

@@ -111 +111 @@
     inline long getCapability() const { return this->capability; };
     void setProjectileType(ClassID projectile);
-    void setProjectileTypeC(const char* projectile);
+    void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectileType() { return this->projectile; };
@@ -132 +132 @@
     // STATE CHANGES //
     /** @param state the State to time @param duration the duration of the State */
-    inline void setStateDuration(const char* state, float duration) { setStateDuration(charToState(state), duration); };
+    inline void setStateDuration(const std::string& state, float duration) { setStateDuration(charToState(state), duration); };
     /** @param state the State to time @param duration the duration of the State */
     inline void setStateDuration(WeaponState state, float duration) { /*(state < WS_STATE_COUNT)?*/this->times[state] = duration; };
@@ -148 +148 @@
     inline void setAmmoContainer(const CountPointer<AmmoContainer>& ammoContainer) { this->ammoContainer = ammoContainer;}
 
-    void setActionSound(WeaponAction action, const char* soundFile);
-    /** @see void setActionSound(WeaponAction action, const char* soundFile); */
-    void setActionSound(const char* action, const char* soundFile) { this->setActionSound(charToAction(action), soundFile); };
+    void setActionSound(WeaponAction action, const std::string& soundFile);
+    /** @see void setActionSound(WeaponAction action, const std::string& soundFile); */
+    void setActionSound(const std::string& action, const std::string& soundFile) { this->setActionSound(charToAction(action), soundFile); };
 
     Animation3D* getAnimation(WeaponState state, PNode* node = NULL);
@@ -176 +176 @@
 
     // utility:
-    static WeaponAction  charToAction(const char* action);
+    static WeaponAction  charToAction(const std::string& action);
     static const char*   actionToChar(WeaponAction action);
-    static WeaponState   charToState(const char* state);
+    static WeaponState   charToState(const std::string& state);
     static const char*   stateToChar(WeaponState state);
 

trunk/src/world_entities/world_entity.cc

@@ -61 +61 @@
   this->bCollide = true;
 
-  this->md2TextureFileName = NULL;
-
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
@@ -120 +118 @@
  * @param fileName the name of the model to load
  * @param scaling the Scaling of the model
- *
- * @todo fix this, so it only has one loadModel-Function.
-*/
-void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
+ */
+void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
 {
   this->modelLODName = fileName;
   this->scaling = scaling;
-  if ( fileName != NULL && strcmp(fileName, "") )
+  if (!fileName.empty())
   {
     // search for the special character # in the LoadParam
-    if (strchr(fileName, '#') != NULL)
-    {
-      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-      char* lodFile = new char[strlen(fileName)+1];
-      strcpy(lodFile, fileName);
-      char* depth = strchr(lodFile, '#');
+    if (fileName.find('#') != std::string::npos)
+    {
+      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName.c_str());
+      std::string lodFile = fileName;
+      unsigned int offset = lodFile.find('#');
       for (unsigned int i = 0; i < 3; i++)
       {
-        *depth = 48+(int)i;
+        lodFile[offset] = 48+(int)i;
         if (ResourceManager::isInDataDir(lodFile))
           this->loadModel(lodFile, scaling, i);
@@ -149 +144 @@
       this->scaling = 1.0;
     }
-    if(strstr(fileName, ".obj"))
-    {
-      PRINTF(4)("fetching OBJ file: %s\n", fileName);
+    if(fileName.find(".obj") != std::string::npos)
+    {
+      PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
       BaseObject* loadedModel = ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling);
       if (loadedModel != NULL)
         this->setModel(dynamic_cast<Model*>(loadedModel), modelNumber);
+      else
+        PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
 
       if( modelNumber == 0)
         this->buildObbTree(4);
     }
-    else if(strstr(fileName, ".md2"))
-    {
-      PRINTF(4)("fetching MD2 file: %s\n", fileName);
+    else if(fileName.find(".md2") != std::string::npos)
+    {
+      PRINTF(4)("fetching MD2 file: %s\n", fileName.c_str());
       Model* m = new MD2Model(fileName, this->md2TextureFileName, this->scaling);
       //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
@@ -575 +572 @@
     char* name = (char*)(getModel( 0 )->getName());
 
-    if ( strstr(name, ResourceManager::getInstance()->getDataDir()) )
-    {
-      name += strlen(ResourceManager::getInstance()->getDataDir());
+    if (  ResourceManager::getInstance()->getDataDir() == name ) /// FIXME (do not know what to do here.)
+    {
+      name += ResourceManager::getInstance()->getDataDir().size();
     }
 

trunk/src/world_entities/world_entity.h

@@ -36 +36 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadModel(const char* fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
+  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
-  inline void loadMD2Texture(const char* fileName) { this->md2TextureFileName = fileName; }
+  inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
 
   bool buildObbTree(unsigned int depth);
@@ -113 +113 @@
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
-  const char*             md2TextureFileName; //!< the file name of the md2 model texture, only if this
-  const char*             modelLODName;       //!< the name of the model lod file
+  std::string             md2TextureFileName; //!< the file name of the md2 model texture, only if this
+  std::string             modelLODName;       //!< the name of the model lod file
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection