diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e4600fd..ad87ddf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "tasks": [ { "type": "cppbuild", - "label": "C/C++: g++-11 build active file", + "label": "C/C++: g++-20 build active file", "command": "/usr/bin/g++", "args": [ "-g", diff --git a/Engine/engine/match b/Engine/engine/match index a44b145..5314c3a 100755 Binary files a/Engine/engine/match and b/Engine/engine/match differ diff --git a/Engine/engine/renderLoop.cpp b/Engine/engine/renderLoop.cpp index 5ae41f2..61016fc 100644 --- a/Engine/engine/renderLoop.cpp +++ b/Engine/engine/renderLoop.cpp @@ -89,7 +89,7 @@ unsigned int generateBindVAO() return vertexArrayObject; } -void copyVerticesArray(unsigned int vertexBufferObject, const float vertices[], const size_t sizeOfVertices, const GLenum boundBufferTarget) +void copyVerticesArray(const unsigned int vertexBufferObject, const float vertices[], const size_t sizeOfVertices, const GLenum boundBufferTarget) { // copy vertices array in array useful for OGL glBindBuffer(boundBufferTarget, vertexBufferObject); diff --git a/Engine/engine/shaders.cpp b/Engine/engine/shaders.cpp index 47eddb4..ad1db86 100644 --- a/Engine/engine/shaders.cpp +++ b/Engine/engine/shaders.cpp @@ -6,13 +6,12 @@ #include "constants.hpp" #include "misc.hpp" -unsigned int linkShaderObjectsShaderProgram(unsigned int vertexShaders, unsigned int fragmentShader) +unsigned int linkShaderObjectsShaderProgram(const unsigned int vertexShaders, const unsigned int fragmentShader) { // link shader objects into shader program // will store shader program id - unsigned int shaderProgram; // creates program - shaderProgram = glCreateProgram(); + const unsigned int shaderProgram = glCreateProgram(); // attachShaders glAttachShader(shaderProgram, vertexShaders); diff --git a/Engine/engine/shaders.hpp b/Engine/engine/shaders.hpp index 238fb31..7eee842 100644 --- a/Engine/engine/shaders.hpp +++ b/Engine/engine/shaders.hpp @@ -4,7 +4,7 @@ #include #include -unsigned int linkShaderObjectsShaderProgram(unsigned int vertexShaders, unsigned int fragmentShader); +unsigned int linkShaderObjectsShaderProgram(const unsigned int vertexShaders, const unsigned int fragmentShader); std::pair compileShaders(); unsigned int compileShader(const GLenum shaderType, const char *shaderSource); int shaderCompilationSuccessful(const unsigned int shader);