Changeset bae0911 in opengl-game

Timestamp:

May 10, 2019, 9:09:49 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

caa2359

Parents:

155a7cf

Message:

Update logging code to send all errors to the log file as well as the console

Files:

• TODO.txt (modified) (2 diffs)
• logger.cpp (modified) (5 diffs)
• logger.h (modified) (1 diff)
• new-game.cpp (modified) (5 diffs)

TODO.txt

@@ -2 +2 @@
 ==========
 -Change the logger class to use cout instead of printf. Consider how easy variable argument support would be.
--Change all error messages to use the logger class so they get printed to the log file as well.
+ - What I really need to do is completely refactor the logger class to return an ofstream to the logger file
+   and use streaming to send output to it. The log file can be closed in the destructor.
 -Add code to allow for resizing/maximizing the window
--Add logic to make imgui element placement depedent on the window size so it works in fullscreen
+ - Doesn't seem to be necessary on OSX anymore, check that in works on Window and Linux, including removing
+   the window title bar in fullscreen mode and bringing it back in windowed mode
 -Check the book's "Printing Parameters from the GL Context" to output a bunch of OpenGL context params
 -Move some common functions into a Utils class
@@ -13 +15 @@
 -Fix the texture-mapping code to not flip the texture upside down.
 -Make sure fullscreen works correctly on OSX. Check the book to see how to handle Retina Display.
+-Change all error messages to use the logger class so they get printed to the log file as well.
 
 NEW TODO

logger.cpp

@@ -5 +5 @@
 #include <cstdarg>
 #include <iostream>
-
-using namespace std;
 
 bool restart_gl_log() {
@@ -15 +13 @@
    }
    time_t now = time(NULL);
-   char* date = ctime(&now);
-   fprintf(file, "GL_LOG_FILE log. local time %s\n", date);
+   string date(ctime(&now));
+   fprintf(file, "GL_LOG_FILE log. local time %s\n", date.c_str());
    fclose(file);
    return true;
 }
 
-bool gl_log(const char* message, ...) {
+bool gl_log(const string message, ...) {
    va_list argptr;
    FILE* file = fopen(GL_LOG_FILE, "a");
@@ -28 +26 @@
       return false;
    }
-   va_start(argptr, message);
-   vfprintf(file, message, argptr);
+   va_start(argptr, message.c_str());
+   vfprintf(file, message.c_str(), argptr);
    va_end(argptr);
    fprintf(file, "\n");
@@ -36 +34 @@
 }
 
-bool gl_log_err(const char* message, ...) {
+bool gl_log_err(const string message, ...) {
    va_list argptr;
    FILE* file = fopen(GL_LOG_FILE, "a");
@@ -43 +41 @@
       return false;
    }
-   va_start(argptr, message);
-   vfprintf(file, message, argptr);
+   va_start(argptr, message.c_str());
+   vfprintf(file, message.c_str(), argptr);
    va_end(argptr);
    fprintf(file, "\n");
-   va_start(argptr, message);
-   vfprintf(stderr, message, argptr);
+   va_start(argptr, message.c_str());
+   vfprintf(stderr, message.c_str(), argptr);
    va_end(argptr);
    fprintf(stderr, "\n");

logger.h

@@ -1 +1 @@
 #ifndef LOGGER_H
 #define LOGGER_H
+
+#include <string>
+
+using namespace std;
 
 #define GL_LOG_FILE "gl.log"
 
 bool restart_gl_log();
-bool gl_log(const char* message, ...);
-bool gl_log_err(const char* message, ...);
+bool gl_log(const string message, ...);
+bool gl_log_err(const string message, ...);
 
 #endif

new-game.cpp

@@ -301 +301 @@
    cout << "New OpenGL Game" << endl;
 
-   if (!restart_gl_log()) {}
-   gl_log("starting GLFW\n%s\n", glfwGetVersionString());
+   restart_gl_log();
+   gl_log("starting GLFW\n%s", glfwGetVersionString());
 
    glfwSetErrorCallback(glfw_error_callback);
    if (!glfwInit()) {
-      cerr << "ERROR: could not start GLFW3" << endl;
+      gl_log_err("ERROR: could not start GLFW3");
       return 1;
    }
@@ -337 +337 @@
 
    if (!window) {
-      cerr << "ERROR: could not open window with GLFW3" << endl;;
+      gl_log_err("ERROR: could not open window with GLFW3");
       glfwTerminate();
       return 1;
@@ -403 +403 @@
    const GLubyte* version = glGetString(GL_VERSION);
    cout << "Renderer: " << renderer << endl;
-   cout << "OpenGL version supported " << version << endl;
+   cout << "Supported OpenGL version: " << version << endl;
+
+   gl_log("Renderer: %s", renderer);
+   gl_log("Supported OpenGL version: %s", version);
 
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -976 +979 @@
 
 void glfw_error_callback(int error, const char* description) {
-   gl_log_err("GLFW ERROR: code %i msg: %s\n", error, description);
+   gl_log_err("GLFW ERROR: code %i msg: %s", error, description);
 }
 
@@ -1217 +1220 @@
 
   if (!image_data) {
-    cerr << "ERROR: could not load " << file_name << endl;
+    gl_log_err("ERROR: could not load %s", file_name.c_str());
   }
 
   // Not Power-of-2 check
   if ((*x & (*x - 1)) != 0 || (*y & (*y - 1)) != 0) {
-     cerr << "WARNING: texture " << file_name << " is not power-of-2 dimensions" << endl;
+     gl_log_err("WARNING: texture %s is not power-of-2 dimensions", file_name.c_str());
   }