From cb7f0263d8c7e779d3becfdb169ef16e93ca4fee Mon Sep 17 00:00:00 2001
From: Adrian Hedqvist <adrian@tollyx.net>
Date: Sun, 17 Sep 2017 22:09:14 +0200
Subject: [PATCH] Bunch of logging

---
 src/Game.cpp     |  9 +++++++--
 src/Main.cpp     |  2 ++
 src/Renderer.cpp | 17 +++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Game.cpp b/src/Game.cpp
index e58104c..99fe419 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -70,6 +70,7 @@ void init() {
     hero = nullptr;
   }
 
+  SDL_Log("Creating tilemap...\n");
   tilemap = new Tilemap(32, 32);
   int y = 0;
   int x = 0;
@@ -104,19 +105,23 @@ void init() {
     }
     x++;
   }
+  SDL_Log("Done.\n");
+  SDL_Log("Calculating initial FOV...\n");
   hero->CalcFOV();
+  SDL_Log("Done.\n");
 }
 
 void load(Renderer* rend, Input* inp) {
   renderer = rend;
   input = inp;
 
-  ascii = new Tileset(renderer, "assets/12x12.bmp", 192, 192, 12, 12);
-  //testsprite = renderer->CreateSprite("assets/12x12.bmp", 0, 0, 192, 192);
+  ascii = new Tileset(renderer, "./assets/12x12.bmp", 192, 192, 12, 12);
+  SDL_Log("Created tileset.\n");
   input->bindkey(SDLK_r, ACTION_RESET);
   input->bindkey(SDLK_SPACE, ACTION_PAUSE);
   input->bindkey(SDLK_RETURN, ACTION_STEP);
   input->bindkey(SDLK_F1, ACTION_TOGGLE_DEBUG);
+  SDL_Log("Bound keybinds.\n");
   init();
 }
 
diff --git a/src/Main.cpp b/src/Main.cpp
index 8fe75a8..ed49566 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -42,6 +42,7 @@ int main(int argc, char* argv[]) {
     SDL_Quit();
     return 1;
   }
+  SDL_Log("SDL initialized.\n");
 
   renderer = new Renderer();
   if (!renderer->Init("Dungeon", windowWidth, windowHeight)) {
@@ -126,6 +127,7 @@ int main(int argc, char* argv[]) {
   }
   delete renderer;
   SDL_Quit();
+  SDL_Log("Quit.");
   return 0;
 }
 
diff --git a/src/Renderer.cpp b/src/Renderer.cpp
index 959f0d8..685113f 100644
--- a/src/Renderer.cpp
+++ b/src/Renderer.cpp
@@ -30,7 +30,7 @@ GLuint LoadShader(const char* path, GLenum shadertype) {
     shaderstream.close();
   }
   else {
-    printf("ERROR: Could not open shader file \"%s\".\n", path);
+    SDL_Log("ERROR: Could not open shader file \"%s\".\n", path);
     getchar();
     return 0;
   }
@@ -38,7 +38,7 @@ GLuint LoadShader(const char* path, GLenum shadertype) {
   GLint result = GL_FALSE;
   int infologlength;
 
-  printf("Compiling shader: %s\n", path);
+  SDL_Log("Compiling shader: %s\n", path);
   char const * source = shadersource.c_str();
   glShaderSource(shaderId, 1, &source, NULL);
   glCompileShader(shaderId);
@@ -48,13 +48,14 @@ GLuint LoadShader(const char* path, GLenum shadertype) {
   if (infologlength > 0) {
     std::vector<char> errorlog(infologlength + 1);
     glGetShaderInfoLog(shaderId, infologlength, NULL, &errorlog[0]);
-    printf("Errors in \"%s\":\n%s\n", path, &errorlog[0]);
+    SDL_Log("Errors in \"%s\":\n%s\n", path, &errorlog[0]);
   }
+  SDL_Log("Done.");
   return shaderId;
 }
 
 GLuint CreateShaderProgram(GLuint vertshader, GLuint fragshader) {
-  printf("Linking shader program...\n");
+  SDL_Log("Linking shader program...\n");
   GLuint programId = glCreateProgram();
   glAttachShader(programId, vertshader);
   glAttachShader(programId, fragshader);
@@ -68,12 +69,12 @@ GLuint CreateShaderProgram(GLuint vertshader, GLuint fragshader) {
   if (infologlength > 0) {
     std::vector<char> errorlog(infologlength + 1);
     glGetShaderInfoLog(programId, infologlength, NULL, &errorlog[0]);
-    printf("Errors when creating shader program:\n%s\n", &errorlog[0]);
+    SDL_Log("Errors when creating shader program:\n%s\n", &errorlog[0]);
   }
 
   glDetachShader(programId, vertshader);
   glDetachShader(programId, fragshader);
-
+  SDL_Log("Done.");
   return programId;
 }
 
@@ -98,6 +99,7 @@ Renderer::~Renderer() {
   SDL_GL_DeleteContext(context);
   SDL_DestroyWindow(window);
   window = nullptr;
+  SDL_Log("Renderer destroyed.");
 }
 
 GLuint shaderProg;
@@ -162,6 +164,7 @@ bool Renderer::Init(std::string title, int width, int height) {
 
   SetWindowSize(width, height);
 
+  SDL_Log("Renderer initialized.\n");
   return true;
 }
 
@@ -190,6 +193,7 @@ void Renderer::SetWindowSize(int width, int height) {
   glm::mat4 view = glm::scale(glm::vec3(widthmult, heightmult, 1)) * glm::translate(glm::vec3(-windowwidth / 2, -windowheight / 2, 0)) * glm::mat4(1);
 
   screenVPmat = projection * view;
+  SDL_Log("Window size set to %dx%d.\n", width, height);
 }
 
 void Renderer::SetClearColor(float r, float g, float b, float a) {
@@ -257,6 +261,7 @@ Texture * Renderer::LoadTexture(std::string path) {
 
       SDL_FreeSurface(surface);
       textures.insert(std::pair<std::string, Texture>(path, t));
+      SDL_Log("Loaded texture \"%s\"\n", path.c_str());
       return &textures[path];
     }
     else {