Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

Editor/ProjectManager.cpp

@@ -129,7 +129,7 @@ bool ProjectManager::openProject(hecl::SystemStringView path) {
   }
 
   r.reset();
-  reader.seek(0, athena::Begin);
+  reader.seek(0, athena::SeekOrigin::Begin);
   if (!r.parse(&reader)) {
     return makeProj(true);
   }

Editor/ProjectResourceFactoryBase.hpp

@@ -1,15 +1,20 @@
 #pragma once
 
-#include "hecl/ClientProcess.hpp"
-#include "hecl/Database.hpp"
-#include "Runtime/IFactory.hpp"
+#include <list>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <thread>
+#include <unordered_map>
+
+#include "DataSpec/SpecBase.hpp"
+
 #include "Runtime/CFactoryMgr.hpp"
 #include "Runtime/CResFactory.hpp"
-#include "DataSpec/SpecBase.hpp"
-#include <optional>
+#include "Runtime/IFactory.hpp"
 
-#include <thread>
-#include <mutex>
+#include <hecl/ClientProcess.hpp>
+#include <hecl/Database.hpp>
 
 namespace urde {
 

Editor/ProjectResourceFactoryMP1.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ProjectResourceFactoryBase.hpp"
-#include "CToken.hpp"
+#include "Editor/ProjectResourceFactoryBase.hpp"
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 class MP1OriginalIDs;

Editor/Space.hpp

@@ -42,7 +42,7 @@ public:
     GameMode
   };
 
-  struct State : athena::io::DNAVYaml<athena::Big> {
+  struct State : athena::io::DNAVYaml<athena::Endian::Big> {
     Delete _d;
   };
   static Space* NewSpaceFromConfigStream(ViewManager& vm, Space* parent, ConfigReader& r);

Editor/ViewManager.cpp

@@ -346,6 +346,7 @@ bool ViewManager::proc() {
   if (m_rootSpaceView && m_editorFrames <= 30)
     m_rootSpaceView->setMultiplyColor(zeus::CColor::lerp({1, 1, 1, 0}, {1, 1, 1, 1}, m_editorFrames / 30.0));
 
+  m_cvarManager.proc();
   m_projManager.mainUpdate();
 
   if (m_testGameView)