Changeset 7207 in orxonox.OLD for branches/std/src/lib

Timestamp:

Mar 9, 2006, 11:35:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: evil was within

Location:

branches/std/src/lib

Files:

• graphics/importer/md2Model.cc (modified) (1 diff)
• graphics/text_engine/text.cc (modified) (4 diffs)
• graphics/text_engine/text.h (modified) (1 diff)
• shell/shell_input.cc (modified) (1 diff)
• sound/sound_engine.cc (modified) (1 diff)
• sound/sound_engine.h (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)

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

@@ -79 +79 @@
   this->setClassID(CL_MD2_MODEL, "MD2Model");
   /* this creates the data container via ressource manager */
-  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName, scale);
+  if (!modelFileName.empty())
+    this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName, scale);
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");

branches/std/src/lib/graphics/text_engine/text.cc

@@ -32 +32 @@
  * @param type The renderType to display this font in
  */
-Text::Text(const char* fontFile, unsigned int textSize)
+Text::Text(const std::string& fontFile, unsigned int textSize)
 {
   this->init();
 
-  if (fontFile != NULL)
+  if (!fontFile.empty())
     this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
   this->setSizeY2D(textSize);
@@ -78 +78 @@
  * @param fontSize the Size of the Font
  */
-void Text::setFont(const char* fontFile, unsigned int fontSize)
+void Text::setFont(const std::string& fontFile, unsigned int fontSize)
 {
   Font* tmpFont;
@@ -90 +90 @@
 
   // load a new Font
-  if (fontFile != NULL)
+  if (!fontFile.empty())
   {
     tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
@@ -96 +96 @@
       this->font = tmpFont;
     else
-      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
+      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
   }
 }

branches/std/src/lib/graphics/text_engine/text.h

@@ -39 +39 @@
 {
   public:
-    Text(const char* fontFile = NULL, unsigned int fontSize = TEXT_DEFAULT_SIZE);
+    Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);
     virtual ~Text();
     void init();
 
-    void setFont(const char* fontFile, unsigned int renderSize);
+    void setFont(const std::string& fontFile, unsigned int renderSize);
 
     void setText(const char* text, bool isExtern = false);

branches/std/src/lib/shell/shell_input.cc

@@ -41 +41 @@
  * this also generates a ShellCompletion automatically.
 */
-ShellInput::ShellInput () : Text ((const char*)NULL)
+ShellInput::ShellInput () : Text ("")
 {
   this->pressedKey = SDLK_FIRST;

branches/std/src/lib/sound/sound_engine.cc

@@ -117 +117 @@
    acctualy this is nothing more than a wrapper around the ResourceManager.
 */
-SoundSource* SoundEngine::createSource(const char* fileName, PNode* sourceNode)
+SoundSource* SoundEngine::createSource(const std::string& fileName, PNode* sourceNode)
 {
   return new SoundSource(sourceNode, (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL));

branches/std/src/lib/sound/sound_engine.h

@@ -33 +33 @@
     void loadSettings(IniParser* iniParser);
 
-    SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
+    SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);
 
     /** @param listener the listener in the scene */

branches/std/src/lib/util/loading/resource_manager.cc

@@ -486 +486 @@
         {
           tmpResource->param[0] = param0;
-          tmpResource->pointer = new Shader(fullName, NULL);
+          tmpResource->pointer = new Shader(fullName, "");
         }
       }