Changeset 9831 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/resource_obj.cc

Timestamp:

Sep 26, 2006, 3:18:28 PM (18 years ago)

Author:

bensch

Message:

added resource_obj for new resource managed obj-loader

File:

• branches/new_class_id/src/lib/graphics/importer/resource_obj.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.cc) (3 diffs)

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

@@ -1 +1 @@
 
-#include "resource_texture.h"
+#include "resource_obj.h"
 #include "substring.h"
 #include "multi_type.h"
@@ -6 +6 @@
 
 
-ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling)
+    : NewResource(&ResourceOBJ::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + MultiType(scaling).getString());
 
   if (ptr)
   {
-    PRINTF(5)("FOUNT TEXTURE: %s\n", imageName.c_str());
-    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND OBJ: %s\n", imageName.c_str());
+    this->acquireData(static_cast<ResourceOBJ::OBJResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUNT TEXTURE: %s\n", imageName.c_str());
+    PRINTF(5)("NOT FOUND OBJ: %s\n", imageName.c_str());
     std::string fileName = this->NewResource::locateFile(imageName);
-    this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Texture::dataPointer()));
+    this->acquireData(OBJModel(fileName, scaling).dataPointer());
+    this->NewResource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
   }
 }
 
-ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
+ResourceOBJ ResourceOBJ::createFromString(const std::string& loadString)
 {
   SubString loadValues(loadString, ',');
   std::string imageName;
-  GLenum target = GL_TEXTURE_2D;
+  float scaling = 1.0f;
   if (loadValues.size() > 0)
     imageName = loadValues[0];
   if (loadValues.size() > 1)
-    target = (GLenum)MultiType(loadValues[2]).getInt();
+    scaling = (GLenum)MultiType(loadValues[2]).getFloat();
 
-  return ResourceTexture(imageName, target);
+  return ResourceOBJ(imageName, scaling);
 }
 
 
 
-Resources::tType<ResourceTexture> ResourceTexture::type("Texture");
+Resources::tType<ResourceOBJ> ResourceOBJ::type("OBJ");
 
 
@@ -46 +46 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data)
+ResourceOBJ::OBJResourcePointer::OBJResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const StaticModelData::Pointer& data)
     : Resources::StorePointer(loadString, keepLevel) , pointer(data)
 {}