More debug output and support for windows compiling.

ChangeLog.md

@@ -8,6 +8,9 @@
     * Fix to allow imguifilesystem to compile using Visual Studio 2013.
     * Very simple implementation of solid-mode using white texture.
     * New option to keep camera in a room.
+    * Counting number of OpenGL calls per frame.
+    * Now displaying meaningful error message when no OpenGL lib was found at run-time.
+    * No including gl.h instead of gl33.h where needed.
 
     [ 20150405 ]
     * No longer flipping axis in shaders, now turning camera upside-down.

include/RunTime.h

@@ -42,6 +42,9 @@ class RunTime {
     static const std::vector<float>& getHistoryFPS() { return history; }
     static float getLastFrameTime() { return lastFrameTime / 1000.0f; }
 
+    static void incrementCallCount() { glCallCount++; }
+    static unsigned long getCallCount() { auto c = glCallCount; glCallCount = 0; return c; }
+
   private:
     static std::string baseDir;
     static std::string pakDir;
@@ -57,6 +60,7 @@ class RunTime {
     static unsigned long frameTimeSum, frameTimeSum2;
     static unsigned long fps;
     static std::vector<float> history;
+    static unsigned long glCallCount;
 };
 
 #endif

include/system/Shader.h

@@ -13,7 +13,7 @@
 
 #include "TextureManager.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 class ShaderBuffer {
   public:

include/system/WindowGLFW.h

@@ -55,8 +55,7 @@ class WindowGLFW {
     static bool mousegrab;
     static bool textinput;
     static GLFWwindow* window;
-    static int lastMouseX;
-    static int lastMouseY;
+    static int lastMouseX, lastMouseY;
     static bool modShift;
     static bool modControl;
     static bool modAlt;

src/Camera.cpp

@@ -18,7 +18,6 @@
 #include "system/Window.h"
 #include "Camera.h"
 
-#include <glbinding/gl/gl33.h>
 #include <glm/gtc/epsilon.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/quaternion.hpp>

src/Mesh.cpp

@@ -9,7 +9,7 @@
 #include "TextureManager.h"
 #include "Mesh.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 Mesh::Mesh(const std::vector<glm::vec3>& vert,
            const std::vector<IndexedRectangle>& rect,

src/Render.cpp

@@ -20,7 +20,7 @@
 #include "Render.h"
 
 #include <glm/gtc/matrix_transform.hpp>
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 #include "imgui/imgui.h"
 #include "stb/stb_image_write.h"
@@ -58,13 +58,8 @@ void Render::display() {
     glm::mat4 VP = projection * view;
 
     if (updated || displayVisibilityCheck) {
-        int r = Camera::getRoom();
         clearRoomList();
-        if (r < 0) {
-            buildRoomList(VP);
-        } else {
-            buildRoomList(VP, r);
-        }
+        buildRoomList(VP);
     }
 
     for (int r = roomList.size() - 1; r >= 0; r--) {

src/RoomData.cpp

@@ -13,7 +13,7 @@
 
 #include "imgui/imgui.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 void BoundingBox::display(glm::mat4 VP, glm::vec3 colorLine, glm::vec3 colorDot) {

src/RunTime.cpp

@@ -29,6 +29,7 @@ unsigned long RunTime::frameTimeSum = 0;
 unsigned long RunTime::frameTimeSum2 = 0;
 unsigned long RunTime::fps = 0;
 std::vector<float> RunTime::history;
+unsigned long RunTime::glCallCount = 0;
 
 void RunTime::initialize() {
     baseDir = expandHomeDirectory("~/.OpenRaider");

src/TextureManager.cpp

@@ -21,7 +21,7 @@
 #include "utils/strings.h"
 #include "TextureManager.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 glm::vec2 TextureTile::getUV(unsigned int i) {
     glm::vec2 uv(vertices.at(i).xPixel,

src/UI.cpp

@@ -23,7 +23,7 @@
 #include "utils/time.h"
 #include "UI.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 Shader UI::imguiShader;
@@ -225,7 +225,12 @@ void UI::display() {
                          ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize
                          | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings
                          | ImGuiWindowFlags_AlwaysAutoResize)) {
+#ifdef DEBUG
+            ImGui::Text("%d FPS  %lu CPF", RunTime::getFPS(), RunTime::getCallCount());
+#else
             ImGui::Text("%d FPS", RunTime::getFPS());
+#endif
+
             ImGui::Text("X: %.1f (%.2f)", Camera::getPosition().x, Camera::getRotation().x);
             ImGui::Text("Y: %.2f (%.2f)", Camera::getPosition().y, Camera::getRotation().y);
             ImGui::Text("Z: %.2f (%d)", Camera::getPosition().z, Camera::getRoom());

src/loader/Loader.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "global.h"
+#include "Log.h"
 #include "loader/Loader.h"
 #include "loader/LoaderTR1.h"
 #include "loader/LoaderTR2.h"
@@ -33,6 +34,8 @@ Loader::LoaderVersion Loader::checkFile(std::string f) {
             return TR_4;
     }
 
+    Log::get(LOG_ERROR) << "Unknown TR level version: \"" << start << "\"" << Log::endl;
+
     return TR_UNKNOWN;
 }
 

src/main.cpp

@@ -36,6 +36,8 @@ static std::string configFileToUse;
 
 #ifdef DEBUG
 static void glErrorCallback(const glbinding::FunctionCall& call) {
+    RunTime::incrementCallCount();
+
     gl::GLenum error = gl::glGetError();
     if (error == gl::GL_NO_ERROR) {
         return;
@@ -66,6 +68,11 @@ static void glErrorCallback(const glbinding::FunctionCall& call) {
 
     log << Log::endl;
 }
+
+static void glUnresolvedCallback(const glbinding::AbstractFunction& func) {
+    Log::get(LOG_ERROR) << "Unresolved OpenGL call: \"" << func.name() << "\"!" << Log::endl;
+    orAssert(func.isResolved());
+}
 #endif
 
 int main(int argc, char* argv[]) {
@@ -89,6 +96,7 @@ int main(int argc, char* argv[]) {
                                      | glbinding::CallbackMask::ParametersAndReturnValue,
                                      { "glGetError" });
     glbinding::setAfterCallback(glErrorCallback);
+    glbinding::setUnresolvedCallback(glUnresolvedCallback);
 #endif
 
     Log::get(LOG_INFO) << "Initializing " << VERSION << Log::endl;

src/system/Shader.cpp

@@ -13,7 +13,7 @@
 #include "system/Window.h"
 #include "system/Shader.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 ShaderBuffer::~ShaderBuffer() {
     if (created)

src/system/Window.cpp

@@ -18,7 +18,7 @@
 #error "No windowing library selected!"
 #endif
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 int Window::initialize() {
     int res;

src/system/WindowGLFW.cpp

@@ -18,7 +18,7 @@
 #include "system/Window.h"
 #include "system/WindowGLFW.h"
 
-#include <glbinding/gl/gl33.h>
+#include <glbinding/gl/gl.h>
 
 glm::i32vec2 WindowGLFW::size(DEFAULT_WIDTH, DEFAULT_HEIGHT);
 bool WindowGLFW::fullscreen = false;