Rendering works but somthing's wrong with the indexing

2019-02-24 18:34:10 +00:00
parent 7a30da9fcc
commit d4876bbba5
10 changed files with 351 additions and 171 deletions
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -1,3 +1,168 @@
 #include "shader.h"

+#include <iostream>
+#include <fstream>

+Shader::Shader()
+	: logger(*new Logger) {
+	m_program = glCreateProgram();
+}
+
+Shader& Shader::use() {
+	glUseProgram(m_program);
+	return *this;
+}
+
+Shader& Shader::link() {
+	glLinkProgram(m_program);
+	return *this;
+}
+
+Shader& Shader::attatch() {
+	glAttachShader(m_program, m_vert);
+	glAttachShader(m_program, m_frag);
+	return *this;
+}
+
+std::string readShader(std::string source) {
+	std::ifstream t(source);
+	std::string shaderCode((std::istreambuf_iterator<char>(t)),
+		std::istreambuf_iterator<char>());
+	return shaderCode;
+}
+
+Shader& Shader::load(GLenum type, std::string sourceLoc) {
+	const char* source = readShader(sourceLoc).c_str();
+
+	if (type == GL_VERTEX_SHADER) {
+		m_vertLoc = sourceLoc;
+		m_vertSource = (std::string)source;
+		m_vert = glCreateShader(GL_VERTEX_SHADER);
+		glShaderSource(m_vert, 1, &source, NULL);
+		glCompileShader(m_vert);
+
+		glGetShaderiv(m_vert, GL_COMPILE_STATUS, &m_status);
+		if (m_status == GL_FALSE) {
+			char buf[512];
+			glGetShaderInfoLog(m_vert, 512, NULL, buf);
+			logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+		}
+
+		logger << LOGGER_INFO << "Vertex shader at '" << sourceLoc << "' compiled..." << LOGGER_ENDL;
+	}
+	else if (type == GL_FRAGMENT_SHADER) {
+		m_fragLoc = sourceLoc;
+		m_fragSource = (std::string)source;
+		m_frag = glCreateShader(GL_FRAGMENT_SHADER);
+		glShaderSource(m_frag, 1, &source, NULL);
+		glCompileShader(m_frag);
+
+		glGetShaderiv(m_frag, GL_COMPILE_STATUS, &m_status);
+		if (m_status == GL_FALSE) {
+			char buf[512];
+			glGetShaderInfoLog(m_frag, 512, NULL, buf);
+			logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+		}
+
+		logger << LOGGER_INFO << "Vertex shader at '" << sourceLoc << "' compiled..." << LOGGER_ENDL;
+	}
+
+	return *this;
+}
+
+Shader& Shader::load(std::string sourceLoc) {
+	m_vertLoc = sourceLoc + ".vert";
+	m_fragLoc = sourceLoc + ".frag";
+
+	m_vertSource = readShader(m_vertLoc);
+	m_fragSource = readShader(m_fragLoc);
+
+	m_vert = glCreateShader(GL_VERTEX_SHADER);
+	m_frag = glCreateShader(GL_FRAGMENT_SHADER);
+
+	const char* vertSource = m_vertSource.c_str();
+	glShaderSource(m_vert, 1, &vertSource, NULL);
+	glCompileShader(m_vert);
+
+	const char* fragSource = m_fragSource.c_str();
+	glShaderSource(m_frag, 1, &fragSource, NULL);
+	glCompileShader(m_frag);
+
+	glGetShaderiv(m_vert, GL_COMPILE_STATUS, &m_status);
+	if (m_status == GL_FALSE) {
+		char buf[512];
+		glGetShaderInfoLog(m_vert, 512, NULL, buf);
+		logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+	}
+
+	glGetShaderiv(m_frag, GL_COMPILE_STATUS, &m_status);
+	if (m_status == GL_FALSE) {
+		char buf[512];
+		glGetShaderInfoLog(m_frag, 512, NULL, buf);
+		logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+	}
+
+	logger << LOGGER_INFO << "Vertex shader at '" << m_vertLoc << "' compiled..." << LOGGER_ENDL;
+	logger << LOGGER_INFO << "Fragment shader at '" << m_fragLoc << "' compiled..." << LOGGER_ENDL;
+	return *this;
+}
+
+Shader& Shader::reload() {
+	glDeleteProgram(m_program);
+	glDeleteShader(m_vert);
+	glDeleteShader(m_frag);
+
+	m_vertSource = readShader(m_vertLoc);
+	m_fragSource = readShader(m_fragLoc);
+
+	m_vert = glCreateShader(GL_VERTEX_SHADER);
+	m_frag = glCreateShader(GL_FRAGMENT_SHADER);
+
+	const char* vertSource = m_vertSource.c_str();
+	glShaderSource(m_vert, 1, &vertSource, NULL);
+	glCompileShader(m_vert);
+
+	const char* fragSource = m_fragSource.c_str();
+	glShaderSource(m_frag, 1, &fragSource, NULL);
+	glCompileShader(m_frag);
+
+	glGetShaderiv(m_vert, GL_COMPILE_STATUS, &m_status);
+	if (m_status == GL_FALSE) {
+		char buf[512];
+		glGetShaderInfoLog(m_vert, 512, NULL, buf);
+		logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+	}
+
+	glGetShaderiv(m_frag, GL_COMPILE_STATUS, &m_status);
+	if (m_status == GL_FALSE) {
+		char buf[512];
+		glGetShaderInfoLog(m_frag, 512, NULL, buf);
+		logger << LOGGER_ERROR << buf << LOGGER_ENDL;
+	}
+
+	logger << LOGGER_INFO << "Vertex shader at '" << m_vertLoc << "' compiled..." << LOGGER_ENDL;
+	logger << LOGGER_INFO << "Fragment shader at '" << m_fragLoc << "' compiled..." << LOGGER_ENDL;
+
+	link();
+	attatch();
+
+	return *this;
+}
+
+GLuint Shader::getProgram() {
+	return m_program;
+}
+
+GLuint Shader::getVertex() {
+	return m_vert;
+}
+
+GLuint Shader::getFragment() {
+	return m_frag;
+}
+
+Shader::~Shader() {
+	glDeleteProgram(m_program);
+	glDeleteShader(m_vert);
+	glDeleteShader(m_frag);
+}