From 2cf5d90727cfcd2ad9ececa09ce3d173dd91611a Mon Sep 17 00:00:00 2001 From: MrFloor Date: Thu, 7 Apr 2022 14:57:05 +0200 Subject: [PATCH] Are there any changes here --- src/main.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index c8b79ab..b1ed178 100644 --- a/src/main.c +++ b/src/main.c @@ -4,7 +4,6 @@ #include #include - #include "Renderer.h" #include "Input.h" @@ -12,7 +11,7 @@ float pos[3] = {0.0f, 0.0f, 0.0f}; -int main() { +int main(int argc, char *argv[]) { GLFWwindow* window; window = initOpenGL(); @@ -25,9 +24,10 @@ int main() { 0.0f, 0.5f, 0.0f, 1.0f, 1.0f, 1.0f, 0.5f, 1.0f }; + // CreateShader - char* vertex1 = "../assets/shaders/vertex4.glsl\0"; - char* fragment1 = "../assets/shaders/fragment4.glsl\0"; + char* vertex1 = "assets/shaders/vertex4.glsl\0"; + char* fragment1 = "assets/shaders/fragment4.glsl\0"; unsigned int shader1; shader1 = createShader(vertex1, fragment1); @@ -50,23 +50,22 @@ int main() { // Create Texture unsigned int texture; - texture = createTexture("../assets/textures/wall.jpg"); + texture = createTexture("assets/textures/wall.jpg"); + mat4x4 transform; + mat4x4_identity(transform); while(!glfwWindowShouldClose(window)) { - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glClear(GL_COLOR_BUFFER_BIT); + glClearColor(0.6f, 0.0f, 0.8f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glUseProgram(shader1); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, texture); glBindVertexArray(VAO); - - mat4x4 transform; - mat4x4_identity(transform); - mat4x4_translate(transform, pos[0], pos[1], pos[2]); + mat4x4_translate(transform, pos[0], pos[1], pos[2]); unsigned int transformLoc = glGetUniformLocation(shader1, "transform"); glUniformMatrix4fv(transformLoc, 1, GL_FALSE, *transform);