O2R Support (#158)

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>

.gitignore

@@ -29,6 +29,7 @@
 *.app
 *.hex
 *.otr
+*.o2r
 
 # Debug files
 *.dSYM/

CMakeLists.txt

@@ -590,8 +590,8 @@ add_custom_target(
     DEPENDS torch
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMAND ${TORCH_EXECUTABLE} header -o baserom.us.z64
-    COMMAND ${TORCH_EXECUTABLE} otr baserom.us.z64
-    COMMAND ${TORCH_EXECUTABLE} pack assets ship.otr
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/spaghetti.otr" "${CMAKE_BINARY_DIR}/spaghetti.otr"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/ship.otr" "${CMAKE_BINARY_DIR}/ship.otr"
+    COMMAND ${TORCH_EXECUTABLE} o2r baserom.us.z64
+    COMMAND ${TORCH_EXECUTABLE} pack assets ship.o2r o2r
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/spaghetti.o2r" "${CMAKE_BINARY_DIR}/spaghetti.o2r"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/ship.o2r" "${CMAKE_BINARY_DIR}/ship.o2r"
 )

config.yml

@@ -7,7 +7,7 @@
     enums: 
       - include/defines.h
     output:
-      binary: spaghetti.otr
+      binary: spaghetti.o2r
       headers: include/assets
       code: assets/code
   segments:

src/port/Engine.cpp

@@ -42,11 +42,11 @@ GameEngine* GameEngine::Instance;
 
 GameEngine::GameEngine() {
     std::vector<std::string> OTRFiles;
-    if (const std::string spaghetti_path = Ship::Context::GetPathRelativeToAppDirectory("spaghetti.otr");
+    if (const std::string spaghetti_path = Ship::Context::GetPathRelativeToAppDirectory("spaghetti.o2r");
         std::filesystem::exists(spaghetti_path)) {
         OTRFiles.push_back(spaghetti_path);
     }
-    if (const std::string ship_otr_path = Ship::Context::GetPathRelativeToAppBundle("ship.otr");
+    if (const std::string ship_otr_path = Ship::Context::GetPathRelativeToAppBundle("ship.o2r");
         std::filesystem::exists(ship_otr_path)) {
         OTRFiles.push_back(ship_otr_path);
     }