Fixed rendering issue & refactored Obj2D

headers/renderer.hpp

@@ -24,6 +24,7 @@ namespace Renderer {
 			RenderObject(std::vector<float> verts, std::vector<unsigned int> indices);
 			void render(GLFWwindow* win, glm::mat4 cameraTransform, glm::mat4 projectionTransform);
 			void transform(glm::mat4 T);
+			void preRenderHook();
 		private:
 			Shaders::Shader shader;
 			unsigned int EBO;
@@ -49,20 +50,13 @@ namespace Renderer {
 			glm::mat4 projectionTransform = glm::mat4(1.0f);
 	};
 
-	class Obj2D {
+	class Obj2D : public RenderObject {
 		public:
-			Shaders::Shader shader;
-			Textures::Texture2D texture;
-
-			Obj2D(unsigned int indices[], unsigned int icount, float verts[], unsigned int vcount);
-
+			using RenderObject::RenderObject;
 			void setTexture(const char* t_src);
-			void transform(glm::mat4 T);
-			void render(GLFWwindow* win);
+			void preRenderHook();
 		private:
+			Textures::Texture2D texture;
 			void bind_texture(Textures::Texture2D texture);
-			unsigned int EBO;
-			unsigned int VBO;
-			unsigned int VAO;
 	};
 }

shaders/fragment.glsl

@@ -6,11 +6,8 @@ in vec4 VertexColor;
 in vec2 TexCoord;
 
 uniform sampler2D inpTexture;
-
-uniform float r;
-uniform float g;
-uniform float b;
+uniform vec3 rgbOffset = vec3(0.0, 0.0, 0.0);
 
 void main() {
-	FragColor = texture(inpTexture, TexCoord) * (VertexColor + vec4(r, g, b, 1.0f));
+	FragColor = texture(inpTexture, TexCoord) * (VertexColor + vec4(rgbOffset, 1.0));
 } 

shaders/vertex.glsl

@@ -6,9 +6,9 @@ layout (location = 2) in vec2 aTexCoord;
 out vec4 VertexColor;
 out vec2 TexCoord;
 
-uniform mat4 model = mat4(1.0f);
-uniform mat4 view = mat4(1.0f);
-uniform mat4 projection = mat4(1.0f);
+uniform mat4 model = mat4(1.0);
+uniform mat4 view = mat4(1.0);
+uniform mat4 projection = mat4(1.0);
 
 void main() {
 	gl_Position = projection * view * model * vec4(aPos, 1.0);

src/main.cpp

@@ -77,9 +77,10 @@ int main() {
 	float borderColor[] = {1.0f, 1.0f, 1.0f, 1.0f};
 	glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
 
-	Renderer::RenderObject ro(verts, indices);
+	Renderer::Obj2D ro(verts, indices);
 	renderer.spawnObject(ro);
-	// ro.setTexture(RUSTY_METAL_TEXTURE);
+	renderer.setCamera(glm::vec3(0.0f, 0.0f, -8.0f));
+	ro.setTexture(RUSTY_METAL_TEXTURE);
 
 	// Window width & height
 	while (!glfwWindowShouldClose(win)) {
@@ -91,7 +92,8 @@ int main() {
 
 		/* OBJECT RENDERING */
 		float time = glfwGetTime();
-		float gVal = (sin(time) / 1.5f) + 0.5f;
+		float gVal = sin(time) / 10.5f;
+		renderer.setCamera(glm::vec3(0.0f, 0.0f, -gVal));
 
 		// Transformation
 		float rotang = time;

src/renderer.cpp

@@ -80,12 +80,16 @@ namespace Renderer {
 		glEnableVertexAttribArray(2);
 	}
 
+	void RenderObject::preRenderHook() {}
+
 	void RenderObject::render(GLFWwindow* win, glm::mat4 cameraTransform, glm::mat4 projectionTransform) {
 		shader.setMat4("view", cameraTransform);
 		shader.setMat4("projection", projectionTransform);
 
 		shader.use();
 
+		preRenderHook();
+
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
 		glDrawElements(GL_TRIANGLES, indicesVec.size(), GL_UNSIGNED_INT, 0);
 	}
@@ -94,65 +98,16 @@ namespace Renderer {
 		shader.setMat4("model", T);
 	}
 
-	void Obj2D::transform(glm::mat4 T) {
-		shader.setMat4("model", T);
-	}
-
+	// Obj2D
 	void Obj2D::setTexture(const char* t_src) {
 		texture.texture_src = t_src;
 		texture.load();
 	}
 
-	void Obj2D::render(GLFWwindow* win) {
-		int width, height;
-
-		// Camera 
-		glm::mat4 view = glm::mat4(1.0f);
-		view = glm::translate(view, glm::vec3(0.0f, 0.0f, -8.0f)); // Camera position
-		shader.setMat4("view", view);
-
-		glfwGetWindowSize(win, &width, &height);
-		glm::mat4 projection = glm::perspective(glm::radians(45.0f), (float)width / (float)height, 0.1f, 100.0f);
-		shader.setMat4("projection", projection);
-
-		// Use the shader etc
-		shader.use();
-
+	void Obj2D::preRenderHook() {
+		printf("OBJ2D was here!\n");
 		if (texture.loaded)
 			texture.bind();
-
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
-		glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
-	}
-
-	Obj2D::Obj2D(unsigned int indices[], unsigned int icount, float verts[], unsigned int vcount) 
-		: shader(VERT_SHADER_SRC_FILE, FRAG_SHADER_SRC_FILE) {
-
-		// Vertex Array Object
-		glGenVertexArrays(1, &VAO); // gen the VAO
-		glBindVertexArray(VAO); // bind it
-
-		// Copy the verts into the buffer
-		glGenBuffers(1, &VBO);
-		glBindBuffer(GL_ARRAY_BUFFER, VBO);
-		glBufferData(GL_ARRAY_BUFFER, vcount, verts, GL_DYNAMIC_DRAW); // for moving stuff
-
-		// Copy the indices for the verts into another buffer
-		glGenBuffers(1, &EBO);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
-		glBufferData(GL_ELEMENT_ARRAY_BUFFER, icount, indices, GL_STATIC_DRAW);
-
-		// Pos
-		glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, VERTEX_ATTRIB_PTR_SIZE, (void*)0);
-		glEnableVertexAttribArray(0);
-
-		// Color
-		glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, VERTEX_ATTRIB_PTR_SIZE, (void*)(3*sizeof(float)));
-		glEnableVertexAttribArray(1);
-
-		// Texture
-		glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, VERTEX_ATTRIB_PTR_SIZE, (void*)(6*sizeof(float)));
-		glEnableVertexAttribArray(2);
 	}
 
 	// Private stuff

src/shaders.cpp

@@ -81,10 +81,10 @@ namespace Shaders {
 	Shader::Shader(const char* vertPath, const char* fragPath) {
 		unsigned int vertShader = compileFromFile(GL_VERTEX_SHADER, vertPath);
 		unsigned int fragShader = compileFromFile(GL_FRAGMENT_SHADER, fragPath);
-		unsigned int shaders[2] = {vertShader, fragShader};
+		std::vector<unsigned int> shaders({vertShader, fragShader});
 
 		// Shader program ID
-		id = Shaders::createProgram( std::vector<unsigned int> (std::begin(shaders), std::end(shaders)) );
+		id = Shaders::createProgram(shaders);
 	}
 
 	void Shader::use() { glUseProgram(id); }

src/textures.cpp

@@ -29,13 +29,11 @@ namespace Textures {
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-		printf("[%i] \"%s\" - ", id, texture_src);
 		unsigned char* data = stbi_load(texture_src, &width, &height, &nrChannels, 0);
 		
 		if (data) {
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
 			glGenerateMipmap(GL_TEXTURE_2D);
-			printf("Loaded!\n");
 			loaded = true;
 		} else {
 			printf("[ERROR] Failed to load texture \"%s\"\n", texture_src);