derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add texture support

Browse Source
This commit is contained in:
4VRDriver
2020-09-02 18:37:53 +02:00
parent f8868be702
commit b8715fba4d
11 changed files with 133 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ShaderProgram.cpp
View File

@@ -3,8 +3,8 @@
#include "ShaderProgram.h"
ShaderProgram::ShaderProgram(const char* vertexShaderFilename, const char* fragmentShaderFilename) {
shaderProgramId = createShader(vertexShaderFilename, fragmentShaderFilename);
ShaderProgram::ShaderProgram(const char* vertexShaderPath, const char* fragmentShaderPath) {
shaderProgramId = createShader(vertexShaderPath, fragmentShaderPath);
}
ShaderProgram::~ShaderProgram() {
@@ -19,9 +19,9 @@ void ShaderProgram::unbind() {
glUseProgram(0);
}
GLuint ShaderProgram::createShader(const char* vertexShaderFilename, const char* framentShaderFilename) {
std::string vertexShaderSource = parse(vertexShaderFilename);
std::string fragmentShaderSource = parse(framentShaderFilename);
GLuint ShaderProgram::createShader(const char* vertexShaderPath, const char* framentShaderPath) {
std::string vertexShaderSource = parse(vertexShaderPath);
std::string fragmentShaderSource = parse(framentShaderPath);
GLuint program = glCreateProgram();
GLuint vs = compile(vertexShaderSource, GL_VERTEX_SHADER);