From 54b664622737740bbb42c13d594b66a21d58ca5f Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 16 Mar 2015 10:30:50 -0400 Subject: Removed "../" from file paths --- src/renderer.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/renderer.cpp') diff --git a/src/renderer.cpp b/src/renderer.cpp index c2b37d2..d50901b 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -363,7 +363,7 @@ GLFWwindow* initRenderer() std::vector mesh_vertices; std::vector mesh_uvs; std::vector mesh_normals; - loadMesh("../res/monitor-fef.obj", mesh_vertices, mesh_uvs, mesh_normals); + loadMesh("res/monitor-fef.obj", mesh_vertices, mesh_uvs, mesh_normals); mesh_numvertices = mesh_vertices.size(); @@ -396,7 +396,7 @@ GLFWwindow* initRenderer() glGenTextures(1, &artifactsTex); glBindTexture(GL_TEXTURE_2D, artifactsTex); int atdw, atdh; - unsigned char* artifactsTex_data = stbi_load("../res/artifacts.bmp", &atdw, &atdh, 0, 3); + unsigned char* artifactsTex_data = stbi_load("res/artifacts.bmp", &atdw, &atdh, 0, 3); flipImageData(artifactsTex_data, atdw, atdh, 3); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, atdw, atdh, 0, GL_RGB, GL_UNSIGNED_BYTE, artifactsTex_data); stbi_image_free(artifactsTex_data); @@ -407,7 +407,7 @@ GLFWwindow* initRenderer() glGenTextures(1, &scanlinesTex); glBindTexture(GL_TEXTURE_2D, scanlinesTex); int stdw, stdh; - unsigned char* scanlinesTex_data = stbi_load("../res/scanlines_333.bmp", &stdw, &stdh, 0, 3); + unsigned char* scanlinesTex_data = stbi_load("res/scanlines_333.bmp", &stdw, &stdh, 0, 3); flipImageData(scanlinesTex_data, stdw, stdh, 3); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, atdw, atdh, 0, GL_RGB, GL_UNSIGNED_BYTE, scanlinesTex_data); stbi_image_free(scanlinesTex_data); @@ -416,12 +416,12 @@ GLFWwindow* initRenderer() glGenerateMipmap(GL_TEXTURE_2D); // Load the shaders - ntscShader = LoadShaders("../shaders/ntsc.vertex", "../shaders/ntsc.fragment"); - finalShader = LoadShaders("../shaders/final.vertex", "../shaders/final.fragment"); - blitShader = LoadShaders("../shaders/blit.vertex", "../shaders/blit.fragment"); - fillShader = LoadShaders("../shaders/fill.vertex", "../shaders/fill.fragment"); - bloom1Shader = LoadShaders("../shaders/bloom1.vertex", "../shaders/bloom1.fragment"); - bloom2Shader = LoadShaders("../shaders/bloom2.vertex", "../shaders/bloom2.fragment"); + ntscShader = LoadShaders("shaders/ntsc.vertex", "shaders/ntsc.fragment"); + finalShader = LoadShaders("shaders/final.vertex", "shaders/final.fragment"); + blitShader = LoadShaders("shaders/blit.vertex", "shaders/blit.fragment"); + fillShader = LoadShaders("shaders/fill.vertex", "shaders/fill.fragment"); + bloom1Shader = LoadShaders("shaders/bloom1.vertex", "shaders/bloom1.fragment"); + bloom2Shader = LoadShaders("shaders/bloom2.vertex", "shaders/bloom2.fragment"); rendererInitialized = true; -- cgit 1.4.1