Trying out new Loader

ChangeLog.md

@@ -2,8 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140813 ]
+    * Added LoaderTR1, LoaderTR3 stubs
+
     [ 20140812 ]
     * Started implementing new level file loader, currently TR2 only
+    * Trigger new Loader when possible, but fallback to old TombRaider
 
     [ 20140811 ]
     * New Font API, allows drawing strings with line-wrapping

TODO.md

@@ -3,9 +3,6 @@
 ## General
 
 * 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.
 * Don't use C-Style code, try to replace with C++ lib
     * Use std::strings
 * Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even combining Mesh and StaticMesh...

include/loader/LoaderTR1.h

@@ -0,0 +1,29 @@
+/*!
+ * \file include/loader/LoaderTR1.h
+ * \brief TR1 level file loader
+ *
+ * \author xythobuz
+ */
+
+#ifndef _LOADER_LOADER_TR1_H_
+#define _LOADER_LOADER_TR1_H_
+
+#include <cstdint>
+
+#include "loader/Loader.h"
+
+class LoaderTR1 : public Loader {
+public:
+    LoaderTR1();
+    virtual ~LoaderTR1();
+
+    virtual int load(std::string f);
+
+
+private:
+
+
+};
+
+#endif
+

include/loader/LoaderTR3.h

@@ -0,0 +1,29 @@
+/*!
+ * \file include/loader/LoaderTR3.h
+ * \brief TR3 level file loader
+ *
+ * \author xythobuz
+ */
+
+#ifndef _LOADER_LOADER_TR3_H_
+#define _LOADER_LOADER_TR3_H_
+
+#include <cstdint>
+
+#include "loader/Loader.h"
+
+class LoaderTR3 : public Loader {
+public:
+    LoaderTR3();
+    virtual ~LoaderTR3();
+
+    virtual int load(std::string f);
+
+
+private:
+
+
+};
+
+#endif
+

src/Game.cpp

@@ -14,6 +14,7 @@
 #include "Camera.h"
 #include "Console.h"
 #include "Game.h"
+#include "loader/Loader.h"
 #include "OpenRaider.h"
 #include "Render.h"
 #include "Sound.h"
@@ -77,40 +78,60 @@ int Game::loadLevel(const char *level) {
     levelName = level;
 
     getConsole() << "Loading " << levelName << Console::endl;
-    int error = mTombRaider.Load(levelName.c_str());
-    if (error != 0)
-        return error;
-
-    // If required, load the external sound effect file MAIN.SFX into TombRaider
-    if ((mTombRaider.getEngine() == TR_VERSION_2) || (mTombRaider.getEngine() == TR_VERSION_3)) {
-        std::string tmp(levelName);
-        size_t pos = tmp.rfind('/');
-        tmp.erase(pos + 1);
-        tmp += "MAIN.SFX";
-        error = mTombRaider.loadSFX(tmp.c_str());
-        if (error != 0)
-            getConsole() << "Could not load " << tmp << Console::endl;
-    }
 
-    // Process data
-    processTextures();
-    processRooms();
-    processModels();
-    processSprites();
-    processMoveables();
-    processPakSounds();
+    Loader *loader = Loader::createLoader(level);
+    int error = 0;
+    if (loader != NULL) {
+        // First Loader test
+        error = loader->load(level);
+        if (error != 0) {
+            delete loader;
+            return error;
+        }
 
-    mTombRaider.reset();
+        // And now...?
 
-    if (mLara == -1) {
-        //! \todo Cutscene support
-        getConsole() << "Can't find Lara entity in level pak!" << Console::endl;
-        destroy();
-        return -1;
-    } else {
-        mLoaded = true;
-        getRender().setMode(Render::modeVertexLight);
-        return 0;
+        delete loader;
+        getConsole() << "Tried Loader..." << Console::endl;
+    }
+
+    if ((loader == NULL) || (error == 0)) {
+        // Old TombRaider level loader
+        error = mTombRaider.Load(levelName.c_str());
+        if (error != 0)
+            return error;
+
+        // If required, load the external sound effect file MAIN.SFX into TombRaider
+        if ((mTombRaider.getEngine() == TR_VERSION_2) || (mTombRaider.getEngine() == TR_VERSION_3)) {
+            std::string tmp(levelName);
+            size_t pos = tmp.rfind('/');
+            tmp.erase(pos + 1);
+            tmp += "MAIN.SFX";
+            error = mTombRaider.loadSFX(tmp.c_str());
+            if (error != 0)
+                getConsole() << "Could not load " << tmp << Console::endl;
+        }
+
+        // Process data
+        processTextures();
+        processRooms();
+        processModels();
+        processSprites();
+        processMoveables();
+        processPakSounds();
+
+        mTombRaider.reset();
+
+        if (mLara == -1) {
+            //! \todo Cutscene support
+            getConsole() << "Can't find Lara entity in level pak!" << Console::endl;
+            destroy();
+            return -1;
+        } else {
+            mLoaded = true;
+            getRender().setMode(Render::modeVertexLight);
+            return 0;
+        }
     }
 }
 

src/loader/CMakeLists.txt

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

src/loader/LoaderTR1.cpp

@@ -0,0 +1,26 @@
+/*!
+ * \file src/loader/LoaderTR1.cpp
+ * \brief TR1 level file loader
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "loader/LoaderTR1.h"
+
+LoaderTR1::LoaderTR1() {
+}
+
+LoaderTR1::~LoaderTR1() {
+}
+
+int LoaderTR1::load(std::string f) {
+    if (file.open(f.c_str()) != 0) {
+        return 1; // Could not open file
+    }
+
+
+
+    return 1; // stub
+}
+

src/loader/LoaderTR2.cpp

@@ -5,6 +5,7 @@
  * \author xythobuz
  */
 
+#include "global.h"
 #include "loader/LoaderTR2.h"
 
 LoaderTR2::LoaderTR2() {
@@ -15,7 +16,6 @@ LoaderTR2::LoaderTR2() {
 
 LoaderTR2::~LoaderTR2() {
     delete [] palette;
-    palette = nullptr;
 
     if (textiles != nullptr) {
         for (unsigned int i = 0; i < numTextiles; i++)

src/loader/LoaderTR3.cpp

@@ -0,0 +1,26 @@
+/*!
+ * \file src/loader/LoaderTR3.cpp
+ * \brief TR3 level file loader
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "loader/LoaderTR3.h"
+
+LoaderTR3::LoaderTR3() {
+}
+
+LoaderTR3::~LoaderTR3() {
+}
+
+int LoaderTR3::load(std::string f) {
+    if (file.open(f.c_str()) != 0) {
+        return 1; // Could not open file
+    }
+
+
+
+    return 1; // stub
+}
+