diff options
Diffstat (limited to 'src/renderer.cpp')
-rw-r--r-- | src/renderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/renderer.cpp b/src/renderer.cpp index 72de8a9..e7db069 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp | |||
@@ -4,8 +4,8 @@ | |||
4 | #include <vector> | 4 | #include <vector> |
5 | #include <cstdio> | 5 | #include <cstdio> |
6 | #include <cstring> | 6 | #include <cstring> |
7 | #include "mapview.h" | ||
8 | #include <cstdlib> | 7 | #include <cstdlib> |
8 | #include "game.h" | ||
9 | 9 | ||
10 | // include stb_image | 10 | // include stb_image |
11 | #define STB_IMAGE_IMPLEMENTATION | 11 | #define STB_IMAGE_IMPLEMENTATION |
@@ -405,7 +405,7 @@ GLFWwindow* initRenderer() | |||
405 | glGenTextures(1, &scanlinesTex); | 405 | glGenTextures(1, &scanlinesTex); |
406 | glBindTexture(GL_TEXTURE_2D, scanlinesTex); | 406 | glBindTexture(GL_TEXTURE_2D, scanlinesTex); |
407 | int stdw, stdh; | 407 | int stdw, stdh; |
408 | unsigned char* scanlinesTex_data = stbi_load("../res/scanlines_222.bmp", &stdw, &stdh, 0, 3); | 408 | unsigned char* scanlinesTex_data = stbi_load("../res/scanlines_333.bmp", &stdw, &stdh, 0, 3); |
409 | flipImageData(scanlinesTex_data, stdw, stdh, 3); | 409 | flipImageData(scanlinesTex_data, stdw, stdh, 3); |
410 | glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, atdw, atdh, 0, GL_RGB, GL_UNSIGNED_BYTE, scanlinesTex_data); | 410 | glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, atdw, atdh, 0, GL_RGB, GL_UNSIGNED_BYTE, scanlinesTex_data); |
411 | stbi_image_free(scanlinesTex_data); | 411 | stbi_image_free(scanlinesTex_data); |
@@ -507,7 +507,7 @@ void destroyTexture(Texture* tex) | |||
507 | delete tex; | 507 | delete tex; |
508 | } | 508 | } |
509 | 509 | ||
510 | Texture* loadTextureFromBMP(char* filename) | 510 | Texture* loadTextureFromFile(char* filename) |
511 | { | 511 | { |
512 | if (!rendererInitialized) | 512 | if (!rendererInitialized) |
513 | { | 513 | { |