X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fshader_manager.cc;h=929d57abbe69258a18aef581f3dfe6a21daecca4;hp=3927969d6719a61157b1a501c36b7da4c7c09de9;hb=fcd6773bc770425ede4b47a84eef7cc78342542c;hpb=4bc86b416f29b4889075ad5c8dfdb1e11454a6c3

diff --git a/src/shader_manager.cc b/src/shader_manager.cc
index 3927969..929d57a 100644
--- a/src/shader_manager.cc
+++ b/src/shader_manager.cc
@@ -30,7 +30,9 @@ Shader *ShaderManager::load_shader(const char *name, SType type)
 		sdr = new ShaderGL;
 	}
 
-	if(!sdr->load(name, type)) {
+	std::string fname = path.empty() ? std::string(name) : path + "/" + std::string(name);
+
+	if(!sdr->load(fname.c_str(), type)) {
 		delete sdr;
 		return 0;
 	}
@@ -45,4 +47,43 @@ void ShaderManager::delete_shaders()
 	for(it=shaders.begin(); it != shaders.end(); it++) {
 		delete it->second;
 	}
+}
+
+ShaderProgram *ShaderManager::create_shader_program(const char *vname, const char *fname)
+{
+	Shader *vsdr = load_shader(vname, SDR_VERTEX);
+	if(!vsdr)
+		return 0;
+
+	Shader *fsdr = load_shader(fname, SDR_FRAGMENT);
+	if(!fsdr)
+		return 0;
+
+	ShaderProgram *sprog;
+
+	if(use_vulkan) {
+		// TODO
+		return 0;
+	}
+	else {
+		sprog = new ShaderProgramGL;
+	}
+
+	sprog->attach_shader(vsdr);
+	sprog->attach_shader(fsdr);
+	
+	if(!sprog->link()) {
+		delete sprog;
+		return 0;
+	}
+
+	return sprog;
+}
+
+void ShaderManager::set_path(const char *path)
+{
+	if(!path)
+		this->path.clear();
+	else
+		this->path = std::string(path);
 }
\ No newline at end of file