GuiModel

include/GuiSys/CGuiFrame.hpp

@@ -4,6 +4,7 @@
 #include "GuiSys/CGuiWidgetIdDB.hpp"
 #include "rstl/string.hpp"
 
+class CGuiSys;
 class CGuiWidget;
 class CGuiCamera;
 class CGuiLight;
@@ -24,8 +25,13 @@ public:
 
   CGuiWidgetIdDB& WidgetIdDB() { return x18_db; }
 
+  CGuiSys& GetGuiSys() const { return x8_guiSys; }
+
 private:
-  char x0_[0x14];
+  uint x0_id;
+  uint x4_;
+  CGuiSys& x8_guiSys;
+  char x0_[0xC];
   CGuiCamera* x14_camera;
   CGuiWidgetIdDB x18_db;
 };

include/GuiSys/CGuiModel.hpp

@@ -5,6 +5,7 @@
 
 #include "Kyoto/SObjectTag.hpp"
 #include "Kyoto/TToken.hpp"
+#include "rstl/optional_object.hpp"
 
 class CModel;
 
@@ -12,15 +13,18 @@ class CGuiModel : public CGuiWidget {
 public:
   CGuiModel(const CGuiWidgetParms& parms, CSimplePool* sp, CAssetId modelId, uint lightMask,
             bool flag);
+  ~CGuiModel();
 
-  const TLockedToken< CModel >& GetModel() const { return xb8_model; }
+  const rstl::optional_object< TCachedToken< CModel > >& GetModel() const { return xb8_model; }
   bool GetIsFinishedLoadingWidgetSpecific() const override;
   void Touch() const override;
   void Draw(const CGuiWidgetDrawParms& parms) const override;
   // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
 
+  static CGuiModel* Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);
+
 private:
-  TLockedToken< CModel > xb8_model;
+  mutable rstl::optional_object< TCachedToken< CModel > > xb8_model;
   CAssetId xc8_modelId;
   uint xcc_lightMask;
 };