packer: move packer module to TRX

LostArtefacts · Jan 26, 2025 · b8e8b06 · b8e8b06
1 parent 4a4f4ef
commit b8e8b06
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 47 deletions.
diff --git a/src/tr1/game/packer.c → src/libtrx/game/packer.c b/src/tr1/game/packer.c → src/libtrx/game/packer.c
@@ -1,12 +1,9 @@
 #include "game/packer.h"
 
-#include "global/const.h"
-#include "global/types.h"
-#include "global/vars.h"
-
-#include <libtrx/log.h>
-#include <libtrx/memory.h>
-#include <libtrx/utils.h>
+#include "game/output.h"
+#include "log.h"
+#include "memory.h"
+#include "utils.h"
 
 #include <stddef.h>
 #include <string.h>
@@ -76,43 +73,6 @@ static TEX_PAGE *m_VirtualPages = NULL;
 static int32_t m_QueueSize = 0;
 static TEX_CONTAINER *m_Queue = NULL;
 
-bool Packer_Pack(PACKER_DATA *data)
-{
-    m_Data = data;
-
-    m_StartPage = m_Data->level_page_count - 1;
-    m_EndPage = MAX_TEXTURE_PAGES - m_StartPage;
-    m_UsedPageCount = 0;
-    m_QueueSize = 0;
-
-    M_AllocateNewPage();
-
-    for (int i = 0; i < data->object_count; i++) {
-        M_PrepareObject(i);
-    }
-    for (int i = 0; i < data->sprite_count; i++) {
-        M_PrepareSprite(i);
-    }
-
-    bool result = true;
-    for (int i = 0; i < m_QueueSize; i++) {
-        TEX_CONTAINER *container = &m_Queue[i];
-        if (!M_PackContainer(container)) {
-            LOG_ERROR("Failed to pack container %d of %d", i, m_QueueSize);
-            result = false;
-            break;
-        }
-    }
-
-    M_Cleanup();
-    return result;
-}
-
-int32_t Packer_GetAddedPageCount(void)
-{
-    return m_UsedPageCount - 1;
-}
-
 static void M_PrepareObject(int object_index)
 {
     const OBJECT_TEXTURE *const object_texture =
@@ -423,3 +383,40 @@ static void M_Cleanup(void)
     Memory_FreePointer(&m_VirtualPages);
     Memory_FreePointer(&m_Queue);
 }
+
+bool Packer_Pack(PACKER_DATA *const data)
+{
+    m_Data = data;
+
+    m_StartPage = m_Data->level_page_count - 1;
+    m_EndPage = MAX_TEXTURE_PAGES - m_StartPage;
+    m_UsedPageCount = 0;
+    m_QueueSize = 0;
+
+    M_AllocateNewPage();
+
+    for (int i = 0; i < data->object_count; i++) {
+        M_PrepareObject(i);
+    }
+    for (int i = 0; i < data->sprite_count; i++) {
+        M_PrepareSprite(i);
+    }
+
+    bool result = true;
+    for (int i = 0; i < m_QueueSize; i++) {
+        TEX_CONTAINER *container = &m_Queue[i];
+        if (!M_PackContainer(container)) {
+            LOG_ERROR("Failed to pack container %d of %d", i, m_QueueSize);
+            result = false;
+            break;
+        }
+    }
+
+    M_Cleanup();
+    return result;
+}
+
+int32_t Packer_GetAddedPageCount(void)
+{
+    return m_UsedPageCount - 1;
+}
diff --git a/src/tr1/game/packer.h → src/libtrx/include/libtrx/game/packer.h b/src/tr1/game/packer.h → src/libtrx/include/libtrx/game/packer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "global/types.h"
+#include "./output/types.h"
 
 #include <stdint.h>
 

diff --git a/src/libtrx/meson.build b/src/libtrx/meson.build
@@ -134,6 +134,7 @@ sources = [
   'game/objects/names.c',
   'game/objects/vars.c',
   'game/output.c',
+  'game/packer.c',
   'game/phase/executor.c',
   'game/phase/phase_cutscene.c',
   'game/phase/phase_demo.c',

diff --git a/src/tr1/game/inject.c b/src/tr1/game/inject.c
@@ -2,7 +2,6 @@
 
 #include "game/camera.h"
 #include "game/output.h"
-#include "game/packer.h"
 #include "game/room.h"
 #include "global/const.h"
 #include "global/vars.h"
@@ -13,6 +12,7 @@
 #include <libtrx/debug.h>
 #include <libtrx/game/game_buf.h>
 #include <libtrx/game/level.h>
+#include <libtrx/game/packer.h>
 #include <libtrx/log.h>
 #include <libtrx/memory.h>
 #include <libtrx/utils.h>

diff --git a/src/tr1/meson.build b/src/tr1/meson.build
@@ -250,7 +250,6 @@ sources = [
   'game/option/option_sound.c',
   'game/output.c',
   'game/overlay.c',
-  'game/packer.c',
   'game/requester.c',
   'game/room.c',
   'game/room_draw.c',