X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fshader.cc;h=8fa50ae0080463f312931a629bb3f13f336c3d5d;hp=bd80cfe2f583fe97ce9319360013c249e0a622e5;hb=4081e0e8f0f391aa25d67b73c45e73ccacff0f00;hpb=7a8a3e835aa4fefb930b843466db1566621e1fbe

diff --git a/src/shader.cc b/src/shader.cc
index bd80cfe..8fa50ae 100644
--- a/src/shader.cc
+++ b/src/shader.cc
@@ -1,31 +1,78 @@
+#include <assert.h>
 #include <stdio.h>
 #include "shader.h"
 
 Shader::Shader() {}
-Shader::~Shader() {}
+Shader::~Shader()
+{
+	type = SDR_UNKNOWN;
+}
 
 bool Shader::load(const char *fname, SType type)
 {
 	switch(type) {
 	case SDR_VERTEX:
 	case SDR_FRAGMENT:
+		this->type = type;
 		break;
 	default:
 		fprintf(stderr, "Invalid shader type used in loading.\n");
 		return false;
 	}
+
+	FILE *fp;
+	unsigned int fsz;
+
+	if(!(fp = fopen(fname, "rb"))) {
+		fprintf(stderr, "Failed to open shader: %s.\n", fname);
+
+		return false;
+	}
+	fseek(fp, 0, SEEK_END);
+	fsz = ftell(fp);
+	rewind(fp);
+
+	char *buf;
+	if(!(buf = new char[fsz + 1])) {
+		fprintf(stderr, "Failed to allocate %u buffers.\n", fsz + 1);
+		fclose(fp);
+
+		return false;
+	}
+
+	if(fread(buf, 1, fsz, fp) < fsz) {
+		fprintf(stderr, "Failed to read shader: %s.\n", fname);
+		delete buf;
+		fclose(fp);
+
+		return false;
+	}
+	buf[fsz] = '\0';
+	fclose(fp);
+
+	create(buf, fsz, fname);
 	return true;
 }
 
 ShaderProgram::ShaderProgram()
 {
+	int len = sizeof shaders / sizeof *shaders;
+	for(int i=0; i<len; ++i) {
+		shaders[i] = 0;
+	}
 }
 
 ShaderProgram::~ShaderProgram()
 {
+	int len = sizeof shaders / sizeof *shaders;
+
+	for(int i=0; i<len; ++i) {
+		delete shaders[i];
+	}
 }
 
-void ShaderProgram::add_shader(Shader *sdr, SType type)
+void ShaderProgram::add_shader(Shader *sdr)
 {
-	shaders[type] = sdr;
+	assert(sdr->type < sizeof shaders / sizeof *shaders);
+	shaders[sdr->type] = sdr;
 }
\ No newline at end of file