From e8ba89ddb634ecaeae8f8e0054afe88ad354e3d8 Mon Sep 17 00:00:00 2001
From: AloXado320 <38191089+AloXado320@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:58:56 -0500
Subject: [PATCH] Update Torch and LUS (#64)

---
 libultraship        | 2 +-
 src/port/Engine.cpp | 5 ++---
 torch               | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libultraship b/libultraship
index 96cea7ec3..9babd56c2 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 96cea7ec304ce12782dd8893b54743d9641d5d13
+Subproject commit 9babd56c2a0f9aeb419c60abb9acc13d2a154517
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index dfd2276f4..b13708603 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -30,7 +30,7 @@ float gInterpolationStep = 0.0f;
 #include <MatrixFactory.h>
 #include <BlobFactory.h>
 #include <VertexFactory.h>
-// #include <LightsFactory.h>
+#include <LightFactory.h>
 }
 
 GameEngine* GameEngine::Instance;
@@ -70,8 +70,7 @@ GameEngine::GameEngine() {
     loader->RegisterResourceFactory(std::make_shared<LUS::ResourceFactoryBinaryDisplayListV0>(), RESOURCE_FORMAT_BINARY, "DisplayList", static_cast<uint32_t>(LUS::ResourceType::DisplayList), 0);
     loader->RegisterResourceFactory(std::make_shared<LUS::ResourceFactoryBinaryMatrixV0>(), RESOURCE_FORMAT_BINARY, "Matrix", static_cast<uint32_t>(LUS::ResourceType::Matrix), 0);
     loader->RegisterResourceFactory(std::make_shared<LUS::ResourceFactoryBinaryBlobV0>(), RESOURCE_FORMAT_BINARY, "Blob", static_cast<uint32_t>(LUS::ResourceType::Blob), 0);
-   // Waiting on PRs merged
-    // loader->RegisterResourceFactory(std::make_shared<LUS::ResourceFactoryBinaryLightsV0>(), RESOURCE_FORMAT_BINARY, "Lights1", static_cast<uint32_t>(LUS::ResourceType::Lights), 0);
+    loader->RegisterResourceFactory(std::make_shared<LUS::ResourceFactoryBinaryLightV0>(), RESOURCE_FORMAT_BINARY, "Lights1", static_cast<uint32_t>(LUS::ResourceType::Light), 0);
     loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryArrayV0>(), RESOURCE_FORMAT_BINARY, "Array", static_cast<uint32_t>(MK64::ResourceType::MK_Array), 0);
     loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryKartAIV0>(), RESOURCE_FORMAT_BINARY, "KartAI", static_cast<uint32_t>(MK64::ResourceType::KartAI), 0);
     loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryCourseVtxV0>(), RESOURCE_FORMAT_BINARY, "CourseVtx", static_cast<uint32_t>(MK64::ResourceType::CourseVertex), 0);
diff --git a/torch b/torch
index 5d499766c..b9560339d 160000
--- a/torch
+++ b/torch
@@ -1 +1 @@
-Subproject commit 5d499766c6c1e8dc0a55f927752d1fae0cb1397c
+Subproject commit b9560339d3aae8739ed237c8418acb444fdfe67b