Changeset 9831 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

added resource_obj for new resource managed obj-loader

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• objModel.cc (modified) (1 diff)
• objModel.h (modified) (1 diff)
• resource_obj.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.cc) (3 diffs)
• resource_obj.h (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.h) (1 diff)
• resource_texture.cc (modified) (1 diff)
• static_model.h (modified) (2 diffs)

branches/new_class_id/src/lib/graphics/importer/Makefile.am

@@ -13 +13 @@
                 static_model_data.cc \
                 objModel.cc \
+                resource_obj.cc \
                 primitive_model.cc \
                 height_map.cc \
@@ -60 +61 @@
                 static_model_data.h \
                 objModel.h \
+                resource_obj.h \
                 primitive_model.h \
                 anorms.h \

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

@@ -18 +18 @@
 #include "objModel.h"
 
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 
 #define PARSELINELENGTH 8192

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

@@ -13 +13 @@
 {
   ObjectListDeclaration(OBJModel);
-  public:
-   OBJModel(const std::string& fileName, float scaling = 1.0);
+public:
+  OBJModel(const std::string& fileName, float scaling = 1.0);
   virtual ~OBJModel();
 
- private:
+private:
   ///// readin /////
-   bool importFile (const std::string& fileName);
-   bool readFromObjFile (const std::string& fileName);
-   bool readMtlLib (const std::string& matFile);
+  bool importFile (const std::string& fileName);
+  bool readFromObjFile (const std::string& fileName);
+  bool readMtlLib (const std::string& matFile);
 
-  private:
-   void setIllum (Material* material, const char* illum);
-   void setDiffuse (Material* material, const char* rgb);
-   void setAmbient (Material* material, const char* rgb);
-   void setSpecular (Material* material, const char* rgb);
-   void setShininess (Material* material, const char* shini);
-   void setTransparency (Material* material, const char* trans);
+private:
+  void setIllum (Material* material, const char* illum);
+  void setDiffuse (Material* material, const char* rgb);
+  void setAmbient (Material* material, const char* rgb);
+  void setSpecular (Material* material, const char* rgb);
+  void setShininess (Material* material, const char* shini);
+  void setTransparency (Material* material, const char* trans);
 
- private:
-   std::string       objPath;     //!< The Path where the obj and mtl-file are located.
+private:
+  std::string       objPath;     //!< The Path where the obj and mtl-file are located.
 };
 

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)
 {}

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

@@ -1 +1 @@
 /*!
- * @file resource_texture.h
- * @brief Contains the ResourceTexture class, that handles the Resource-specific loading part of the Texture.
+ * @file resource_obj.h
+ * @brief Contains the ResourceOBJ class, that handles the Resource-specific loading part of the OBJ.
  *
  */
 
-#ifndef _RESOURCE_TEXTURE_H
-#define _RESOURCE_TEXTURE_H
+#ifndef _RESOURCE_OBJ_H
+#define _RESOURCE_OBJ_H
 
 #include "util/loading/resource.h"
-#include "texture.h"
+#include "objModel.h"
 
-
-class ResourceTexture : public Texture, public Resources::NewResource
+class ResourceOBJ : public StaticModel, public Resources::NewResource
 {
 public:
-  ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
-  static ResourceTexture createFromString(const std::string& loadString);
+  ResourceOBJ(const std::string& imageName, float scaling = 1.0f);
+  static ResourceOBJ createFromString(const std::string& loadString);
 
 private:
-class TextureResourcePointer : public Resources::StorePointer
+class OBJResourcePointer : public Resources::StorePointer
   {
   public:
-    TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
-    inline const TextureData::Pointer& ptr() const { return pointer; }
+    OBJResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const StaticModelData::Pointer& data);
+    inline const StaticModelData::Pointer& ptr() const { return pointer; }
 private:
-    TextureData::Pointer pointer;
+    StaticModelData::Pointer pointer;
   };
 
 private:
-  static Resources::tType<ResourceTexture> type;
+  static Resources::tType<ResourceOBJ> type;
 };
 
 
-#endif /* _RESOURCE_TEXTURE_H */
+#endif /* _RESOURCE_OBJ_H */

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

@@ -13 +13 @@
   if (ptr)
   {
-    PRINTF(5)("FOUNT TEXTURE: %s\n", imageName.c_str());
+    PRINTF(5)("FOUND TEXTURE: %s\n", imageName.c_str());
     this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUNT TEXTURE: %s\n", imageName.c_str());
+    PRINTF(5)("NOT FOUND TEXTURE: %s\n", imageName.c_str());
     std::string fileName = this->NewResource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);

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

@@ -28 +28 @@
   virtual ~StaticModel();
 
+  StaticModel& operator=(const StaticModel& model) { this->data = model.data; return *this; };
+
   virtual void draw() const { data->draw(); };
   void draw(int groupNumber) const { data->draw(groupNumber); };
@@ -56 +58 @@
   void finalize();
 
+  void acquireData(const StaticModelData::Pointer& data) { this->data = data; };
+  const StaticModelData::Pointer& dataPointer() const { return this->data; };
+
   inline void setScaleFactor(float scaleFactor) { this->data->setScaleFactor(scaleFactor); };
   float getScaleFactor() const { return data->getScaleFactor(); }