[render] Proper usage of texture

Author: guillaume-haerinck

libs/glutils/glslprogram.cpp

@@ -312,6 +312,13 @@ void GLSLProgram::setUniform(const char* name, GLuint val) {
 	glUniform1ui(loc, val);
 }
 
+void GLSLProgram::setTexture(const char* name, GLuint textureId, GLuint textureSlot)
+{
+	glActiveTexture(GL_TEXTURE0 + textureSlot);
+	glBindTexture(GL_TEXTURE_2D, textureId);
+	glUniform1i(getUniformLocation(name), textureSlot);
+}
+
 void GLSLProgram::setUniform(const char* name, bool val) {
 	int loc = getUniformLocation(name);
 	glUniform1i(loc, val);

libs/glutils/glslprogram.h

@@ -5,6 +5,7 @@
 #include <map>
 #include <glm/glm.hpp>
 #include <stdexcept>
+#include <iostream>
 
 class GLSLProgramException : public std::runtime_error {
 public:
@@ -67,6 +68,8 @@ class GLSLProgram {
 	void setUniform(const char* name, bool val);
 	void setUniform(const char* name, GLuint val);
 
+	void setTexture(const char* name, GLuint textureId, GLuint textureSlot);
+
 	void findUniformLocations();
 	void printActiveUniforms();
 	void printActiveUniformBlocks();
@@ -80,6 +83,11 @@ int GLSLProgram::getUniformLocation(const char* name) {
 
 	if (pos == uniformLocations.end()) {
 		GLint loc = glGetUniformLocation(handle, name);
+		if (loc == -1)
+		{
+			std::cerr << "Uniform do not exist : " << name << std::endl;
+		}
+
 		uniformLocations[name] = loc;
 		return loc;
 	}

libs/glutils/texture.cpp

@@ -2,6 +2,8 @@
 #include "stb/stb_image.h"
 #include "glutils.h"
 
+#include <iostream>
+
 /*static*/
 GLuint Texture::loadTexture(const std::string& fName) {
 	int width, height;
@@ -15,9 +17,18 @@ GLuint Texture::loadTexture(const std::string& fName) {
 
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_REPEAT);
+
+		glBindTexture(GL_TEXTURE_2D, 0);
 
 		Texture::deletePixels(data);
 	}
+	else
+	{
+		std::cerr << "Texture not found " << fName << std::endl;
+	}
 
 	return tex;
 }

project01/scenecloth.cpp

@@ -49,7 +49,7 @@ void SceneCloth::initScene()
 	computeProg.setUniform("RestLengthDiag", sqrtf(dx * dx + dy * dy));
 
 	glActiveTexture(GL_TEXTURE0);
-	Texture::loadTexture("../media/texture/me_textile.png");
+	clothTexture = Texture::loadTexture("../res/texture/me_textile.png");
 }
 
 void SceneCloth::initBuffers()
@@ -192,8 +192,11 @@ void SceneCloth::render()
 	glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
 
 	// Now draw the scene
-	renderProg.use();
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	renderProg.use();
+
+	renderProg.setTexture("Tex", clothTexture, 0);
+
 	view = glm::lookAt(glm::vec3(3, 2, 5), glm::vec3(2, 1, 0), glm::vec3(0, 1, 0));
 	model = glm::mat4(1.0f);
 	setMatrices();

project01/scenecloth.h

@@ -27,6 +27,7 @@ class SceneCloth : public Scene
 
 	GLuint clothVao;
 	GLuint numElements;
+	GLuint clothTexture;
 
 	glm::ivec2 nParticles;  // Number of particles in each dimension
 	glm::vec2 clothSize;    // Size of cloth in x and y