update LUS

6 files changed, 11 insertions, 4 deletions

diff --git a/libultraship b/libultraship
-Subproject dda07c8ac6033ff98d37a05bc28406440c7769e
+Subproject a8cddd2f8991c9d50783db4de855c98a392f4ac
diff --git a/port/shaders/directx/default.shader.hlsl b/port/shaders/directx/default.shader.hlsl
index f36c2dae..980becb8 100644
--- a/port/shaders/directx/default.shader.hlsl
+++ b/port/shaders/directx/default.shader.hlsl
@@ -186,7 +186,7 @@ float4 PSMain(PSInput input, float4 screenSpace : SV_Position) : SV_TARGET {
             float2 tc@{i} = input.uv@{i};
             @{s = o_clamp[i][0]}
             @{t = o_clamp[i][1]}
-            @if(s && t)
+            @if(s || t)
                 int2 texSize@{i};
                 g_texture@{i}.GetDimensions(texSize@{i}.x, texSize@{i}.y);
                 @if(s && t)
@@ -224,7 +224,7 @@ float4 PSMain(PSInput input, float4 screenSpace : SV_Position) : SV_TARGET {
                         @else
                             float4 blendVal@{i} = float4(0, 0, 0, 0);
                         @end
-                        texval@{i} = lerp(texVal@{i}, blendVal@{i}, g_textureMask@{i}.Sample(g_sampler@{i}, tc@{i}).a);
+                        texVal@{i} = lerp(texVal@{i}, blendVal@{i}, g_textureMask@{i}.Sample(g_sampler@{i}, tc@{i}).a);
                     @end
                 }
             @else
@@ -329,4 +329,4 @@ float4 PSMain(PSInput input, float4 screenSpace : SV_Position) : SV_TARGET {
             return float4(texel, 1.0);
         @end
     @end
-}
\ No newline at end of file
+}
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 3ebf88f3..a2c16ca8 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -70,7 +70,12 @@ GameEngine::GameEngine() {
 
     std::vector<std::string> archiveFiles;
     const std::string main_path = Ship::Context::GetPathRelativeToAppDirectory("sf64.o2r");
+#ifdef __linux__
     const std::string assets_path = Ship::Context::GetPathRelativeToAppBundle("starship.o2r");
+#else
+    const std::string assets_path = Ship::Context::GetPathRelativeToAppDirectory("starship.o2r");
+#endif
+
 
 #ifdef _WIN32
     AllocConsole();
diff --git a/src/port/resource/importers/ResourceUtil.h b/src/port/resource/importers/ResourceUtil.h
index 32a6fd4c..67ed936a 100644
--- a/src/port/resource/importers/ResourceUtil.h
+++ b/src/port/resource/importers/ResourceUtil.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "resourcebridge.h"
+#include "ResourceManager.h"
 #include "Context.h"
 
 namespace SF64 {
diff --git a/src/port/resource/importers/audio/SampleFactory.cpp b/src/port/resource/importers/audio/SampleFactory.cpp
index 87f6ec14..d4115cb9 100644
--- a/src/port/resource/importers/audio/SampleFactory.cpp
+++ b/src/port/resource/importers/audio/SampleFactory.cpp
@@ -4,7 +4,7 @@
 #include "sf64audio_provisional.h"
 #define DR_WAV_IMPLEMENTATION
 #include <dr_wav.h>
-
+#include <tinyxml2.h>
 #define DR_MP3_IMPLEMENTATION
 #include <dr_mp3.h>
 
diff --git a/src/port/resource/importers/audio/SoundFontFactory.cpp b/src/port/resource/importers/audio/SoundFontFactory.cpp
index 126b43fe..c3d16d0f 100644
--- a/src/port/resource/importers/audio/SoundFontFactory.cpp
+++ b/src/port/resource/importers/audio/SoundFontFactory.cpp
@@ -3,6 +3,7 @@
 #include "utils/StringHelper.h"
 #include <sf64audio_provisional.h>
 #include "port/resource/type/audio/SoundFont.h"
+#include <tinyxml2.h>
 
 namespace SF64 {
 std::shared_ptr<Ship::IResource> ResourceFactoryBinarySoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,