CModelBoo: Remove usages of const_cast

Many functions are modifying internals of CBooModel and const-casting
is performed in order to work around functions being const when they
really shouldn't be.

This amends the function signatures in order to allow these functions to
exist without const_cast, making code much nicer to read.

Runtime/Graphics/CBooRenderer.cpp

@@ -1352,12 +1352,14 @@ int CBooRenderer::DrawOverlappingWorldModelIDs(int alphaVal, const std::vector<u
             return alphaVal;
 
           flags.x4_color.a() = alphaVal / 255.f;
-          const CBooModel& model = *item.x10_models[wordModel + j];
+          CBooModel& model = *item.x10_models[wordModel + j];
-          const_cast<CBooModel&>(model).UpdateUniformData(flags, nullptr, nullptr, 3);
+          model.UpdateUniformData(flags, nullptr, nullptr, 3);
-          const_cast<CBooModel&>(model).VerifyCurrentShader(0);
+          model.VerifyCurrentShader(0);
-          for (const CBooSurface* surf = model.x38_firstUnsortedSurface; surf; surf = surf->m_next)
+          for (const CBooSurface* surf = model.x38_firstUnsortedSurface; surf; surf = surf->m_next) {
-            if (surf->GetBounds().intersects(aabb))
+            if (surf->GetBounds().intersects(aabb)) {
               model.DrawSurface(*surf, flags);
+            }
+          }
           alphaVal += 4;
         }
       }

Runtime/Graphics/CModel.hpp

@@ -210,16 +210,16 @@ public:
   void DisableAllLights();
   void RemapMaterialData(SShader& shader);
   void RemapMaterialData(SShader& shader, const std::unordered_map<int, CModelShaders::ShaderPipelines>& pipelines);
-  bool TryLockTextures() const;
+  bool TryLockTextures();
-  void UnlockTextures() const;
+  void UnlockTextures();
-  void SyncLoadTextures() const;
+  void SyncLoadTextures();
-  void Touch(int shaderIdx) const;
+  void Touch(int shaderIdx);
   void VerifyCurrentShader(int shaderIdx);
   boo::ObjToken<boo::IGraphicsBufferD> UpdateUniformData(const CModelFlags& flags, const CSkinRules* cskr,
-                                                         const CPoseAsTransforms* pose, int sharedLayoutBuf = -1) const;
+                                                         const CPoseAsTransforms* pose, int sharedLayoutBuf = -1);
-  void DrawAlpha(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const;
+  void DrawAlpha(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose);
-  void DrawNormal(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const;
+  void DrawNormal(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose);
-  void Draw(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const;
+  void Draw(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose);
   void DrawFlat(ESurfaceSelection sel, EExtendedShader extendedIdx) const;
 
   void LockParent() { m_modelTok.Lock(); }

Runtime/Graphics/CModelBoo.cpp

@@ -468,13 +468,14 @@ void CBooModel::RemapMaterialData(SShader& shader,
   m_instances.clear();
 }
 
-bool CBooModel::TryLockTextures() const {
+bool CBooModel::TryLockTextures() {
   if (!x40_24_texturesLoaded) {
     bool allLoad = true;
-    for (auto& tex : const_cast<std::unordered_map<CAssetId, TCachedToken<CTexture>>&>(x1c_textures)) {
+    for (auto& tex : x1c_textures) {
       tex.second.Lock();
-      if (!tex.second.IsLoaded())
+      if (!tex.second.IsLoaded()) {
         allLoad = false;
+      }
     }
 
     if (allLoad) {
@@ -485,30 +486,38 @@ bool CBooModel::TryLockTextures() const {
             break;
           }
         }
-        if (!allLoad)
+        if (!allLoad) {
           break;
+        }
       }
     }
 
-    const_cast<CBooModel*>(this)->x40_24_texturesLoaded = allLoad;
+    x40_24_texturesLoaded = allLoad;
   }
 
   return x40_24_texturesLoaded;
 }
 
-void CBooModel::UnlockTextures() const {
+void CBooModel::UnlockTextures() {
-  const_cast<CBooModel*>(this)->m_instances.clear();
+  m_instances.clear();
-  for (auto& tex : const_cast<std::unordered_map<CAssetId, TCachedToken<CTexture>>&>(x1c_textures))
+
+  for (auto& tex : x1c_textures) {
     tex.second.Unlock();
-  const_cast<CBooModel*>(this)->x40_24_texturesLoaded = false;
+  }
+
+  x40_24_texturesLoaded = false;
 }
 
-void CBooModel::SyncLoadTextures() const {
+void CBooModel::SyncLoadTextures() {
-  if (!x40_24_texturesLoaded) {
+  if (x40_24_texturesLoaded) {
-    for (auto& tex : const_cast<std::unordered_map<CAssetId, TCachedToken<CTexture>>&>(x1c_textures))
+    return;
-      tex.second.GetObj();
-    const_cast<CBooModel*>(this)->x40_24_texturesLoaded = true;
   }
+
+  for (auto& tex : x1c_textures) {
+    tex.second.GetObj();
+  }
+
+  x40_24_texturesLoaded = true;
 }
 
 void CBooModel::DrawFlat(ESurfaceSelection sel, EExtendedShader extendedIdx) const {
@@ -965,8 +974,7 @@ boo::ObjToken<boo::IGraphicsBufferD> GeometryUniformLayout::GetSharedBuffer(int
 }
 
 boo::ObjToken<boo::IGraphicsBufferD> CBooModel::UpdateUniformData(const CModelFlags& flags, const CSkinRules* cskr,
-                                                                  const CPoseAsTransforms* pose,
+                                                                  const CPoseAsTransforms* pose, int sharedLayoutBuf) {
-                                                                  int sharedLayoutBuf) const {
   if (!g_DummyTextures && !TryLockTextures())
     return {};
 
@@ -974,47 +982,52 @@ boo::ObjToken<boo::IGraphicsBufferD> CBooModel::UpdateUniformData(const CModelFl
   if ((flags.m_extendedShader == EExtendedShader::WorldShadow ||
        flags.m_extendedShader == EExtendedShader::LightingCubeReflectionWorldShadow) &&
       m_lastDrawnShadowMap != g_shadowMap) {
-    const_cast<CBooModel*>(this)->m_lastDrawnShadowMap = g_shadowMap;
+    m_lastDrawnShadowMap = g_shadowMap;
-    const_cast<CBooModel*>(this)->m_instances.clear();
+    m_instances.clear();
   }
 
   /* Invalidate instances if new one-texture being drawn */
   if (flags.m_extendedShader == EExtendedShader::Disintegrate && m_lastDrawnOneTexture != g_disintegrateTexture) {
-    const_cast<CBooModel*>(this)->m_lastDrawnOneTexture = g_disintegrateTexture;
+    m_lastDrawnOneTexture = g_disintegrateTexture;
-    const_cast<CBooModel*>(this)->m_instances.clear();
+    m_instances.clear();
   }
 
   /* Invalidate instances if new reflection cube being drawn */
   if (hecl::com_cubemaps->toBoolean() && (flags.m_extendedShader == EExtendedShader::LightingCubeReflection ||
        flags.m_extendedShader == EExtendedShader::LightingCubeReflectionWorldShadow) &&
       m_lastDrawnReflectionCube != g_reflectionCube) {
-    const_cast<CBooModel*>(this)->m_lastDrawnReflectionCube = g_reflectionCube;
+    m_lastDrawnReflectionCube = g_reflectionCube;
-    const_cast<CBooModel*>(this)->m_instances.clear();
+    m_instances.clear();
   }
 
   const ModelInstance* inst;
   if (sharedLayoutBuf >= 0) {
     if (m_instances.size() <= sharedLayoutBuf) {
       do {
-        inst = const_cast<CBooModel*>(this)->PushNewModelInstance(m_instances.size());
+        inst = PushNewModelInstance(m_instances.size());
-        if (!inst)
+        if (!inst) {
           return {};
+        }
       } while (m_instances.size() <= sharedLayoutBuf);
-    } else
+    } else {
       inst = &m_instances[sharedLayoutBuf];
-    const_cast<CBooModel*>(this)->m_uniUpdateCount = sharedLayoutBuf + 1;
+    }
+    m_uniUpdateCount = sharedLayoutBuf + 1;
   } else {
     if (m_instances.size() <= m_uniUpdateCount) {
-      inst = const_cast<CBooModel*>(this)->PushNewModelInstance(sharedLayoutBuf);
+      inst = PushNewModelInstance(sharedLayoutBuf);
-      if (!inst)
+      if (!inst) {
         return {};
-    } else
+      }
+    } else {
       inst = &m_instances[m_uniUpdateCount];
-    ++const_cast<CBooModel*>(this)->m_uniUpdateCount;
+    }
+    ++m_uniUpdateCount;
   }
 
-  if (inst->m_geomUniformBuffer)
+  if (inst->m_geomUniformBuffer) {
     m_geomLayout->Update(flags, cskr, pose, x4_matSet, inst->m_geomUniformBuffer, this);
+  }
 
   u8* dataOut = reinterpret_cast<u8*>(inst->m_uniformBuffer->map(m_uniformDataSize));
   u8* dataCur = dataOut;
@@ -1072,7 +1085,7 @@ boo::ObjToken<boo::IGraphicsBufferD> CBooModel::UpdateUniformData(const CModelFl
   return inst->m_dynamicVbo;
 }
 
-void CBooModel::DrawAlpha(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const {
+void CBooModel::DrawAlpha(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) {
   CModelFlags rFlags = flags;
   /* Check if we're overriding with RenderModelBlack */
   if (g_RenderModelBlack) {
@@ -1086,7 +1099,7 @@ void CBooModel::DrawAlpha(const CModelFlags& flags, const CSkinRules* cskr, cons
   }
 }
 
-void CBooModel::DrawNormal(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const {
+void CBooModel::DrawNormal(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) {
   CModelFlags rFlags = flags;
   /* Check if we're overriding with RenderModelBlack */
   if (g_RenderModelBlack) {
@@ -1099,7 +1112,7 @@ void CBooModel::DrawNormal(const CModelFlags& flags, const CSkinRules* cskr, con
   }
 }
 
-void CBooModel::Draw(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) const {
+void CBooModel::Draw(const CModelFlags& flags, const CSkinRules* cskr, const CPoseAsTransforms* pose) {
   CModelFlags rFlags = flags;
   /* Check if we're overriding with RenderModelBlack */
   if (g_RenderModelBlack) {
@@ -1244,29 +1257,29 @@ void CBooModel::VerifyCurrentShader(int shaderIdx) {
     RemapMaterialData(m_model->x18_matSets[shaderIdx]);
 }
 
-void CBooModel::Touch(int shaderIdx) const {
+void CBooModel::Touch(int shaderIdx) {
-  const_cast<CBooModel*>(this)->VerifyCurrentShader(shaderIdx);
+  VerifyCurrentShader(shaderIdx);
   TryLockTextures();
 }
 
 void CModel::DrawSortedParts(const CModelFlags& flags) const {
-  const_cast<CBooModel&>(*x28_modelInst).VerifyCurrentShader(flags.x1_matSetIdx);
+  x28_modelInst->VerifyCurrentShader(flags.x1_matSetIdx);
   x28_modelInst->DrawAlpha(flags, nullptr, nullptr);
 }
 
 void CModel::DrawUnsortedParts(const CModelFlags& flags) const {
-  const_cast<CBooModel&>(*x28_modelInst).VerifyCurrentShader(flags.x1_matSetIdx);
+  x28_modelInst->VerifyCurrentShader(flags.x1_matSetIdx);
   x28_modelInst->DrawNormal(flags, nullptr, nullptr);
 }
 
 void CModel::Draw(const CModelFlags& flags) const {
-  const_cast<CBooModel&>(*x28_modelInst).VerifyCurrentShader(flags.x1_matSetIdx);
+  x28_modelInst->VerifyCurrentShader(flags.x1_matSetIdx);
   x28_modelInst->Draw(flags, nullptr, nullptr);
 }
 
 bool CModel::IsLoaded(int shaderIdx) const {
-  const_cast<CBooModel&>(*x28_modelInst).VerifyCurrentShader(shaderIdx);
+  x28_modelInst->VerifyCurrentShader(shaderIdx);
-  return const_cast<CBooModel&>(*x28_modelInst).TryLockTextures();
+  return x28_modelInst->TryLockTextures();
 }
 
 size_t CModel::GetPoolVertexOffset(size_t idx) const { return m_hmdlMeta.vertStride * idx; }

Runtime/GuiSys/CAuiEnergyBarT01.cpp

@@ -53,14 +53,14 @@ void CAuiEnergyBarT01::Update(float dt) {
   CGuiWidget::Update(dt);
 }
 
-void CAuiEnergyBarT01::Draw(const CGuiWidgetDrawParms& drawParms) const {
+void CAuiEnergyBarT01::Draw(const CGuiWidgetDrawParms& drawParms) {
   if (!xbc_tex || !xbc_tex.IsLoaded() || !xd8_coordFunc) {
     return;
   }
   SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(fmt("CAuiEnergyBarT01::Draw {}"), m_name).c_str(), zeus::skCyan);
 
   CGraphics::SetModelMatrix(x34_worldXF);
-  const_cast<CEnergyBarShader&>(m_energyBarShader).updateModelMatrix();
+  m_energyBarShader.updateModelMatrix();
 
   const float filledT = xe0_maxEnergy > 0.f ? xf8_filledEnergy / xe0_maxEnergy : 0.f;
   const float shadowT = xe0_maxEnergy > 0.f ? xfc_shadowEnergy / xe0_maxEnergy : 0.f;
@@ -78,7 +78,7 @@ void CAuiEnergyBarT01::Draw(const CGuiWidgetDrawParms& drawParms) const {
   emptyColor *= xa8_color2;
 
   for (size_t i = 0; i < m_verts.size(); ++i) {
-    std::vector<CEnergyBarShader::Vertex>& verts = const_cast<CAuiEnergyBarT01&>(*this).m_verts[i];
+    std::vector<CEnergyBarShader::Vertex>& verts = m_verts[i];
     verts.clear();
 
     float start;
@@ -118,8 +118,7 @@ void CAuiEnergyBarT01::Draw(const CGuiWidgetDrawParms& drawParms) const {
     }
   }
 
-  const_cast<CEnergyBarShader&>(m_energyBarShader)
+  m_energyBarShader.draw(filledColor, m_verts[0], shadowColor, m_verts[1], emptyColor, m_verts[2], xbc_tex.GetObj());
-      .draw(filledColor, m_verts[0], shadowColor, m_verts[1], emptyColor, m_verts[2], xbc_tex.GetObj());
 }
 
 void CAuiEnergyBarT01::SetCurrEnergy(float e, ESetMode mode) {

Runtime/GuiSys/CAuiEnergyBarT01.hpp

@@ -46,7 +46,7 @@ public:
   FourCC GetWidgetTypeID() const override { return FOURCC('ENRG'); }
   static std::pair<zeus::CVector3f, zeus::CVector3f> DownloadBarCoordFunc(float t);
   void Update(float dt) override;
-  void Draw(const CGuiWidgetDrawParms& drawParms) const override;
+  void Draw(const CGuiWidgetDrawParms& drawParms) override;
   float GetActualFraction() const { return xe0_maxEnergy == 0.f ? 0.f : xf4_setEnergy / xe0_maxEnergy; }
   float GetSetEnergy() const { return xf4_setEnergy; }
   float GetMaxEnergy() const { return xe0_maxEnergy; }

Runtime/GuiSys/CAuiImagePane.cpp

@@ -101,15 +101,17 @@ void CAuiImagePane::DoDrawImagePane(const zeus::CColor& color, const CTexture& t
   }
 }
 
-void CAuiImagePane::Draw(const CGuiWidgetDrawParms& params) const {
+void CAuiImagePane::Draw(const CGuiWidgetDrawParms& params) {
   CGraphics::SetModelMatrix(x34_worldXF);
-  if (!GetIsVisible() || !xb8_tex0Tok.IsLoaded())
+  if (!GetIsVisible() || !xb8_tex0Tok.IsLoaded()) {
     return;
+  }
   SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(fmt("CAuiImagePane::Draw {}"), m_name).c_str(), zeus::skCyan);
   GetIsFinishedLoadingWidgetSpecific();
-  if (!m_filters || m_filters->m_texId != xb8_tex0Tok.GetObjectTag()->id)
+  if (!m_filters || m_filters->m_texId != xb8_tex0Tok.GetObjectTag()->id) {
-    const_cast<CAuiImagePane*>(this)->m_filters.emplace(const_cast<CAuiImagePane*>(this)->xb8_tex0Tok);
+    m_filters.emplace(xb8_tex0Tok);
-  Filters& filters = const_cast<Filters&>(*m_filters);
+  }
+  Filters& filters = *m_filters;
   zeus::CColor color = xa8_color2;
   color.a() *= params.x0_alphaMod;
   // SetZUpdate(xac_drawFlags == EGuiModelDrawFlags::Shadeless || xac_drawFlags == EGuiModelDrawFlags::Opaque);
@@ -174,7 +176,7 @@ void CAuiImagePane::Draw(const CGuiWidgetDrawParms& params) const {
   }
 }
 
-bool CAuiImagePane::GetIsFinishedLoadingWidgetSpecific() const { return !xb8_tex0Tok || xb8_tex0Tok.IsLoaded(); }
+bool CAuiImagePane::GetIsFinishedLoadingWidgetSpecific() { return !xb8_tex0Tok || xb8_tex0Tok.IsLoaded(); }
 
 void CAuiImagePane::SetTextureID0(CAssetId tex, CSimplePool* sp) {
   xc8_tex0 = tex;

Runtime/GuiSys/CAuiImagePane.hpp

@@ -53,8 +53,8 @@ public:
 
   void Reset(ETraversalMode mode) override;
   void Update(float dt) override;
-  void Draw(const CGuiWidgetDrawParms& params) const override;
+  void Draw(const CGuiWidgetDrawParms& params) override;
-  bool GetIsFinishedLoadingWidgetSpecific() const override;
+  bool GetIsFinishedLoadingWidgetSpecific() override;
   void SetTextureID0(CAssetId tex, CSimplePool* sp);
   void SetAnimationParms(const zeus::CVector2f& vec, float interval, float duration);
   void SetDeResFactor(float d) { x14c_deResFactor = d; }

Runtime/GuiSys/CGuiCamera.cpp

@@ -24,12 +24,13 @@ zeus::CVector3f CGuiCamera::ConvertToScreenSpace(const zeus::CVector3f& vec) con
   return mat.multiplyOneOverW(local);
 }
 
-void CGuiCamera::Draw(const CGuiWidgetDrawParms& parms) const {
+void CGuiCamera::Draw(const CGuiWidgetDrawParms& parms) {
-  if (xb8_projtype == EProjection::Perspective)
+  if (xb8_projtype == EProjection::Perspective) {
     CGraphics::SetPerspective(m_proj.xbc_fov, m_proj.xc0_aspect, m_proj.xc4_znear, m_proj.xc8_zfar);
-  else
+  } else {
     CGraphics::SetOrtho(m_proj.xbc_left, m_proj.xc0_right, m_proj.xc4_top, m_proj.xc8_bottom, m_proj.xcc_znear,
                         m_proj.xd0_zfar);
+  }
   CGraphics::SetViewPointMatrix(GetGuiFrame()->GetAspectTransform() *
                                 zeus::CTransform::Translate(parms.x4_cameraOffset) * x34_worldXF);
   CGuiWidget::Draw(parms);

Runtime/GuiSys/CGuiCamera.hpp

@@ -46,7 +46,7 @@ public:
   zeus::CVector3f ConvertToScreenSpace(const zeus::CVector3f& vec) const;
   const SProjection& GetProjection() const { return m_proj; }
   void SetFov(float fov) { m_proj.xbc_fov = fov; }
-  void Draw(const CGuiWidgetDrawParms& parms) const override;
+  void Draw(const CGuiWidgetDrawParms& parms) override;
 
   std::shared_ptr<CGuiCamera> shared_from_this() {
     return std::static_pointer_cast<CGuiCamera>(CGuiObject::shared_from_this());

Runtime/GuiSys/CGuiModel.cpp

@@ -16,36 +16,45 @@ CGuiModel::CGuiModel(const CGuiWidgetParms& parms, CSimplePool* sp, CAssetId mod
   xb8_model = sp->GetObj({SBIG('CMDL'), modelId});
 }
 
-bool CGuiModel::GetIsFinishedLoadingWidgetSpecific() const {
+bool CGuiModel::GetIsFinishedLoadingWidgetSpecific() {
-  if (!xb8_model)
+  if (!xb8_model) {
     return true;
-  if (!xb8_model.IsLoaded())
+  }
+  if (!xb8_model.IsLoaded()) {
     return false;
+  }
   xb8_model->GetInstance().Touch(0);
   return xb8_model->IsLoaded(0);
 }
 
-void CGuiModel::Touch() const {
+void CGuiModel::Touch() {
-  const CModel* model = xb8_model.GetObj();
+  CModel* const model = xb8_model.GetObj();
-  if (model)
+
-    model->GetInstance().Touch(0);
+  if (model == nullptr) {
+    return;
+  }
+
+  model->GetInstance().Touch(0);
 }
 
-void CGuiModel::Draw(const CGuiWidgetDrawParms& parms) const {
+void CGuiModel::Draw(const CGuiWidgetDrawParms& parms) {
   CGraphics::SetModelMatrix(x34_worldXF);
-  if (!xb8_model)
+  if (!xb8_model) {
     return;
-  if (!GetIsFinishedLoading())
+  }
+  if (!GetIsFinishedLoading()) {
     return;
-  const CModel* model = xb8_model.GetObj();
+  }
-  if (!model)
+  CModel* const model = xb8_model.GetObj();
+  if (!model) {
     return;
+  }
 
   if (GetIsVisible()) {
     SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(fmt("CGuiModel::Draw {}"), m_name).c_str(), zeus::skCyan);
     zeus::CColor moduCol = xa8_color2;
     moduCol.a() *= parms.x0_alphaMod;
-    xb0_frame->EnableLights(xcc_lightMask, const_cast<CBooModel&>(model->GetInstance()));
+    xb0_frame->EnableLights(xcc_lightMask, model->GetInstance());
     // if (xb6_29_cullFaces)
     //    CGraphics::SetCullMode(ERglCullMode::Front);
 

Runtime/GuiSys/CGuiModel.hpp

@@ -20,9 +20,9 @@ public:
 
   std::vector<CAssetId> GetModelAssets() const { return {xc8_modelId}; }
   const TLockedToken<CModel>& GetModel() const { return xb8_model; }
-  bool GetIsFinishedLoadingWidgetSpecific() const override;
+  bool GetIsFinishedLoadingWidgetSpecific() override;
-  void Touch() const override;
+  void Touch() override;
-  void Draw(const CGuiWidgetDrawParms& parms) const override;
+  void Draw(const CGuiWidgetDrawParms& parms) override;
   bool TestCursorHit(const zeus::CMatrix4f& vp, const zeus::CVector2f& point) const override;
 
   static std::shared_ptr<CGuiWidget> Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);

Runtime/GuiSys/CGuiObject.cpp

@@ -14,7 +14,7 @@ void CGuiObject::Update(float dt) {
     x6c_nextSibling->Update(dt);
 }
 
-void CGuiObject::Draw(const CGuiWidgetDrawParms& parms) const {
+void CGuiObject::Draw(const CGuiWidgetDrawParms& parms) {
   if (x68_child)
     x68_child->Draw(parms);
   if (x6c_nextSibling)

Runtime/GuiSys/CGuiObject.hpp

@@ -21,7 +21,7 @@ protected:
 public:
   virtual ~CGuiObject() = default;
   virtual void Update(float dt);
-  virtual void Draw(const CGuiWidgetDrawParms& parms) const;
+  virtual void Draw(const CGuiWidgetDrawParms& parms);
   virtual bool TestCursorHit(const zeus::CMatrix4f& vp, const zeus::CVector2f& point) const { return false; }
   virtual void Initialize() = 0;
 

Runtime/GuiSys/CGuiTextPane.cpp

@@ -20,7 +20,7 @@ void CGuiTextPane::Update(float dt) {
   xd4_textSupport.Update(dt);
 }
 
-bool CGuiTextPane::GetIsFinishedLoadingWidgetSpecific() const {
+bool CGuiTextPane::GetIsFinishedLoadingWidgetSpecific() {
   return xd4_textSupport.GetIsTextSupportFinishedLoading();
 }
 
@@ -32,30 +32,33 @@ void CGuiTextPane::SetDimensions(const zeus::CVector2f& dim, bool initVBO) {
 
 void CGuiTextPane::ScaleDimensions(const zeus::CVector3f& scale) {}
 
-void CGuiTextPane::Draw(const CGuiWidgetDrawParms& parms) const {
+void CGuiTextPane::Draw(const CGuiWidgetDrawParms& parms) {
-  if (!GetIsVisible())
+  if (!GetIsVisible()) {
     return;
+  }
   SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(fmt("CGuiTextPane::Draw {}"), m_name).c_str(), zeus::skCyan);
 
   zeus::CVector2f dims = GetDimensions();
 
-  if (xd4_textSupport.x34_extentX)
+  if (xd4_textSupport.x34_extentX) {
     dims.x() /= float(xd4_textSupport.x34_extentX);
-  else
+  } else {
     dims.x() = 0.f;
+  }
 
-  if (xd4_textSupport.x38_extentY)
+  if (xd4_textSupport.x38_extentY) {
     dims.y() /= float(xd4_textSupport.x38_extentY);
-  else
+  } else {
     dims.y() = 0.f;
+  }
 
-  zeus::CTransform local = zeus::CTransform::Translate(xc0_verts.front().m_pos + xc8_scaleCenter) *
+  const zeus::CTransform local = zeus::CTransform::Translate(xc0_verts.front().m_pos + xc8_scaleCenter) *
-                           zeus::CTransform::Scale(dims.x(), 1.f, dims.y());
+                                 zeus::CTransform::Scale(dims.x(), 1.f, dims.y());
   CGraphics::SetModelMatrix(x34_worldXF * local);
 
   zeus::CColor geomCol = xa8_color2;
   geomCol.a() *= parms.x0_alphaMod;
-  const_cast<CGuiTextPane*>(this)->xd4_textSupport.SetGeometryColor(geomCol);
+  xd4_textSupport.SetGeometryColor(geomCol);
 
 #if 0
     CGraphics::SetDepthWriteMode(xb6_31_depthTest, ERglEnum::LEqual, xb7_24_depthWrite);

Runtime/GuiSys/CGuiTextPane.hpp

@@ -20,11 +20,11 @@ public:
   CGuiTextSupport& TextSupport() { return xd4_textSupport; }
   const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; }
   void Update(float dt) override;
-  bool GetIsFinishedLoadingWidgetSpecific() const override;
+  bool GetIsFinishedLoadingWidgetSpecific() override;
   std::vector<CAssetId> GetFontAssets() const { return {xd4_textSupport.x5c_fontId}; }
   void SetDimensions(const zeus::CVector2f& dim, bool initVBO) override;
   void ScaleDimensions(const zeus::CVector3f& scale) override;
-  void Draw(const CGuiWidgetDrawParms& parms) const override;
+  void Draw(const CGuiWidgetDrawParms& parms) override;
   bool TestCursorHit(const zeus::CMatrix4f& vp, const zeus::CVector2f& point) const override;
 
   static std::shared_ptr<CGuiWidget> Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);

Runtime/GuiSys/CGuiWidget.cpp

@@ -117,9 +117,9 @@ void CGuiWidget::Update(float dt) {
     sib->Update(dt);
 }
 
-void CGuiWidget::Draw(const CGuiWidgetDrawParms&) const {}
+void CGuiWidget::Draw(const CGuiWidgetDrawParms&) {}
 void CGuiWidget::ProcessUserInput(const CFinalInput& input) {}
-void CGuiWidget::Touch() const {}
+void CGuiWidget::Touch() {}
 
 bool CGuiWidget::GetIsVisible() const { return xb6_25_isVisible; }
 
@@ -136,7 +136,7 @@ void CGuiWidget::InitializeRGBAFactor() {
     nextSib->InitializeRGBAFactor();
 }
 
-bool CGuiWidget::GetIsFinishedLoadingWidgetSpecific() const { return true; }
+bool CGuiWidget::GetIsFinishedLoadingWidgetSpecific() { return true; }
 
 void CGuiWidget::SetTransform(const zeus::CTransform& xf) {
   x74_transform = xf;

Runtime/GuiSys/CGuiWidget.hpp

@@ -96,18 +96,18 @@ public:
   static std::shared_ptr<CGuiWidget> Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);
 
   void Update(float dt) override;
-  void Draw(const CGuiWidgetDrawParms& drawParms) const override;
+  void Draw(const CGuiWidgetDrawParms& drawParms) override;
   void Initialize() override;
 
   virtual void Reset(ETraversalMode mode);
   virtual void ProcessUserInput(const CFinalInput& input);
-  virtual void Touch() const;
+  virtual void Touch();
   virtual bool GetIsVisible() const;
   virtual bool GetIsActive() const;
   virtual bool GetMouseActive() const;
   virtual FourCC GetWidgetTypeID() const { return FOURCC('BWIG'); }
   virtual bool AddWorkerWidget(CGuiWidget* worker);
-  virtual bool GetIsFinishedLoadingWidgetSpecific() const;
+  virtual bool GetIsFinishedLoadingWidgetSpecific();
   virtual void OnVisibleChange();
   virtual void OnActiveChange();
 

Runtime/World/CMorphBallShadow.cpp

@@ -73,8 +73,8 @@ void CMorphBallShadow::RenderIdBuffer(const zeus::CAABox& aabb, const CStateMana
 
     CModelFlags flags(0, 0, 3, zeus::CColor{1.f, 1.f, 1.f, alphaVal / 255.f});
     flags.m_extendedShader = EExtendedShader::SolidColor; // Do solid color draw
-    const CBooModel& model = *modelData->PickStaticModel(CModelData::EWhichModel::Normal);
+    CBooModel& model = *modelData->PickStaticModel(CModelData::EWhichModel::Normal);
-    const_cast<CBooModel&>(model).VerifyCurrentShader(flags.x1_matSetIdx);
+    model.VerifyCurrentShader(flags.x1_matSetIdx);
     model.DrawNormal(flags, nullptr, nullptr);
     alphaVal += 4;
   }
@@ -128,8 +128,8 @@ void CMorphBallShadow::Render(const CStateManager& mgr, float alpha) {
     CGraphics::SetModelMatrix(modelXf);
 
     flags.x4_color.r() = alphaVal / 255.f;
-    const CBooModel& model = *modelData->PickStaticModel(CModelData::EWhichModel::Normal);
+    CBooModel& model = *modelData->PickStaticModel(CModelData::EWhichModel::Normal);
-    const_cast<CBooModel&>(model).VerifyCurrentShader(flags.x1_matSetIdx);
+    model.VerifyCurrentShader(flags.x1_matSetIdx);
     model.DrawNormal(flags, nullptr, nullptr);
     alphaVal += 4;
   }