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

Timestamp:

Sep 25, 2006, 11:28:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: now it should also be possible, to cache the resources, by suppling a LoadString.
This is vital to loading Resources, when you only know the TypeName and a LoadString, but not the c++-type and the LoadParameters as is the case when loading over the internet.

Location:

branches/new_class_id/src/lib

Files:

• graphics/importer/material.cc (modified) (2 diffs)
• graphics/importer/material.h (modified) (1 diff)
• graphics/importer/resource_texture.cc (modified) (2 diffs)
• graphics/importer/resource_texture.h (modified) (2 diffs)
• graphics/resource_shader.cc (modified) (2 diffs)
• graphics/resource_shader.h (modified) (2 diffs)
• sound/resource_sound_buffer.cc (modified) (2 diffs)
• sound/resource_sound_buffer.h (modified) (2 diffs)
• util/filesys/directory.cc (modified) (1 diff)
• util/filesys/directory.h (modified) (1 diff)
• util/loading/resource.h (modified) (3 diffs)

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

@@ -99 +99 @@
 
 const Material* Material::selectedMaterial = NULL;
-
-
-/// TODO FIX THIS
-// Material& Material::operator=(const Material& m)
-// {
-//   this->setIllum(m.illumModel);
-//   this->setDiffuse(m.diffuse[0],m.diffuse[1],m.diffuse[2]);
-//   this->setAmbient(m.ambient[0],m.ambient[1],m.ambient[2]);
-//   this->setSpecular(m.specular[0],m.specular[1],m.specular[2]);
-//   this->setShininess(m.shininess);
-//   this->setTransparency(m.transparency);
-//
-//   if (this->diffuseTexture != NULL)
-//     ResourceManager::getInstance()->unload(this->diffuseTexture);
-//   if (m.diffuseTexture != NULL)
-//     this->diffuseTexture = (Texture*)ResourceManager::getInstance()->copy(m.diffuseTexture);
-//   this->ambientTexture = NULL; /// FIXME
-//   this->specularTexture = NULL; /// FIXME
-//
-//   this->setName(m.getName());
-// }
-
-
 
 /**
@@ -296 +273 @@
   //ResourceManager::getInstance()->addImageDir(pathName);
 }
-
-// MAPPING //
-
 
 /**

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

@@ -29 +29 @@
   virtual ~Material ();
 
+  Material& operator=(const Material& material);
+
   void loadParams(const TiXmlElement* root);
-
-  Material& operator=(const Material& material);
 
   bool select () const;

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

@@ -1 +1 @@
 
 #include "resource_texture.h"
+#include "substring.h"
+#include "multi_type.h"
 #include "debug.h"
 
@@ -23 +25 @@
 }
 
+ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
+{
+  SubString loadValues(loadString, ',');
+  std::string imageName;
+  GLenum target = GL_TEXTURE_2D;
+  if (loadValues.size() > 0)
+    imageName = loadValues[0];
+  if (loadValues.size() > 1)
+    target = (GLenum)MultiType(loadValues[2]).getInt();
 
-Resources::Type ResourceTexture::type("Texture");
+  return ResourceTexture(imageName, target);
+}
+
+
+
+Resources::tType<ResourceTexture> ResourceTexture::type("Texture");
 
 

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

@@ -16 +16 @@
 public:
   ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
-
+  static ResourceTexture createFromString(const std::string& loadString);
 
 private:
@@ -24 +24 @@
     TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
     inline const TextureData::Pointer& ptr() const { return pointer; }
-  private:
+private:
     TextureData::Pointer pointer;
   };
 
 private:
-  static Resources::Type type;
+  static Resources::tType<ResourceTexture> type;
 };
 

branches/new_class_id/src/lib/graphics/resource_shader.cc

@@ -2 +2 @@
 #include "resource_shader.h"
 #include "debug.h"
-
+#include "substring.h"
 
 ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
     : NewResource(&ResourceShader::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(vertexShaderName +'|'+fragmentShaderName);
+  Resources::StorePointer* ptr = this->acquireResource(vertexShaderName +','+fragmentShaderName);
 
   if (ptr)
@@ -23 +23 @@
 
     this->Shader::load(vertexFileName, fragmentFileName);
-    this->NewResource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+'|'+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
+    this->NewResource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
   }
 }
 
+ResourceShader ResourceShader::createFromString(const std::string& loadString)
+{
+  std::string vertexShaderName;
+  std::string fragmentShaderName;
 
-Resources::Type ResourceShader::type("Shader");
+  SubString shaderNames(loadString, ',');
+  if (shaderNames.size() > 0)
+    vertexShaderName = shaderNames[0];
+  if (shaderNames.size() > 1)
+    fragmentShaderName = shaderNames[1];
 
+  return ResourceShader(vertexShaderName, fragmentShaderName);
+}
 
-
-
+Resources::tType<ResourceShader> ResourceShader::type("Shader");
 
 ResourceShader::ShaderResourcePointer::ShaderResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const ShaderData::Pointer& data)

branches/new_class_id/src/lib/graphics/resource_shader.h

@@ -16 +16 @@
 public:
   ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName);
-
+  static ResourceShader createFromString(const std::string& loadString);
 
 private:
@@ -29 +29 @@
 
 private:
-  static Resources::Type type;
+  static Resources::tType<ResourceShader> type;
 };
 

branches/new_class_id/src/lib/sound/resource_sound_buffer.cc

@@ -9 +9 @@
 
   ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName)
-  : SoundBuffer(), NewResource(&ResourceSoundBuffer::type)
+      : SoundBuffer(), NewResource(&ResourceSoundBuffer::type)
   {
     this->registerObject(this, ResourceSoundBuffer::_objectList);
@@ -30 +30 @@
 
 
-  Resources::Type ResourceSoundBuffer::type("SoundBuffer");
+  Resources::tType<ResourceSoundBuffer> ResourceSoundBuffer::type("SoundBuffer");
 
   ResourceSoundBuffer::SoundBufferResourcePointer::SoundBufferResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const SoundBufferData::Pointer& data)
       : Resources::StorePointer(loadString, keepLevel) , pointer(data)
-{}
-}
+{}}

branches/new_class_id/src/lib/sound/resource_sound_buffer.h

@@ -18 +18 @@
   public:
     ResourceSoundBuffer(const std::string& soundName);
+    static ResourceSoundBuffer createFromString(const std::string& loadString) { return ResourceSoundBuffer(loadString); };
 
   private:
@@ -30 +31 @@
 
   private:
-    static Resources::Type type;
+    static Resources::tType<ResourceSoundBuffer> type;
   };
 }

branches/new_class_id/src/lib/util/filesys/directory.cc

@@ -215 +215 @@
 File operator+(const Directory& dir, const File& file)
 {
-   return File(dir.name() + '/' + file.name());
-}
+  return File(dir.name() + Directory::delimiter + file.name());
+}

branches/new_class_id/src/lib/util/filesys/directory.h

@@ -65 +65 @@
   const std::string& operator[](unsigned int fileNumber) const { return this->_fileNames[fileNumber]; };
   /** @returns a formated string containing the FileName, prepended with the directory-Name */
-  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + "/" + _fileNames[fileNumber]; };
+  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + Directory::delimiter + _fileNames[fileNumber]; };
   /** @returns a File pointing to the File @param fileNumber the fileNumber (must not bigger than fileCount()) */
   File getFile(unsigned int fileNumber) const { return File(fileNameInDir(fileNumber)); };

branches/new_class_id/src/lib/util/loading/resource.h

@@ -61 +61 @@
   public:
     Type(const std::string& typeName);
-    ~Type();
+    virtual ~Type();
     /** @returns true if the names match @param resourceName the Name to compare. @brief compare the Type with a Name */
     bool operator==(const std::string& resourceName) const { return this->_typeName == resourceName; };
@@ -82 +82 @@
     const std::vector<Resources::StorePointer*>& storedResources() const { return _storedResources; };
 
+    virtual void createFromString(const std::string& loadString) = 0;
+
     void setID(int id);
     void addResource(Resources::StorePointer* resource);
@@ -95 +97 @@
 
     std::vector<Resources::StorePointer*> _storedResources;   //!< An array of all the stored Resources.
+  };
+
+  template<class T> class tType : public Type
+  {
+  public:
+    tType(const std::string& typeName) : Type(typeName) {};
+    virtual void createFromString(const std::string& loadString) { T::createFromString(loadString); }
   };