Changeset 9863 in orxonox.OLD for branches/new_class_id/src/lib

Timestamp:

Oct 2, 2006, 4:53:38 PM (18 years ago)

Author:

bensch

Message:

less debug output

Location:

branches/new_class_id/src/lib

Files:

• collision_reaction/collision_handle.h (modified) (1 diff)
• graphics/importer/material.cc (modified) (1 diff)
• graphics/importer/material.h (modified) (1 diff)
• graphics/importer/md2/md2Model.cc (modified) (1 diff)
• graphics/importer/objModel.cc (modified) (2 diffs)
• graphics/text_engine/resource_font.cc (modified) (1 diff)

branches/new_class_id/src/lib/collision_reaction/collision_handle.h

@@ -64 +64 @@
 
     std::vector<Collision*>       collisionList;           //!< a list full of collisions
+    /// TODO Take a std::set here!
     std::vector<ClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
 

branches/new_class_id/src/lib/graphics/importer/material.cc

@@ -261 +261 @@
 }
 
-
-
-/**
- * @brief Adds a Texture Path to the List of already existing Paths
- * @param pathName The Path to add.
-*/
-void Material::addTexturePath(const std::string& pathName)
-{
-  printf("HUPS\n");
-  //ResourceManager::getInstance()->addImageDir(pathName);
-}
 
 /**

branches/new_class_id/src/lib/graphics/importer/material.h

@@ -67 +67 @@
   const Texture& diffuseTexture(unsigned int i = 0) const { return this->textures[i]; };
 
-  static void addTexturePath(const std::string& pathName);
-
   static const std::string& blendFuncToString(GLenum blendFunc);
   static GLenum stringToBlendFunc(const std::string& blendFuncString);

branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc

@@ -92 +92 @@
   rebuildInfo();
 
-  this->debug();
+  //this->debug();
 }
 

branches/new_class_id/src/lib/graphics/importer/objModel.cc

@@ -19 +19 @@
 
 #include <string.h>
+#include "loading/resource_manager.h"
 
 #define PARSELINELENGTH 8192
@@ -76 +77 @@
   else
     this->objPath = "./";
-  Material::addTexturePath(this->objPath);
+  Resources::ResourceManager::getInstance()->addResourcePath("Texture", this->objPath);
 
   this->readFromObjFile (fileName);

branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc

@@ -21 +21 @@
     PRINTF(5)("NOT FOUND FONT: %s\n", fontName.c_str());
     std::string fileName = this->Resource::locateFile(fontName);
-
-    printf("FONTFILE %s TO %s\n", fontName.c_str(), fileName.c_str());
 
     this->Font::loadFontFromTTF(fileName, renderSize);