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

Timestamp:

Mar 10, 2006, 1:56:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/std: less evil

Location:

branches/std/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (1 diff)
• media_container.cc (modified) (3 diffs)
• media_container.h (modified) (1 diff)
• movie_player.cc (modified) (1 diff)

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

@@ -513 +513 @@
     }
 
-  this->skinFileName =fileName;
+  this->skinFileName = fileName;
 
   this->material.setName("md2ModelMaterial");

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

@@ -34 +34 @@
  * Default constructor
  */
-MediaContainer::MediaContainer(const char* filename)
+MediaContainer::MediaContainer(const std::string& filename)
 {
   // set the class id for the base object
@@ -41 +41 @@
   fps = 0;
   mediaLoaded = false;
-
-  this->loadMedia(filename);
+  if (!filename.empty())
+    this->loadMedia(filename);
 }
 
@@ -84 +84 @@
 }
 
-bool MediaContainer::loadMedia(const char* filename)
+bool MediaContainer::loadMedia(const std::string& filename)
 {
   this->unloadMedia();
 
-  if(filename == NULL)
+  if(filename.empty())
     return false;
   // check whether file exists
   if(!ResourceManager::isInDataDir(filename))
   {
-    PRINTF(1)("Could not find %s\n", filename);
+    PRINTF(1)("Could not find %s\n", filename.c_str());
     return false;
   }

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

@@ -44 +44 @@
 public:
 
-  MediaContainer(const char* filename = NULL);
+  MediaContainer(const std::string& filename = NULL);
   virtual ~MediaContainer();
 
-  bool loadMedia(const char* filename);
+  bool loadMedia(const std::string& filename);
   void loadFrames();
 

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

@@ -42 +42 @@
   mediaLoaded = false;
 
-  this->loadMovie(filename);
-
+  if (!filename.empty())
+    this->loadMovie(filename);
 }