Add error handler dialog

Author: dbierek

CMakeLists.txt

@@ -12,7 +12,7 @@ endif()
 
 project(
   NavKit 
-  VERSION 0.9.5
+  VERSION 0.9.7
   DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman"
   LANGUAGES CXX)
 
@@ -29,6 +29,8 @@ find_package(GLU REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(simdjson REQUIRED)
 find_package(ftgl REQUIRED)
+find_package(cpptrace CONFIG REQUIRED)
+
 #find_package(nfd REQUIRED) # Reenable this once there is a new release of nfd
 find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
 

include/NavKit/NavKit.h

@@ -53,6 +53,13 @@
 #include "Renderer.h"
 #include "InputHandler.h"
 #include "Gui.h"
+#include <iomanip>
+#include <dbghelp.h>
+#include "Resource.h"
+#include <SDL_syswm.h>
+#include <cpptrace/from_current.hpp>
+#include <stdexcept>
+#pragma comment(lib, "dbghelp.lib")
 #undef main
 
 class Navp;
@@ -66,38 +73,44 @@ class Gui;
 
 class NavKit {
 public:
-	NavKit();
-	~NavKit();
+    NavKit();
 
-	SceneExtract* sceneExtract;
-	Navp* navp;
-	Obj* obj;
-	Airg* airg;
-	Renderer* renderer;
-	InputHandler* inputHandler;
-	Gui* gui;
+    ~NavKit();
 
-	GameConnection* gameConnection;
-	Sample* sample;
-	BuildContext ctx;
+    SceneExtract *sceneExtract;
+    Navp *navp;
+    Obj *obj;
+    Airg *airg;
+    Renderer *renderer;
+    InputHandler *inputHandler;
+    Gui *gui;
 
-	bool done;
+    GameConnection *gameConnection;
+    Sample *sample;
+    BuildContext ctx;
 
-	float scrollZoom;
-	bool rotate;
-	bool movedDuringRotate;
-	float keybSpeed = 22.0f;
+    bool done;
 
-	InputGeom* geom;
-	DebugDrawGL m_dd;
+    float scrollZoom;
+    bool rotate;
+    bool movedDuringRotate;
+    float keybSpeed = 22.0f;
 
-	CSimpleIniA ini;
+    InputGeom *geom;
+    DebugDrawGL m_dd;
+
+    CSimpleIniA ini;
+
+    int runProgram(int argc, char **argv);
+    static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    void log(rcLogCategory category, const char *message, ...);
+
+    static std::string *errorMessage;
 
-	int runProgram(int argc, char** argv);
-	void log(rcLogCategory category, const char* message, ...);
 private:
-	rsj::ConcurrentQueue<std::pair<rcLogCategory, std::string>> logQueue;
-	void loadSettings();
+    rsj::ConcurrentQueue<std::pair<rcLogCategory, std::string> > logQueue;
+
+    void loadSettings();
 
-	static void logRunner(NavKit* navKit);
+    static void logRunner(NavKit *navKit);
 };

include/NavKit/NavKitConfig.h

@@ -1,3 +1,3 @@
 #define NavKit_VERSION_MAJOR "0"
 #define NavKit_VERSION_MINOR "9"
-#define NavKit_VERSION_PATCH "5"
+#define NavKit_VERSION_PATCH "7"

include/NavKit/Renderer.h

@@ -55,6 +55,7 @@ class Renderer {
 	float moveUp;
 	float moveDown;
 	SDL_Window* window;
+	static HWND hwnd;
 	Uint32 prevFrameTime;
 
 private:

include/NavKit/Resource.h

@@ -0,0 +1,4 @@
+#pragma once
+#define IDD_ERROR_DIALOG 101
+#define IDC_ERROR_TEXT 1001
+#define IDC_COPY_BUTTON 1003

src/CMakeLists.txt

@@ -5,15 +5,15 @@ include_directories(SYSTEM extern)
 include_directories(SYSTEM include)
 
 configure_file("${NavKit_SOURCE_DIR}/include/NavKit/NavKitConfig.h.in" "${NavKit_SOURCE_DIR}/include/NavKit/NavKitConfig.h")
-set(RC_FILE "NavKit.rc")
-add_executable (NavKit "NavKit.cpp" "RecastDemo/imgui.cpp" "RecastDemo/imguiRenderGL.cpp" "RecastDemo/MeshLoaderObj.cpp" "RecastDemo/InputGeom.cpp" "RecastDemo/ChunkyTriMesh.cpp" "RecastDemo/SampleInterfaces.cpp" "RecastDemo/PerfTimer.cpp" "ReasoningGrid.cpp"   "RecastDemo/Sample.cpp" "RecastDemo/Sample_SoloMesh.cpp" "GameConnection.cpp" "easywsclient/easywsclient.cpp" "easywsclient/easywsclient.cpp" "easywsclient/easywsclient.cpp" "Navp.cpp" "Obj.cpp" "FileUtil.cpp" "Airg.cpp" "SceneExtract.cpp" "Renderer.cpp" "InputHandler.cpp" "Gui.cpp" "PfBoxes.cpp" "VisionData.cpp" ${RC_FILE})
+add_executable (NavKit "NavKit.cpp" "RecastDemo/imgui.cpp" "RecastDemo/imguiRenderGL.cpp" "RecastDemo/MeshLoaderObj.cpp" "RecastDemo/InputGeom.cpp" "RecastDemo/ChunkyTriMesh.cpp" "RecastDemo/SampleInterfaces.cpp" "RecastDemo/PerfTimer.cpp" "ReasoningGrid.cpp" "RecastDemo/Sample.cpp" "RecastDemo/Sample_SoloMesh.cpp" "GameConnection.cpp" "easywsclient/easywsclient.cpp" "easywsclient/easywsclient.cpp" "easywsclient/easywsclient.cpp" "Navp.cpp" "Obj.cpp" "FileUtil.cpp" "Airg.cpp" "SceneExtract.cpp" "Renderer.cpp" "InputHandler.cpp" "Gui.cpp" "PfBoxes.cpp" "VisionData.cpp" "NavKit.rc")
 target_include_directories(NavKit PUBLIC "${PROJECT_BINARY_DIR}")
 target_include_directories(NavKit PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
 target_link_libraries(NavKit PRIVATE ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} )
 target_link_libraries(NavKit PRIVATE OpenGL::GLU)
 target_link_libraries(NavKit PRIVATE OpenGL::GL)
 target_link_libraries(NavKit PRIVATE GLUT::GLUT)
 target_link_libraries(NavKit PRIVATE GLEW::GLEW)
+target_link_libraries(NavKit PRIVATE cpptrace::cpptrace)
 target_link_libraries(NavKit PRIVATE simdjson::simdjson)
 target_link_libraries(NavKit PRIVATE RecastNavigation::Recast)
 target_link_libraries(NavKit PRIVATE RecastNavigation::DebugUtils)