Refactor, improve logging and error handling

Author: dbierek

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: CMake Build
 
 on:
   push:
-    branches: [ main, Navpower ]
+    branches: [ main ]
   release:
     types: [ created ]
   pull_request:

CMakePresets.json

@@ -2,17 +2,16 @@
   "version": 2,
   "configurePresets": [
     {
-      "name": "x64-debug",
-      "displayName": "Windows x64 Debug",
-      "description": "Sets Ninja generator, compilers, x64 architecture, build and install directory, debug build type",
+      "name": "base",
+      "displayName": "Basic config",
+      "description": "Basic config using Ninja generator",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
       "architecture": {
         "value": "x64",
         "strategy": "external"
       },
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install/${presetName}",
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/extern/vcpkg/scripts/buildsystems/vcpkg.cmake"
       },
@@ -21,6 +20,20 @@
           "hostOS": [ "Windows" ]
         }
       }
+    },
+    {
+      "name": "x64-debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "inherits": [ "base" ]
+    },
+    {
+      "name": "x64-release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      },
+      "inherits": [ "base" ]
     }
   ]
 }

LICENSE.md

@@ -4,7 +4,7 @@
 #include <filesystem>
 
 namespace FileUtil {
-	char* openNfdLoadDialog(nfdu8filteritem_t* filters, nfdfiltersize_t filterCount, char* defaultPath = NULL);
-	char* openNfdSaveDialog(nfdu8filteritem_t* filters, nfdfiltersize_t filterCount, const nfdu8char_t* defaultName, char* defaultPath = NULL);
-	char* openNfdFolderDialog(char* defaultPath = NULL);
+	char* openNfdLoadDialog(nfdu8filteritem_t* filters, nfdfiltersize_t filterCount, char* defaultPath = nullptr);
+	char* openNfdSaveDialog(nfdu8filteritem_t* filters, nfdfiltersize_t filterCount, const nfdu8char_t* defaultName, char* defaultPath = nullptr);
+	char* openNfdFolderDialog(char* defaultPath = nullptr);
 }

bin/alocgen.dll

@@ -25,15 +25,15 @@ class Renderer {
 	void initFrameBuffer(int width, int height);
 	void drawText(std::string text, Vec3 pos, Vec3 color = { 0.0, 0.0, 0.0 }, double size = 32.0);
 	bool initWindowAndRenderer();
-	void closeWindow();
+	void closeWindow() const;
 	void initFrameRate(float frameRateValue);
 	void updateFrameRate();
 	void handleResize();
 	void renderFrame();
-	void finalizeFrame();
-	void drawBounds();
+	void finalizeFrame() const;
+	void drawBounds() const;
 	void drawAxes();
-	HitTestResult hitTestRender(int mx, int my);
+	HitTestResult hitTestRender(int mx, int my) const;
 
 	GLuint framebuffer;
 	GLuint color_rb;

extern/vcpkg

@@ -2,12 +2,13 @@
 
 #include "NavKit.h"
 #include "PfBoxes.h"
+#include <Windows.h>
 
 class NavKit;
 
 class SceneExtract {
 public:
-	SceneExtract(NavKit* navKit);
+	SceneExtract(NavKit* navKit, const std::string &pythonScript);
 	~SceneExtract();
 
 	void drawMenu();
@@ -30,6 +31,7 @@ class SceneExtract {
 	std::string hitmanFolderName;
 	bool hitmanSet;
 	std::string outputFolderName;
+	std::string pythonScript;
 	bool outputSet;
 	bool errorExtracting;
 	std::vector<HANDLE> handles;

include/NavKit/FileUtil.h

@@ -19,11 +19,13 @@
 #ifndef SAMPLEINTERFACES_H
 #define SAMPLEINTERFACES_H
 
+#include <deque>
+#include <mutex>
+
 #include "DebugDraw.h"
 #include "Recast.h"
 #include "RecastDump.h"
 #include "PerfTimer.h"
-#include <vector>
 #include <string>
 
 // These are example implementations of various interfaces used in Recast and Detour.
@@ -34,25 +36,26 @@ class BuildContext : public rcContext
 	TimeVal m_startTime[RC_MAX_TIMERS];
 	TimeVal m_accTime[RC_MAX_TIMERS];
 
-	static const int MAX_MESSAGES = 250;
-	const char* m_messages[MAX_MESSAGES];
 	int m_messageCount;
-	static const int TEXT_POOL_SIZE = 8000;
+	static const int TEXT_POOL_SIZE = 4000;
 	char m_textPool[TEXT_POOL_SIZE];
 	int m_textPoolSize;
-	std::vector<std::string> m_logBuffer;
 
 public:
 	BuildContext();
 
+	static const int MAX_MESSAGES = 250;
+	const char* m_messages[MAX_MESSAGES];
+	std::mutex m_log_mutex;
+	std::deque<std::string> m_logBuffer;
 	/// Dumps the log to stdout.
 	void dumpLog(const char* format, ...);
 	/// Returns number of log messages.
 	int getLogCount() const;
 	/// Returns log message text.
 	const char* getLogText(const int i) const;
 
-protected:	
+protected:
 	/// Virtual functions for custom implementations.
 	///@{
 	virtual void doResetLog();