gilmorem560 · z33ky · Jan 2, 2022 · Jan 3, 2022 · Apr 19, 2022 · Apr 19, 2022
diff --git a/Makefile b/Makefile
@@ -45,6 +45,8 @@ AUDIO		=	TheForceEngine/TFE_Audio/audioDevice.o \
 				TheForceEngine/TFE_Audio/audioSystem.o \
 				TheForceEngine/TFE_Audio/midiDevice.o \
 				TheForceEngine/TFE_Audio/midiPlayer.o \
+				TheForceEngine/TFE_Audio/RtAudio.o \
+				TheForceEngine/TFE_Audio/RtMidi.o
 
 DARKFORCES	=	TheForceEngine/TFE_DarkForces/Actor/actor.o \
 				TheForceEngine/TFE_DarkForces/Actor/actorDebug.o \
@@ -66,19 +68,42 @@ DARKFORCES	=	TheForceEngine/TFE_DarkForces/Actor/actor.o \
 				TheForceEngine/TFE_DarkForces/GameUI/delt.o \
 				TheForceEngine/TFE_DarkForces/GameUI/editBox.o \
 				TheForceEngine/TFE_DarkForces/GameUI/escapeMenu.o \
+				TheForceEngine/TFE_DarkForces/GameUI/menu.o \
+				TheForceEngine/TFE_DarkForces/GameUI/missionBriefing.o \
+				TheForceEngine/TFE_DarkForces/GameUI/pda.o \
 				TheForceEngine/TFE_DarkForces/GameUI/uiDraw.o \
 				TheForceEngine/TFE_DarkForces/agent.o \
 				TheForceEngine/TFE_DarkForces/animLogic.o \
 				TheForceEngine/TFE_DarkForces/automap.o \
+				TheForceEngine/TFE_DarkForces/briefingList.o \
 				TheForceEngine/TFE_DarkForces/cheats.o \
 				TheForceEngine/TFE_DarkForces/config.o \
 				TheForceEngine/TFE_DarkForces/darkForcesMain.o \
-				TheForceEngine/TFE_DarkForces/gameList.o \
 				TheForceEngine/TFE_DarkForces/gameMessage.o \
 				TheForceEngine/TFE_DarkForces/generator.o \
 				TheForceEngine/TFE_DarkForces/hitEffect.o \
 				TheForceEngine/TFE_DarkForces/hud.o \
 				TheForceEngine/TFE_DarkForces/item.o \
+				TheForceEngine/TFE_DarkForces/Landru/cutscene.o \
+				TheForceEngine/TFE_DarkForces/Landru/cutsceneList.o \
+				TheForceEngine/TFE_DarkForces/Landru/cutscene_film.o \
+				TheForceEngine/TFE_DarkForces/Landru/cutscene_player.o \
+				TheForceEngine/TFE_DarkForces/Landru/lactor.o \
+				TheForceEngine/TFE_DarkForces/Landru/lactorAnim.o \
+				TheForceEngine/TFE_DarkForces/Landru/lactorCust.o \
+				TheForceEngine/TFE_DarkForces/Landru/lactorDelt.o \
+				TheForceEngine/TFE_DarkForces/Landru/lcanvas.o \
+				TheForceEngine/TFE_DarkForces/Landru/ldraw.o \
+				TheForceEngine/TFE_DarkForces/Landru/lfade.o \
+				TheForceEngine/TFE_DarkForces/Landru/lfont.o \
+				TheForceEngine/TFE_DarkForces/Landru/lmusic.o \
+				TheForceEngine/TFE_DarkForces/Landru/lpalette.o \
+				TheForceEngine/TFE_DarkForces/Landru/lrect.o \
+				TheForceEngine/TFE_DarkForces/Landru/lsound.o \
+				TheForceEngine/TFE_DarkForces/Landru/lsystem.o \
+				TheForceEngine/TFE_DarkForces/Landru/ltimer.o \
+				TheForceEngine/TFE_DarkForces/Landru/lview.o \
+				TheForceEngine/TFE_DarkForces/Landru/textCrawl.o \
 				TheForceEngine/TFE_DarkForces/logic.o \
 				TheForceEngine/TFE_DarkForces/mission.o \
 				TheForceEngine/TFE_DarkForces/pickup.o \
@@ -189,6 +214,7 @@ SYSTEM		=	TheForceEngine/TFE_System/log.o \
 				TheForceEngine/TFE_System/profiler.o \
 				TheForceEngine/TFE_System/system.o \
 				TheForceEngine/TFE_System/Threads/Linux/mutexLinux.o \
+				TheForceEngine/TFE_System/Threads/Linux/signalLinux.o \
 				TheForceEngine/TFE_System/Threads/Linux/threadLinux.o
 
 UI			=	TheForceEngine/TFE_Ui/imGUI/imgui.o \

diff --git a/TheForceEngine/TFE_DarkForces/GameUI/escapeMenu.cpp b/TheForceEngine/TFE_DarkForces/GameUI/escapeMenu.cpp
@@ -318,6 +318,14 @@ namespace TFE_DarkForces
 		s32 dx, dy;
 		TFE_Input::getAccumulatedMouseMove(&dx, &dy);
 
+		MonitorInfo monitorInfo;
+		TFE_RenderBackend::getCurrentMonitorInfo(&monitorInfo);
+
+		// Scale the mouse delta based on monitor resolution.
+		s32 uiScale = max(100, 100 * monitorInfo.h / 1080);
+		dx = (dx * uiScale) / 100;
+		dy = (dy * uiScale) / 100;
+
 		s_cursorPosAccum.x = clamp(s_cursorPosAccum.x + dx, 0, displayInfo.width);
 		s_cursorPosAccum.z = clamp(s_cursorPosAccum.z + dy, 0, displayInfo.height);
 		if (displayInfo.width >= displayInfo.height)

diff --git a/TheForceEngine/TFE_DarkForces/GameUI/menu.cpp b/TheForceEngine/TFE_DarkForces/GameUI/menu.cpp
@@ -66,14 +66,22 @@ namespace TFE_DarkForces
 		DisplayInfo displayInfo;
 		TFE_RenderBackend::getDisplayInfo(&displayInfo);
 
+		MonitorInfo monitorInfo;
+		TFE_RenderBackend::getCurrentMonitorInfo(&monitorInfo);
+
 		LRect bounds;
 		lcanvas_getBounds(&bounds);
-		s32 width = bounds.right - bounds.left;
+		s32 width  = bounds.right  - bounds.left;
 		s32 height = bounds.bottom - bounds.top;
 
 		s32 dx, dy;
 		TFE_Input::getAccumulatedMouseMove(&dx, &dy);
 
+		// Scale the mouse delta based on monitor resolution.
+		s32 uiScale = max(100, 100 * monitorInfo.h / 1080);
+		dx = (dx * uiScale) / 100;
+		dy = (dy * uiScale) / 100;
+
 		s_cursorPosAccum.x = clamp(s_cursorPosAccum.x + dx, 0, displayInfo.width);
 		s_cursorPosAccum.z = clamp(s_cursorPosAccum.z + dy, 0, displayInfo.height);
 		if (displayInfo.width >= displayInfo.height)

diff --git a/TheForceEngine/TFE_DarkForces/GameUI/missionBriefing.cpp b/TheForceEngine/TFE_DarkForces/GameUI/missionBriefing.cpp
@@ -50,7 +50,7 @@ namespace TFE_DarkForces
 
 	s16 s_briefY;
 	s32 s_briefingMaxY;
-	LRect s_overlayRect;
+	static LRect s_overlayRect;
 
 	enum
 	{

diff --git a/TheForceEngine/TFE_DarkForces/GameUI/missionBriefing.h b/TheForceEngine/TFE_DarkForces/GameUI/missionBriefing.h
@@ -22,5 +22,4 @@ namespace TFE_DarkForces
 
 	extern s16 s_briefY;
 	extern s32 s_briefingMaxY;
-	extern LRect s_overlayRect;
 }
diff --git a/TheForceEngine/TFE_DarkForces/Landru/cutscene_film.cpp b/TheForceEngine/TFE_DarkForces/Landru/cutscene_film.cpp
@@ -14,6 +14,8 @@
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_System/parser.h>
+#include <string.h>
+
 
 using namespace TFE_Jedi;
 

diff --git a/TheForceEngine/TFE_DarkForces/Landru/cutscene_player.cpp b/TheForceEngine/TFE_DarkForces/Landru/cutscene_player.cpp
@@ -16,6 +16,7 @@
 #include <TFE_Jedi/Sound/soundSystem.h>
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_System/parser.h>
+#include <string.h>
 
 using namespace TFE_Jedi;
 

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lactor.cpp b/TheForceEngine/TFE_DarkForces/Landru/lactor.cpp
@@ -4,6 +4,7 @@
 #include "lview.h"
 #include "ltimer.h"
 #include <TFE_Game/igame.h>
+#include <string.h>
 #include <assert.h>
 
 namespace TFE_DarkForces

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lcanvas.cpp b/TheForceEngine/TFE_DarkForces/Landru/lcanvas.cpp
@@ -4,6 +4,7 @@
 #include <TFE_System/system.h>
 #include <TFE_Jedi/Math/core_math.h>
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
+#include <string.h>
 #include <assert.h>
 
 using namespace TFE_Jedi;

diff --git a/TheForceEngine/TFE_DarkForces/Landru/ldraw.cpp b/TheForceEngine/TFE_DarkForces/Landru/ldraw.cpp
@@ -4,6 +4,7 @@
 #include <TFE_Game/igame.h>
 #include <TFE_Jedi/Math/core_math.h>
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
+#include <string.h>
 #include <assert.h>
 #include <map>
 

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lfont.cpp b/TheForceEngine/TFE_DarkForces/Landru/lfont.cpp
@@ -7,6 +7,7 @@
 #include <TFE_Game/igame.h>
 #include <TFE_Jedi/Math/core_math.h>
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
+#include <string.h>
 #include <assert.h>
 #include <map>
 

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lmusic.cpp b/TheForceEngine/TFE_DarkForces/Landru/lmusic.cpp
@@ -7,6 +7,7 @@
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_FileSystem/paths.h>
 #include <TFE_System/parser.h>
+#include <string.h>
 #include <assert.h>
 
 namespace TFE_DarkForces

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lpalette.cpp b/TheForceEngine/TFE_DarkForces/Landru/lpalette.cpp
@@ -4,6 +4,7 @@
 #include <TFE_Game/igame.h>
 #include <TFE_Jedi/Math/core_math.h>
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
+#include <string.h>
 #include <assert.h>
 
 using namespace TFE_Jedi;
@@ -637,6 +638,10 @@ namespace TFE_DarkForces
 	{
 		pal->resType = resType;
 		strcpy(pal->name, name);
-		_strlwr(pal->name);
+		#ifdef WIN32
+			_strlwr(pal->name);
+		#else
+			strlwr(pal->name);
+		#endif
 	}
 }
diff --git a/TheForceEngine/TFE_DarkForces/Landru/lsound.cpp b/TheForceEngine/TFE_DarkForces/Landru/lsound.cpp
@@ -5,6 +5,7 @@
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_FileSystem/paths.h>
 #include <TFE_Jedi/Math/core_math.h>
+#include <string.h>
 #include <assert.h>
 
 using namespace TFE_Jedi;

diff --git a/TheForceEngine/TFE_DarkForces/Landru/lview.cpp b/TheForceEngine/TFE_DarkForces/Landru/lview.cpp
@@ -9,6 +9,7 @@
 #include <TFE_Game/igame.h>
 #include <TFE_Jedi/Renderer/virtualFramebuffer.h>
 #include <TFE_Jedi/Math/core_math.h>
+#include <string.h>
 #include <assert.h>
 
 using namespace TFE_Jedi;

diff --git a/TheForceEngine/TFE_DarkForces/Landru/textCrawl.cpp b/TheForceEngine/TFE_DarkForces/Landru/textCrawl.cpp
@@ -7,6 +7,7 @@
 #include <TFE_Jedi/Math/core_math.h>
 #include <TFE_Jedi/Math/fixedPoint.h>
 #include <TFE_Game/igame.h>
+#include <string.h>
 #include <assert.h>
 
 using namespace TFE_Jedi;

diff --git a/TheForceEngine/TFE_DarkForces/briefingList.cpp b/TheForceEngine/TFE_DarkForces/briefingList.cpp
@@ -4,6 +4,7 @@
 #include <TFE_System/system.h>
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_System/parser.h>
+#include <string.h>
 
 namespace TFE_DarkForces
 {
@@ -78,10 +79,17 @@ namespace TFE_DarkForces
 			}
 			else
 			{
-				_strlwr(mission);
-				_strlwr(archive);
-				_strlwr(bgAnim);
-				_strlwr(palette);
+				#ifdef _WIN32
+					_strlwr(mission);
+					_strlwr(archive);
+					_strlwr(bgAnim);
+					_strlwr(palette);
+				#else
+					strlwr(mission);
+					strlwr(archive);
+					strlwr(bgAnim);
+					strlwr(palette);
+				#endif
 
 				strcpy(info->mission, mission);
 				strcpy(info->archive, archive);

diff --git a/TheForceEngine/TFE_FileSystem/paths.cpp b/TheForceEngine/TFE_FileSystem/paths.cpp
@@ -232,7 +232,11 @@ namespace TFE_Paths
 	{
 		char fileNameLC[TFE_MAX_PATH];
 		strcpy(fileNameLC, fileName);
-		_strlwr(fileNameLC);
+		#ifdef WIN32
+			_strlwr(fileNameLC);
+		#else
+			strlwr(fileNameLC);
+		#endif
 
 		char filePathFixed[TFE_MAX_PATH];
 		strcpy(filePathFixed, filePath);

diff --git a/TheForceEngine/TFE_FrontEndUI/console.cpp b/TheForceEngine/TFE_FrontEndUI/console.cpp
@@ -34,6 +34,7 @@ namespace TFE_Console
 	static ImFont* s_consoleFont;
 	static f32 s_height;
 	static f32 s_anim;
+	static s32 s_fontSize;
 	static s32 s_historyIndex;
 	static s32 s_historyScroll;
 
@@ -55,8 +56,11 @@ namespace TFE_Console
 
 	bool init()
 	{
+		s32 scale = TFE_Ui::getUiScale();
+		s_fontSize = (scale * 20) / 100;
+
 		ImGuiIO& io = ImGui::GetIO();
-		s_consoleFont = io.Fonts->AddFontFromFileTTF("Fonts/DroidSansMono.ttf", 20);
+		s_consoleFont = io.Fonts->AddFontFromFileTTF("Fonts/DroidSansMono.ttf", s_fontSize);
 		s_height = 0.0f;
 		s_anim = 0.0f;
 		s_historyIndex = -1;
@@ -561,20 +565,20 @@ namespace TFE_Console
 			}
 
 			const s32 count = (s32)s_history.size();
-			const s32 elementsPerPage = ((s32)consoleHeight - 36) / 20;
+			const s32 elementsPerPage = ((s32)consoleHeight - 16 - s_fontSize) / s_fontSize;
 			s_historyScroll = std::max(0, std::min(s_historyScroll, count - elementsPerPage));
 			s32 start = count - 1 - s_historyScroll;
 
-			s32 y = (s32)consoleHeight - 56;
-			for (s32 i = start; i >= 0 && y > -20; i--, y -= 20)
+			s32 y = (s32)consoleHeight - 16 - 2*s_fontSize;
+			for (s32 i = start; i >= 0 && y > -s_fontSize; i--, y -= s_fontSize)
 			{
 				ImGui::SetCursorPosY(f32(y));
 				ImGui::TextColored(ImVec4(s_history[i].color.x, s_history[i].color.y, s_history[i].color.z, s_history[i].color.w), s_history[i].text.c_str());
 			}
 
 			ImGui::SetKeyboardFocusHere();
 			ImGui::SetNextItemWidth(f32(w - 16));
-			ImGui::SetCursorPosY(consoleHeight - 32.0f);
+			ImGui::SetCursorPosY(consoleHeight - 12.0f - s_fontSize);
 			u32 flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_NoHorizontalScroll |
 						ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory;
 			// Make sure the key to close the console doesn't make its was into the command line.

diff --git a/TheForceEngine/TFE_FrontEndUI/editorTexture.cpp b/TheForceEngine/TFE_FrontEndUI/editorTexture.cpp
@@ -42,7 +42,7 @@ namespace TFE_FrontEndUI
 		}
 	}
 
-	bool createTexture(const TextureData* src, const u32* palette, EditorTexture* tex)
+	bool createTexture(const TextureData* src, const u32* palette, EditorTexture* tex, MagFilter filter)
 	{
 		if (!src || !tex) { return false; }
 		tex->scale = { 1.0f, 1.0f };
@@ -51,7 +51,7 @@ namespace TFE_FrontEndUI
 		u32* image = s_imageBuffer.data();
 		convertDfTextureToTrueColor(src, palette, image);
 
-		tex->texture = TFE_RenderBackend::createTexture(src->width, src->height, image);
+		tex->texture = TFE_RenderBackend::createTexture(src->width, src->height, image, filter);
 
 		tex->scale.x = 1.0f;
 		tex->scale.z = 1.0f;

diff --git a/TheForceEngine/TFE_FrontEndUI/editorTexture.h b/TheForceEngine/TFE_FrontEndUI/editorTexture.h
@@ -24,5 +24,5 @@ namespace TFE_FrontEndUI
 {
 	bool convertPalette(const u8* srcPalette, u32* dstPalette);
 	void convertDfTextureToTrueColor(const TextureData* src, const u32* palette, u32* image);
-	bool createTexture(const TextureData* src, const u32* palette, EditorTexture* tex);
+	bool createTexture(const TextureData* src, const u32* palette, EditorTexture* tex, MagFilter filter = MAG_FILTER_NONE);
 }