sync

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# Project sponsorship links
+
+patreon: UGildor
+custom: https://www.gildor.org/en/donate

.gitignore

@@ -31,8 +31,8 @@ umodel.cfg
 !.vs/tasks.vs.json
 
 # Executable files and pdb
-umodel.pdb
-SDL2.dll
+umodel[-_]*.exe
+umodel*.pdb
 Tools/**/*.exe
 Tools/**/*.pdb
 *todo.md
@@ -41,9 +41,9 @@ Tools/**/*.pdb
 Tools/UITest/vs/Debug/
 Tools/UITest/vs/Release/
 
-# ooz library
-libs/oodle/*.h
-libs/oodle/*.cpp
+# oodle library
+libs/oodle/include
+libs/oodle/lib
 
 # oodle dll
 libs/oo2core*.dll

.vs/CppProperties.json

@@ -15,7 +15,7 @@
       "intelliSenseMode": "windows-msvc-x86",
       "environments": [
         {
-          "BuildOptions": ""
+          "BuildOptions": "--exe umodel.exe"
         }
       ]
     },
@@ -35,7 +35,7 @@
       "intelliSenseMode": "windows-msvc-x86",
       "environments": [
         {
-          "BuildOptions": "--debug"
+          "BuildOptions": "--debug --exe umodel.exe"
         }
       ]
     },
@@ -54,7 +54,7 @@
       "intelliSenseMode": "windows-msvc-x64",
       "environments": [
         {
-          "BuildOptions": "--64"
+          "BuildOptions": "--64 --exe umodel.exe"
         }
       ]
     },
@@ -74,7 +74,7 @@
       "intelliSenseMode": "windows-msvc-x64",
       "environments": [
         {
-          "BuildOptions": "--64 --debug"
+          "BuildOptions": "--64 --debug --exe umodel.exe"
         }
       ]
     }

.vscode/c_cpp_properties.json

@@ -1,37 +1,32 @@
 {
     "configurations": [
         {
-            "name": "Win32",
-            "includePath": [
-                "${workspaceFolder}",
-                "${workspaceFolder}/Core",
-                "${workspaceFolder}/Unreal",
-                "${workspaceFolder}/UmodelTool",
-                "${workspaceFolder}/libs",
-                "${workspaceFolder}/libs/include",
-                "${workspaceFolder}/libs/includewin32",
-                "${workspaceFolder}/UI"
-            ],
-            "defines": [
-                "MAX_DEBUG",
-                "RENDERING",
-                "HAS_UI"
-            ],
-            "forcedInclude": [
-                "${workspaceFolder}/Unreal/GameDefines.h"
-            ],
-            "windowsSdkVersion": "10.0.18362.0",
-            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.24.28314/bin/Hostx64/x64/cl.exe",
-            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "${workspaceFolder}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
+            "name": "Win32-Release",
+            "customConfigurationVariables": {
+                "BuildOptions": "",
+				"ExeName": "umodel.exe"
+			}
+        },
+        {
+            "name": "Win32-Debug",
+            "customConfigurationVariables": {
+                "BuildOptions": "--debug",
+				"ExeName": "umodel-debug.exe"
+			}
+        },
+        {
+            "name": "Win64-Release",
+            "customConfigurationVariables": {
+                "BuildOptions": "--64",
+				"ExeName": "umodel_64.exe"
+			}
+        },
+        {
+            "name": "Win64-Debug",
+            "customConfigurationVariables": {
+                "BuildOptions": "--64 --debug",
+				"ExeName": "umodel-debug_64.exe"
+			}
         }
     ],
     "version": 4

.vscode/launch.json

@@ -9,23 +9,21 @@
 			"name": "(No arguments)",
 			"type": "cppvsdbg",
 			"request": "launch",
-			"program": "${workspaceFolder}/umodel.exe",
+			"program": "${workspaceFolder}/${input:ExeName}",
 			"args": [],
 			"stopAtEntry": false,
 			"cwd": "${workspaceFolder}",
 			"environment": [],
-			"externalConsole": false,
 			"logging": { "moduleLoad": false },
 			"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
 		},
 		{
 			"name": "Volatile (cmdline.cfg)",
 			"type": "cppvsdbg",
 			"request": "launch",
-			"program": "${workspaceFolder}/umodel.exe",
+			"program": "${workspaceFolder}/${input:ExeName}",
 			"args": [ "@${workspaceFolder}/docs/cmdline.cfg" ],
 			"cwd": "${workspaceFolder}",
-			"externalConsole": false,
 			"logging": { "moduleLoad": false },
 			"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
 		},
@@ -37,9 +35,18 @@
 			"program": "${workspaceFolder}/Tools/UITest/uitest.exe",
 			"args": [],
 			"cwd": "${workspaceFolder}",
-			"externalConsole": false,
 			"logging": { "moduleLoad": false },
 			"visualizerFile": "${workspaceFolder}/Tools/umodel.natvis"
 		}
-	]
-}
+	],
+    "inputs": [
+		// Requesting a customConfigurationVariables from c_cpp_properties.json (undocumented, may be changed in a future_
+		// https://stackoverflow.com/a/62404215
+        {
+            "id": "ExeName",
+            "type": "command",
+            "command": "cpptools.activeConfigCustomVariable",
+            "args": "ExeName"
+        }
+ 	]
+}

.vscode/settings.json

@@ -25,6 +25,32 @@
         "*.project": "perl"
     },
     "files.trimTrailingWhitespace": true,
+    "C_Cpp.default.includePath": [
+        "${workspaceFolder}",
+        "${workspaceFolder}/Core",
+        "${workspaceFolder}/Unreal",
+        "${workspaceFolder}/UmodelTool",
+        "${workspaceFolder}/libs",
+        "${workspaceFolder}/libs/include",
+        "${workspaceFolder}/libs/includewin32",
+        "${workspaceFolder}/UI"
+    ],
+    "C_Cpp.default.defines": [
+        "MAX_DEBUG",
+        "RENDERING",
+        "HAS_UI"
+    ],
+    "C_Cpp.default.forcedInclude": [
+        "${workspaceFolder}/Unreal/GameDefines.h"
+    ],
+    "C_Cpp.default.cStandard": "c11",
+    "C_Cpp.default.cppStandard": "c++17",
+    "C_Cpp.default.intelliSenseMode": "msvc-x64",
+    "C_Cpp.default.browse.path": [
+        "${workspaceFolder}"
+    ],
+    "C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
+    "C_Cpp.default.browse.databaseFilename": "",
     "cSpell.words": [
 		"FCOLOR",
 		"FGPU",
@@ -48,6 +74,7 @@
 		"unversioned",
 		"recurse",
 		"uv",
+		"retargeting",
 		"retarget"
 	]
 }

.vscode/tasks.json

@@ -6,7 +6,7 @@
 		{
 			"label": "Build",
 			"type": "shell",
-			"command": "./build.sh --debug",
+			"command": "./build.sh ${input:BuildOptions}",
 			"group": {
 				"kind": "build",
 				"isDefault": true
@@ -21,7 +21,7 @@
 		{
 			"label": "Compile",
 			"type": "shell",
-			"command": "./build.sh --debug --file \"${relativeFile}\"",
+			"command": "./build.sh ${input:BuildOptions} --file \"${relativeFile}\"",
 			"presentation": {
 				"reveal": "always",
 				"showReuseMessage": false,
@@ -57,13 +57,21 @@
 			},
 			"problemMatcher": ""
 		}
-	]
+	],
     "inputs": [
+		// Requesting a customConfigurationVariables from c_cpp_properties.json (undocumented, may be changed in a future_
+		// https://stackoverflow.com/a/62404215
+        {
+            "id": "BuildOptions",
+            "type": "command",
+            "command": "cpptools.activeConfigCustomVariable",
+            "args": "BuildOptions"
+        },
         {
             "id": "ue4const",
+            "type": "promptString",
             "description": "UE4 C++ constant:",
-            "default": "",
-            "type": "promptString"
+            "default": ""
         },
-    ]
+ 	]
 }

Core/Core.cpp

@@ -72,6 +72,10 @@ CErrorContext GError;
 
 void appError(const char *fmt, ...)
 {
+#if THREADING
+	if (!GError.ShouldLogThisThread()) THROW;
+#endif
+
 	va_list	argptr;
 	va_start(argptr, fmt);
 	char buf[4096];
@@ -177,6 +181,10 @@ void CErrorContext::HandleError()
 
 void CErrorContext::StandardHandler()
 {
+	// Do not print error message twice (e.g. when StandardHandler is called from worker thread, then from main thread)
+	if (IsErrorLogged) return;
+	IsErrorLogged = true;
+
 	void (*PrintFunc)(const char*, ...);
 	PrintFunc = GError.SuppressLog ? appPrintf : appNotify;
 
@@ -195,6 +203,22 @@ void CErrorContext::StandardHandler()
 
 #if DO_GUARD
 
+#if THREADING
+
+bool CErrorContext::ShouldLogThisThread()
+{
+	int ThreadId = CThread::CurrentId();
+	if (ErrorThreadId == 0)
+	{
+		//todo: this operation is not thread-safe
+		ErrorThreadId = ThreadId;
+		return true;
+	}
+	return ErrorThreadId == ThreadId;
+}
+
+#endif // THREADING
+
 void CErrorContext::LogHistory(const char *part)
 {
 	if (!History[0])
@@ -204,6 +228,9 @@ void CErrorContext::LogHistory(const char *part)
 
 void CErrorContext::SetPrefix(const char* prefix)
 {
+#if THREADING
+	if (!GError.ShouldLogThisThread()) return;
+#endif
 	char buf[512];
 	appSprintf(ARRAY_ARG(buf), GError.FmtNeedArrow ? " <- %s: " : "%s: ", prefix);
 	GError.LogHistory(buf);
@@ -212,6 +239,10 @@ void CErrorContext::SetPrefix(const char* prefix)
 
 void CErrorContext::UnwindThrow(const char *fmt, ...)
 {
+#if THREADING
+	if (!GError.ShouldLogThisThread()) THROW;
+#endif
+
 	char buf[512];
 	va_list argptr;