MSVC & zeus fixes; update hecl-gui

Runtime/AutoMapper/CAutoMapper.hpp

@@ -8,6 +8,7 @@
 
 #include "Runtime/rstl.hpp"
 #include "Runtime/RetroTypes.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
 #include "Runtime/MP1/CInGameGuiManager.hpp"
 
 #include <zeus/CQuaternion.hpp>
@@ -17,7 +18,6 @@
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CMapUniverse;
 class CMapWorldInfo;
 class CStateManager;
 class IWorld;

Runtime/CStateManager.cpp

@@ -1357,8 +1357,8 @@ std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, ESc
   }
 
   CEntity* ent = nullptr;
-  if (loader) {
   const CEntityInfo info(aid, std::move(conns), id);
+  if (loader) {
     ent = loader(*this, in, propCount, info);
   } else {
     error = true;
@@ -1377,7 +1377,11 @@ std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, ESc
     in.readByte();
 
   if (error || ent == nullptr) {
-    LogModule.report(logvisor::Error, FMT_STRING("Script load error while loading {}"), ScriptObjectTypeToStr(type));
+    in.seek(startPos, athena::SeekOrigin::Begin);
+    std::string name; //= HashInstanceName(in);
+    LogModule.report(logvisor::Error, FMT_STRING("Script load error while loading {}, name: {}"),
+                     ScriptObjectTypeToStr(type), name);
+    loader(*this, in, propCount, info);
     return {kInvalidEditorId, kInvalidUniqueId};
   } else {
     LogModule.report(logvisor::Info, FMT_STRING("Loaded {} in area {}"), ent->GetName(), ent->GetAreaIdAlways());

Runtime/CStopwatch.hpp

@@ -12,17 +12,17 @@ public:
   double report(const char* name) const {
     double t = std::chrono::duration_cast<std::chrono::microseconds>(
       std::chrono::steady_clock::now() - m_start).count() / 1000000.0;
-#ifndef NDEBUG
+//#ifndef NDEBUG
-    fmt::print(FMT_STRING("{} {}\n"), name, t);
+//    fmt::print(FMT_STRING("{} {}\n"), name, t);
-#endif
+//#endif
     return t;
   }
   double reportReset(const char* name) {
     std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
     double t = std::chrono::duration_cast<std::chrono::microseconds>(now - m_start).count() / 1000000.0;
-#ifndef NDEBUG
+//#ifndef NDEBUG
-    fmt::print(FMT_STRING("{} {}\n"), name, t);
+//    fmt::print(FMT_STRING("{} {}\n"), name, t);
-#endif
+//#endif
     m_start = now;
     return t;
   }

Runtime/Camera/CCameraFilter.hpp

@@ -5,14 +5,13 @@
 
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
 #include "Runtime/Graphics/Shaders/CXRayBlurFilter.hpp"
 
 #include <zeus/CColor.hpp>
 
 namespace urde {
-class CTexture;
-
 enum class EFilterType {
   Passthru,
   Multiply,

Runtime/Character/CAnimSysContext.hpp

@@ -5,10 +5,10 @@
 #include "Runtime/CRandom16.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
 
 namespace urde {
 class CSimplePool;
-class CTransitionDatabaseGame;
 
 struct CAnimSysContext {
   TToken<CTransitionDatabaseGame> x0_transDB;

Runtime/Character/CAnimationManager.hpp

@@ -3,13 +3,12 @@
 #include <memory>
 
 #include "Runtime/CToken.hpp"
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
 #include "Runtime/Character/CAnimSysContext.hpp"
 
 namespace urde {
 class CAnimTreeNode;
-class CAnimationDatabaseGame;
 class CSimplePool;
-class CTransitionDatabaseGame;
 class IMetaAnim;
 
 struct CMetaAnimTreeBuildOrders;

Runtime/Character/CPoseAsTransforms.hpp

@@ -5,6 +5,7 @@
 #include <utility>
 
 #include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/Character/CSegId.hpp"
 
 #include <zeus/CMatrix3f.hpp>
@@ -12,8 +13,6 @@
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CCharLayoutInfo;
-
 class CPoseAsTransforms {
   friend class CAnimData;
 public:

Runtime/Character/CSequenceHelper.hpp

@@ -9,9 +9,9 @@
 #include "Runtime/Character/CInt32POINode.hpp"
 #include "Runtime/Character/CParticlePOINode.hpp"
 #include "Runtime/Character/CSoundPOINode.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
 
 namespace urde {
-class CTransitionDatabaseGame;
 class IMetaAnim;
 
 class CSequenceFundamentals {

Runtime/Character/CTransitionManager.hpp

@@ -4,12 +4,12 @@
 
 #include "Runtime/CToken.hpp"
 #include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
 
 namespace urde {
 class CAnimTreeNode;
 class CRandom16;
 class CSimplePool;
-class CTransitionDatabaseGame;
 
 class CTransitionManager {
   CAnimSysContext x0_animCtx;

Runtime/Graphics/CModel.hpp

@@ -5,12 +5,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include "DNACommon/CMDL.hpp"
+#include "DataSpec/DNACommon/CMDL.hpp"
-#include "DNAMP1/CMDLMaterials.hpp"
+#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
 #include "Runtime/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
-#include "Shaders/CModelShaders.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 #include <hecl/HMDLMeta.hpp>
@@ -22,7 +23,6 @@ class CLight;
 class CModel;
 class CPoseAsTransforms;
 class CSkinRules;
-class CTexture;
 class IObjectStore;
 
 struct CModelFlags {

Runtime/Graphics/Shaders/CTextSupportShader.cpp

@@ -1,5 +1,6 @@
 #include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
 
+#include "Runtime/GuiSys/CFontImageDef.hpp"
 #include "Runtime/GuiSys/CRasterFont.hpp"
 
 #include <hecl/Pipeline.hpp>

Runtime/GuiSys/CGuiTextSupport.hpp

@@ -9,12 +9,12 @@
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
 #include "Runtime/GuiSys/CTextRenderBuffer.hpp"
 
 #include <zeus/CColor.hpp>
 
 namespace urde {
-class CRasterFont;
 class CSimplePool;
 class CTextExecuteBuffer;
 class CTextRenderBuffer;
@@ -34,8 +34,6 @@ enum class EVerticalJustification {
   RightMono
 };
 
-enum class EColorType { Main, Outline, Geometry, Foreground, Background };
-
 enum class ETextDirection { Horizontal, Vertical };
 
 class CGuiTextProperties {

Runtime/GuiSys/CRasterFont.hpp

@@ -8,7 +8,6 @@
 #include "Runtime/GCNTypes.hpp"
 #include "Runtime/IOStreams.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
-#include "Runtime/GuiSys/CGuiTextSupport.hpp"
 
 #include <zeus/CVector2i.hpp>
 
@@ -17,6 +16,8 @@ class CDrawStringOptions;
 class CTextRenderBuffer;
 class IObjectStore;
 
+enum class EColorType { Main, Outline, Geometry, Foreground, Background };
+
 /* NOTE: Is this a good place for CGlyph and CKernPair? */
 class CGlyph {
 private:

Runtime/GuiSys/CSaveableState.hpp

@@ -6,12 +6,11 @@
 #include "Runtime/GCNTypes.hpp"
 #include "Runtime/GuiSys/CDrawStringOptions.hpp"
 #include "Runtime/GuiSys/CGuiTextSupport.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
 
 #include <zeus/CColor.hpp>
 
 namespace urde {
-class CRasterFont;
-
 class CSaveableState {
   friend class CColorOverrideInstruction;
   friend class CFontInstruction;

Runtime/MP1/CInGameGuiManager.hpp

@@ -7,6 +7,7 @@
 
 #include "DataSpec/DNACommon/Tweaks/ITweakGui.hpp"
 
+#include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CRandom16.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/CStateManager.hpp"
@@ -30,7 +31,6 @@ namespace urde {
 class CActorLights;
 class CArchitectureQueue;
 class CAutoMapper;
-class CDependencyGroup;
 class CGuiCamera;
 class CGuiModel;
 class CModelData;

Runtime/MP1/CSlideShow.hpp

@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 
+#include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CIOWin.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
@@ -16,7 +17,6 @@
 #include <zeus/CVector2f.hpp>
 
 namespace urde {
-class CDependencyGroup;
 class CTexture;
 
 class CSlideShow : public CIOWin {

Runtime/MP1/World/CFlaahgra.cpp

@@ -297,9 +297,9 @@ void CFlaahgra::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, E
     return;
   }
   case EUserEventType::BeginAction: {
-#ifndef NDEBUG
+//#ifndef NDEBUG
-    printf("BeginAction\n");
+//    printf("BeginAction\n");
-#endif
+//#endif
     x8e4_26_ = true;
     x7c4_ = GetEndActionTime();
     break;

Runtime/Particle/CParticleDataFactory.hpp

@@ -8,6 +8,7 @@
 #include "Runtime/IOStreams.hpp"
 #include "Runtime/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CModel.hpp"
 
 namespace urde {
 class CColorElement;
@@ -16,7 +17,6 @@ class CEmitterElement;
 class CGenDescription;
 class CIntElement;
 class CModVectorElement;
-class CModel;
 class CRealElement;
 class CSimplePool;
 class CSwooshDescription;
@@ -100,3 +100,9 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const
                                   CObjectReference* selfRef);
 
 } // namespace urde
+
+// FIXME hacky workaround for MSVC; these need to be complete types
+// but introduce circular dependencies if included at the start
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"

Runtime/Weapon/CGunWeapon.hpp

@@ -13,6 +13,7 @@
 #include "Runtime/Character/CAnimCharacterSet.hpp"
 #include "Runtime/Collision/CMaterialList.hpp"
 #include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
 #include "Runtime/Weapon/CGunController.hpp"
 #include "Runtime/Weapon/CGunMotion.hpp"
 #include "Runtime/Weapon/CWeaponMgr.hpp"
@@ -25,7 +26,6 @@ namespace urde {
 
 class CActorLights;
 struct CModelFlags;
-class CWeaponDescription;
 
 enum class EChargeState { Normal, Charged };
 

Runtime/World/CScriptPlatform.hpp

@@ -8,6 +8,7 @@
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/rstl.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
 #include "Runtime/World/CDamageVulnerability.hpp"
 #include "Runtime/World/CHealthInfo.hpp"
 #include "Runtime/World/CPhysicsActor.hpp"
@@ -17,8 +18,6 @@
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CCollidableOBBTreeGroup;
-class CCollidableOBBTreeGroupContainer;
 class CFluidPlane;
 
 struct SRiders {

Runtime/World/CWorldTransManager.hpp

@@ -14,6 +14,7 @@
 #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
 #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
 #include "Runtime/GuiSys/CGuiTextSupport.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 #include <zeus/CTransform.hpp>
 #include <zeus/CVector2f.hpp>
@@ -21,7 +22,6 @@
 
 namespace urde {
 class CSimplePool;
-class CStringTable;
 
 class CWorldTransManager {
 public:

hecl

@@ -1 +1 @@
-Subproject commit 2f81bf8d1626e9bc4cd39e2604c98efa213a2dc1
+Subproject commit 2c01e89c1e5cd7894470195315e35be45580ed17

hecl-gui

@@ -1 +1 @@
-Subproject commit c66d33b0b2fca695c39d1c0c829489ba67a52f47
+Subproject commit e5e3713b12f6c6b93cae5ca59b1879f45d498f22

specter

@@ -1 +1 @@
-Subproject commit fc0d79ace7063f24efaeaf8153753855eb3e2b95
+Subproject commit f54b6e2650711b9872b230d27f15e0e231a5f12d