Feature/importer rework

src/CMakeLists.txt

@@ -172,10 +172,10 @@ add_library(REGothEngine STATIC
   scripting/daedalus/DaedalusVMForGameWorld.hpp
   scripting/daedalus/REGothDaedalusVM.cpp
   scripting/daedalus/REGothDaedalusVM.hpp
-  world/internals/ConstructFromZEN.cpp
-  world/internals/ConstructFromZEN.hpp
-  world/internals/ImportSingleVob.cpp
-  world/internals/ImportSingleVob.hpp
+  world/internals/ZenImporter.cpp
+  world/internals/ZenImporter.hpp
+  world/internals/ZenCache.cpp
+  world/internals/ZenCache.hpp
   )
 
 target_link_libraries(REGothEngine PUBLIC bsf BsZenLib)

src/components/GameWorld.cpp

@@ -21,12 +21,9 @@
 #include <log/logging.hpp>
 #include <original-content/VirtualFileSystem.hpp>
 #include <scripting/ScriptVMForGameWorld.hpp>
-#include <world/internals/ConstructFromZEN.hpp>
 
 namespace REGoth
 {
-  const char* const WORLD_STARTPOINT = "STARTPOINT";
-
   GameWorld::GameWorld(const bs::HSceneObject& parent, const bs::String& zenFile)
       : bs::Component(parent)
       , mZenFile(zenFile)
@@ -67,7 +64,7 @@ namespace REGoth
     if (!mZenFile.empty())
     {
       // Import the ZEN and add all scene objects as children to this SO.
-      bs::HSceneObject so = Internals::constructFromZEN(thisWorld, mZenFile);
+      bs::HSceneObject so = mZenImporter.constructFromZEN(thisWorld, mZenFile);
 
       if (!so)
       {

src/components/GameWorld.hpp

@@ -2,6 +2,7 @@
 
 #include <BsPrerequisites.h>
 #include <Scene/BsComponent.h>
+#include <world/internals/ZenImporter.hpp>
 
 #include <RTTI/RTTIUtil.hpp>
 
@@ -28,8 +29,6 @@ namespace REGoth
   class Waypoint;
   using HWaypoint = bs::GameObjectHandle<Waypoint>;
 
-  extern const char* const WORLD_STARTPOINT;
-
   namespace Scripting
   {
     class ScriptVMForGameWorld;
@@ -140,6 +139,11 @@ namespace REGoth
       return mWaynet;
     }
 
+    bs::HSceneObject getWorldStartpoint()
+    {
+      return mZenImporter.getStartpoint();
+    }
+
     /**
      * @return  Handle to the GameClock of the world.
      */
@@ -376,6 +380,11 @@ namespace REGoth
     void findAllItems();
     void findAllFocusables();
 
+    /**
+     * ZEN-File Importer.
+     */
+    ZenImporter mZenImporter;
+
     /**
      * ZEN-File this world was created from, e.g. `NEWWORLD.ZEN`.
      */

src/core/Gothic1Game.cpp

@@ -31,7 +31,7 @@ void Gothic1Game::setupScene()
   {
     world = GameWorld::importZEN(WORLD);
 
-    HCharacter hero = world->insertCharacter("PC_HERO", WORLD_STARTPOINT);
+    HCharacter hero = world->insertCharacter("PC_HERO", world->getWorldStartpoint()->getName());
     hero->useAsHero();
     hero->SO()->addComponent<CharacterKeyboardInput>(world);
 

src/core/Gothic2Game.cpp

@@ -30,7 +30,7 @@ void Gothic2Game::setupScene()
   {
     world = GameWorld::importZEN(WORLD);
 
-    HCharacter hero = world->insertCharacter("PC_HERO", WORLD_STARTPOINT);
+    HCharacter hero = world->insertCharacter("PC_HERO", world->getWorldStartpoint()->getName());
     hero->useAsHero();
     hero->SO()->addComponent<CharacterKeyboardInput>(world);
 

src/main_WorldMeshViewer.cpp

@@ -5,7 +5,7 @@
 #include <Scene/BsSceneObject.h>
 
 #include <core.hpp>
-#include <world/internals/ConstructFromZEN.hpp>
+#include <world/internals/ZenImporter.hpp>
 
 class REGothWorldMeshViewer : public REGoth::EmptyGame
 {
@@ -21,11 +21,12 @@ class REGothWorldMeshViewer : public REGoth::EmptyGame
 
   void setupScene() override
   {
-    REGoth::Internals::loadWorldMeshFromZEN("ADDONWORLD.ZEN");
+    mZenImporter.loadWorldMeshFromZEN("ADDONWORLD.ZEN");
   }
 
 protected:
   bs::HFPSCamera mFPSCamera;
+  REGoth::ZenImporter mZenImporter;
 };
 
 int main(int argc, char** argv)

src/main_WorldViewer.cpp

@@ -100,7 +100,7 @@ class REGothWorldViewer : public REGoth::Engine
     {
       world = GameWorld::importZEN(config()->world);
 
-      HCharacter hero = world->insertCharacter("PC_HERO", WORLD_STARTPOINT);
+      HCharacter hero = world->insertCharacter("PC_HERO", world->getWorldStartpoint()->getName());
       hero->useAsHero();
       hero->SO()->addComponent<CharacterKeyboardInput>(world);