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

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.

File:

• branches/new_class_id/src/lib/graphics/resource_shader.cc (modified) (2 diffs)

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)