Changeset 155a7cf in opengl-game

Timestamp:

May 10, 2019, 7:42:17 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

bae0911

Parents:

e6bc0f4

Message:

Replace printf with cout and cerr in new-game.cpp and logger.cpp

Files:

• logger.cpp (modified) (3 diffs)
• new-game.cpp (modified) (4 diffs)

logger.cpp

@@ -4 +4 @@
 #include <ctime>
 #include <cstdarg>
+#include <iostream>
+
+using namespace std;
 
 bool restart_gl_log() {
    FILE* file = fopen(GL_LOG_FILE, "w");
    if (!file) {
-      fprintf(stderr, "ERROR: could not open GL_LOG_FILE log file %s for writing\n", GL_LOG_FILE);
+      cerr << "ERROR: could not open GL_LOG_FILE log file " << GL_LOG_FILE << " for writing" << endl;
       return false;
    }
@@ -22 +25 @@
    FILE* file = fopen(GL_LOG_FILE, "a");
    if (!file) {
-      fprintf(stderr, "ERROR: could not open GL_LOG_FILE log file %s for appending\n", GL_LOG_FILE);
+      cerr << "ERROR: could not open GL_LOG_FILE log file " << GL_LOG_FILE << " for appending" << endl;
       return false;
    }
@@ -37 +40 @@
    FILE* file = fopen(GL_LOG_FILE, "a");
    if (!file) {
-      fprintf(stderr, "ERROR: could not open GL_LOG_FILE log file %s for appending\n", GL_LOG_FILE);
+      cerr << "ERROR: could not open GL_LOG_FILE log file " << GL_LOG_FILE << " for appending" << endl;
       return false;
    }

new-game.cpp

@@ -306 +306 @@
    glfwSetErrorCallback(glfw_error_callback);
    if (!glfwInit()) {
-      fprintf(stderr, "ERROR: could not start GLFW3\n");
+      cerr << "ERROR: could not start GLFW3" << endl;
       return 1;
    }
@@ -337 +337 @@
 
    if (!window) {
-      fprintf(stderr, "ERROR: could not open window with GLFW3\n");
+      cerr << "ERROR: could not open window with GLFW3" << endl;;
       glfwTerminate();
       return 1;
@@ -414 +414 @@
    // glFrontFace(GL_CW);
 
-   /*
-   int x, y;
-   unsigned char* texImage = loadImage("test.png", &x, &y);
-   if (texImage) {
-     cout << "Yay, I loaded an image!" << endl;
-     cout << x << endl;
-     cout << y << endl;
-     printf("first 4 bytes are: %i %i %i %i\n", texImage[0], texImage[1], texImage[2], texImage[3]);
-   }
-
-   GLuint testTex = 0;
-   glGenTextures(1, &testTex);
-   glActiveTexture(GL_TEXTURE0);
-   glBindTexture(GL_TEXTURE_2D, testTex);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, texImage);
-
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   */
-
    int x, y;
    unsigned char* texImage = loadImage("laser.png", &x, &y);
    if (texImage) {
       cout << "Laser texture loaded successfully!" << endl;
-      cout << x << endl;
-      cout << y << endl;
-      printf("first 4 bytes are: %i %i %i %i\n", texImage[0], texImage[1], texImage[2], texImage[3]);
+      cout << x << ", " << y << endl;
+      cout << "first 4 bytes are: " << texImage[0] << " " << texImage[1] << " " << texImage[2] << " " << texImage[3] << endl;
    }
 
@@ -1240 +1217 @@
 
   if (!image_data) {
-    fprintf(stderr, "ERROR: could not load %s\n", file_name.c_str());
+    cerr << "ERROR: could not load " << file_name << endl;
   }
 
   // Not Power-of-2 check
   if ((*x & (*x - 1)) != 0 || (*y & (*y - 1)) != 0) {
-     fprintf(stderr, "WARNING: texture %s is not power-of-2 dimensions\n", file_name.c_str());
+     cerr << "WARNING: texture " << file_name << " is not power-of-2 dimensions" << endl;
   }