Changeset 9824 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.cc

Timestamp:

Sep 26, 2006, 12:43:56 AM (18 years ago)

Author:

bensch

Message:

first try to make the MD2-model a Resource… it looks quite funny… seems like everything gets loaded, but totally wrong

File:

• branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.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/md2/resource_md2.cc

@@ -1 +1 @@
 
-#include "resource_texture.h"
+#include "resource_md2.h"
 #include "substring.h"
 #include "multi_type.h"
@@ -6 +6 @@
 
 
-ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale)
+    : NewResource(&ResourceMD2::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  Resources::StorePointer* ptr = this->acquireResource(loadString(modelName, skinName, scale));
 
   if (ptr)
   {
-    PRINTF(5)("FOUNT TEXTURE: %s\n", imageName.c_str());
-    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND MD2: %s\n", modelName.c_str());
+    this->acquireData(static_cast<ResourceMD2::MD2ResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUNT TEXTURE: %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()));
+    PRINTF(5)("NOT FOUND MD2: %s\n", modelName.c_str());
+    std::string modelFileName = this->NewResource::locateFile(modelName);
+    std::string skinFileName = this->NewResource::locateFile(skinName);
+    this->MD2Model::load(modelFileName, skinFileName, scale);
+    this->NewResource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), Resources::KeepLevel(0), this->MD2Model::dataPointer()));
   }
+
 }
 
-ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
+ResourceMD2 ResourceMD2::createFromString(const std::string& loadString)
 {
   SubString loadValues(loadString, ',');
-  std::string imageName;
-  GLenum target = GL_TEXTURE_2D;
+  std::string modelName;
+  std::string skinName;
+  float scale = 1.0f;
   if (loadValues.size() > 0)
-    imageName = loadValues[0];
+    modelName = loadValues[0];
   if (loadValues.size() > 1)
-    target = (GLenum)MultiType(loadValues[2]).getInt();
+    skinName = loadValues[1];
+  if (loadValues.size() > 2)
+    scale = MultiType(loadValues[2]).getFloat();
 
-  return ResourceTexture(imageName, target);
+  return ResourceMD2(modelName, skinName, scale);
+}
+
+std::string ResourceMD2::loadString(const std::string& modelName, const std::string& skinName, float scale)
+{
+  return modelName + ',' + skinName + ',' + MultiType(scale).getString();
 }
 
 
-
-Resources::tType<ResourceTexture> ResourceTexture::type("Texture");
+Resources::tType<ResourceMD2> ResourceMD2::type("MD2");
 
 
@@ -46 +55 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data)
+ResourceMD2::MD2ResourcePointer::MD2ResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const MD2Data::Pointer& data)
     : Resources::StorePointer(loadString, keepLevel) , pointer(data)
 {}