Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/objModel.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/objModel.cc (modified) (4 diffs)

trunk/src/lib/graphics/importer/objModel.cc

@@ -18 +18 @@
 #include "objModel.h"
 
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include "loading/resource_manager.h"
 
 #define PARSELINELENGTH 8192
@@ -27 +26 @@
 #include "compiler.h"
 
+ObjectListDefinition(OBJModel);
 /**
  * @brief Crates a 3D-Model, loads in a File and scales it.
@@ -35 +35 @@
   : StaticModel(fileName)
 {
-  this->setClassID(CL_OBJ_MODEL, "OBJModel");
+  this->registerObject(this, OBJModel::_objectList);
 
   this->objPath = "./";
 
-  this->scaleFactor = scaling;
+  this->setScaleFactor(scaling);
 
   this->importFile (fileName);
@@ -77 +77 @@
   else
     this->objPath = "./";
-  Material::addTexturePath(this->objPath);
+  Resources::ResourceManager::getInstance()->addResourcePath("Texture", this->objPath);
 
   this->readFromObjFile (fileName);