Started implementing new level file loader

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140812 ]
+    * Started implementing new level file loader, currently TR2 only
+
     [ 20140811 ]
     * New Font API, allows drawing strings with line-wrapping
     * Added ability to Menu to show info dialogs

TODO.md

@@ -2,7 +2,7 @@
 
 ## General
 
-* Move to newer OpenGL (GLES or 3.x or 4.x?)
+* Move to newer OpenGL (GL ES or 2.1 or 3.x or 4.x?)
 * Endian dependence ugly, shouldn't dereference to different types?
     * TombRaider.h/cpp structs aren't aligned... unportable to some big endian & other archs?!
     * Maybe replace loader with [VT](http://icculus.org/vt/), also used by OpenTomb.
@@ -20,6 +20,8 @@
 
 ## Future Features
 
+* Depend on libcdio, use it to read original CDs or CUE/TOC/ISO images
+* Depend on imgui for nicer GUIs?
 * Add ability to play the FMVs. Format? VLC can play them!
 * Cut TGA image reader, currently only used for menu background?!
     * Need useful, always available image writer alternative for screenshots then

include/Mesh.h

@@ -119,7 +119,7 @@ public:
 
     void setVertex(unsigned int index, float x, float y, float z);
 
-#ifdef NOT_IMPLEMENTED
+#if 0
     void sortFacesByTexture();
 
     void addFace(int textureIndex, int textureIndexB, unsigned int flags,

include/Script.h

@@ -41,7 +41,7 @@ public:
         OP_PSX_DEMO       = 8,  //!< Does not compile. PSX?
         OP_END            = 9,  //!< Closes script sequence
         OP_TRACK          = 10, //!< Play soundtrack (precedes level opcode)
-        OP_SUNSET         = 11, //!< Unknown, nothing changes in TR2.
+        OP_SUNSET         = 11, //!< Unknown, nothing changes in TR2. Start in Motorboat?
         OP_LOAD_PIC       = 12, //!< Does not compile. PSX? Used in TR3.
         OP_DEADLY_WATER   = 13, //!< Unknown, nothing changes in TR2.
         OP_REMOVE_WEAPONS = 14, //!< Start level without weapons

include/loader/Loader.h

@@ -0,0 +1,39 @@
+/*!
+ * \file include/loader/Loader.h
+ * \brief Level file loader
+ *
+ * \author xythobuz
+ */
+
+#ifndef _LOADER_LOADER_H_
+#define _LOADER_LOADER_H_
+
+#include <string>
+#include "utils/binary.h"
+
+class Loader {
+public:
+
+    typedef enum {
+        TR_UNKNOWN = 0,
+        TR_1 = 1,
+        TR_2 = 2,
+        TR_3 = 3,
+        TR_4 = 4,
+        TR_5 = 5
+    } LoaderVersion;
+
+    static LoaderVersion checkFile(std::string f);
+
+    static Loader *createLoader(std::string f);
+
+    virtual ~Loader();
+
+    virtual int load(std::string f) = 0;
+
+protected:
+    BinaryFile file;
+};
+
+#endif
+

include/loader/LoaderTR2.h

@@ -0,0 +1,37 @@
+/*!
+ * \file include/loader/LoaderTR2.h
+ * \brief TR2 level file loader
+ *
+ * \author xythobuz
+ */
+
+#ifndef _LOADER_LOADER_TR2_H_
+#define _LOADER_LOADER_TR2_H_
+
+#include <cstdint>
+
+#include "loader/Loader.h"
+
+class LoaderTR2 : public Loader {
+public:
+    LoaderTR2();
+    virtual ~LoaderTR2();
+
+    virtual int load(std::string f);
+
+
+private:
+
+    void loadPaletteTextiles();
+
+    void loadRooms();
+
+    uint32_t *palette; //!< 256 * 4 bytes, RGBA, A unused
+    uint32_t numTextiles;
+    uint16_t **textiles; //!< numTextiles, 256 * 256 * 2 bytes, ARGB (MSB + 3x5bit)
+
+    uint16_t numRooms;
+};
+
+#endif
+

src/CMakeLists.txt

@@ -214,6 +214,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${OpenRaider_CXX_FLAGS}
 
 # Add subdirectories
 add_subdirectory ("deps")
+add_subdirectory ("loader")
 add_subdirectory ("math")
 add_subdirectory ("utils")
 
@@ -222,6 +223,7 @@ add_library (OpenRaider_all OBJECT ${SRCS})
 add_executable (OpenRaider MACOSX_BUNDLE ${RESRCS}
     $<TARGET_OBJECTS:OpenRaider_all> $<TARGET_OBJECTS:OpenRaider_deps>
     $<TARGET_OBJECTS:OpenRaider_math> $<TARGET_OBJECTS:OpenRaider_utils>
+    $<TARGET_OBJECTS:OpenRaider_loader>
 )
 
 #################################################################

src/MenuFolder.cpp

@@ -8,8 +8,8 @@
 #include "global.h"
 #include "Console.h"
 #include "Font.h"
+#include "loader/Loader.h"
 #include "OpenRaider.h"
-#include "TombRaider.h"
 #include "Window.h"
 #include "MenuFolder.h"
 
@@ -53,10 +53,10 @@ int MenuFolder::initialize(Folder *folder, bool filter) {
             }
 
             // Check maps for validity
-            int error = TombRaider::checkMime(f.getPath().c_str());
-            if (error != 0) {
+            Loader::LoaderVersion version = Loader::checkFile(f.getPath());
+            if (version == Loader::TR_UNKNOWN) {
                 getConsole() << "Error: pak file '" << f.getName().c_str()
-                    << "' " << ((error == -1) ? "not found" : "invalid") << Console::endl;
+                    << "' invalid" << Console::endl;
                 return true; // delete file from list
             }
 
@@ -115,10 +115,13 @@ void MenuFolder::loadOrOpen() {
     } else {
         std::string tmp = "load ";
         tmp += mapFolder->getFile((unsigned long)mCursor - 1 - mapFolder->folderCount()).getPath();
-        if (getOpenRaider().command(tmp.c_str()) == 0) {
+        int error = getOpenRaider().command(tmp.c_str());
+        if (error == 0) {
             setVisible(false);
         } else {
-            showDialog("Error loading map!", "OK", "");
+            std::ostringstream err;
+            err << "Error loading map: " << error << "!";
+            showDialog(err.str(), "OK", "");
         }
     }
 }

src/loader/CMakeLists.txt

@@ -0,0 +1,7 @@
+# Source files
+set (LOADER_SRCS ${LOADER_SRCS} "Loader.cpp")
+set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR2.cpp")
+
+# Add library
+add_library (OpenRaider_loader OBJECT ${LOADER_SRCS})
+

src/loader/Loader.cpp

@@ -0,0 +1,55 @@
+/*!
+ * \file src/loader/Loader.cpp
+ * \brief Level file loader
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "loader/Loader.h"
+#include "loader/LoaderTR2.h"
+
+Loader::LoaderVersion Loader::checkFile(std::string f) {
+    BinaryFile file;
+    if (file.open(f.c_str()) != 0)
+        return TR_UNKNOWN;
+
+    uint32_t start = file.readU32();
+    switch (start) {
+        case 0x00000020:
+            return TR_1;
+
+        case 0x0000002D:
+            return TR_2;
+
+        case 0xFF080038:
+        case 0xFF180038:
+            return TR_3;
+
+        case 0xFFFFFFF0: // bogus
+        case 0x00345254: // "TR4\0"
+            return TR_4;
+    }
+
+    return TR_UNKNOWN;
+}
+
+Loader *Loader::createLoader(std::string f) {
+    LoaderVersion v = checkFile(f);
+    switch (v) {
+        case TR_1:
+        case TR_3:
+        case TR_4:
+        case TR_5:
+        case TR_UNKNOWN:
+            return NULL;
+
+        case TR_2:
+            return new LoaderTR2();
+    }
+}
+
+Loader::~Loader() {
+
+}
+

src/loader/LoaderTR2.cpp

@@ -0,0 +1,84 @@
+/*!
+ * \file src/loader/LoaderTR2.cpp
+ * \brief TR2 level file loader
+ *
+ * \author xythobuz
+ */
+
+#include "loader/LoaderTR2.h"
+
+LoaderTR2::LoaderTR2() {
+    palette = new uint32_t[256];
+    numTextiles = 0;
+    textiles = nullptr;
+}
+
+LoaderTR2::~LoaderTR2() {
+    delete [] palette;
+    palette = nullptr;
+
+    if (textiles != nullptr) {
+        for (unsigned int i = 0; i < numTextiles; i++)
+            delete [] textiles[i];
+        delete [] textiles;
+    }
+}
+
+int LoaderTR2::load(std::string f) {
+    if (file.open(f.c_str()) != 0) {
+        return 1; // Could not open file
+    }
+
+    if (file.readU32() != 0x2D) {
+        return 2; // Not a TR2 level?!
+    }
+
+    loadPaletteTextiles();
+
+    file.seek(file.tell() + 4); // Unused value?
+
+    loadRooms();
+
+
+
+    return 0;
+}
+
+void LoaderTR2::loadPaletteTextiles() {
+    file.seek(file.tell() + 768); // Skip 8bit palette, 256 * 3 bytes
+
+    // Read the 16bit palette, 256 * 4 bytes, RGBA, A unused
+    for (unsigned int i = 0; i < 256; i++)
+        palette[i] = file.readU32();
+
+    numTextiles = file.readU32();
+
+    file.seek(file.tell() + (numTextiles * 256 * 256)); // Skip 8bit textiles
+
+    // Read the 16bit textiles, numTextiles * 256 * 256 * 2 bytes
+    textiles = new uint16_t *[numTextiles];
+    for (unsigned int i = 0; i < numTextiles; i++) {
+        textiles[i] = new uint16_t[256 * 256];
+        for (unsigned int j = 0; j < (256 * 256); j++) {
+            textiles[i][j] = file.readU16();
+        }
+    }
+}
+
+void LoaderTR2::loadRooms() {
+    numRooms = file.readU16();
+
+    for (unsigned int i = 0; i < numRooms; i++) {
+        // Room Header
+        int32_t xOffset = file.read32();
+        int32_t zOffset = file.read32();
+        int32_t yBottom = file.read32(); // lowest point == largest y value
+        int32_t yTop = file.read32(); // highest point == smallest y value
+
+        // Number of data words (2 bytes) to follow
+        uint32_t dataToFollow = file.readU32();
+
+
+    }
+}
+