Changeset 7218 in orxonox.OLD for branches/std/src/lib/graphics

Timestamp:

Mar 12, 2006, 3:00:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/std:: more strings

Location:

branches/std/src/lib/graphics

Files:

• effects/lense_flare.cc (modified) (1 diff)
• effects/lense_flare.h (modified) (1 diff)
• importer/static_model.cc (modified) (1 diff)
• importer/texture_sequence.cc (modified) (1 diff)
• importer/texture_sequence.h (modified) (1 diff)

branches/std/src/lib/graphics/effects/lense_flare.cc

@@ -131 +131 @@
  * @param mode the mode character
  */
-GLint LenseFlare::charToFogMode(const char* mode)
+GLint LenseFlare::stringToFogMode(const std::string& mode)
 {}
 

branches/std/src/lib/graphics/effects/lense_flare.h

@@ -43 +43 @@
 
   private:
-    GLint charToFogMode(const char* mode);
+    GLint stringToFogMode(const std::string& mode);
     void setSourceVisibility(bool visibility) ;
 

branches/std/src/lib/graphics/importer/static_model.cc

@@ -499 +499 @@
  * String is different from the argument addFace,
  * in this, that the first Vertex/Normal/Texcoord is 1 instead of 0
+ *
+ * @TODO make it std::string conform
  */
 bool StaticModel::addFace (const std::string& faceStringInput)

branches/std/src/lib/graphics/importer/texture_sequence.cc

@@ -124 +124 @@
  * @returns true on success
  */
-bool TextureSequence::addFrame(const char* imageName)
+bool TextureSequence::addFrame(const std::string& imageName)
 {
-  if (imageName == NULL)
-    return false;
-
-  SDL_Surface* addSurface = IMG_Load(imageName);
+  SDL_Surface* addSurface = IMG_Load(imageName.c_str());
   bool success = this->addFrame(addSurface);
   delete addSurface;

branches/std/src/lib/graphics/importer/texture_sequence.h

@@ -23 +23 @@
     bool loadImageSeries(unsigned int count, ...);
     bool loadImageSeries(unsigned int count, va_list textureNames);
-    bool addFrame(const char* image);
+    bool addFrame(const std::string& image);
     bool addFrame(SDL_Surface* surface);
     bool addFrame(GLuint texture);