Merge pull request #285 from lioncash/text

Revert "Revert "CTextRenderBuffer: Forward declare structs where applicable"

Runtime/GuiSys/CTextRenderBuffer.cpp

@@ -12,31 +12,64 @@
 
 namespace urde {
 
+struct CTextRenderBuffer::BooFontCharacters {
+  TLockedToken<CRasterFont> m_font;
+  hecl::VertexBufferPool<CTextSupportShader::CharacterInstance>::Token m_instBuf;
+  boo::ObjToken<boo::IShaderDataBinding> m_dataBinding;
+  boo::ObjToken<boo::IShaderDataBinding> m_dataBinding2;
+  std::vector<CTextSupportShader::CharacterInstance> m_charData;
+  u32 m_charCount = 0;
+  bool m_dirty = true;
+
+  BooFontCharacters(const CToken& token) : m_font(token) {}
+};
+
+struct CTextRenderBuffer::BooImage {
+  CFontImageDef m_imageDef;
+  hecl::VertexBufferPool<CTextSupportShader::ImageInstance>::Token m_instBuf;
+  std::vector<boo::ObjToken<boo::IShaderDataBinding>> m_dataBinding;
+  std::vector<boo::ObjToken<boo::IShaderDataBinding>> m_dataBinding2;
+  CTextSupportShader::ImageInstance m_imageData;
+  bool m_dirty = true;
+
+  BooImage(const CFontImageDef& imgDef, const zeus::CVector2i& offset) : m_imageDef(imgDef) {
+    m_imageData.SetMetrics(imgDef, offset);
+  }
+};
+
+struct CTextRenderBuffer::BooPrimitiveMark {
+  Command m_cmd;
+  u32 m_bindIdx;
+  u32 m_instIdx;
+
+  void SetOpacity(CTextRenderBuffer& rb, float opacity) {
+    switch (m_cmd) {
+    case Command::CharacterRender: {
+      BooFontCharacters& fc = rb.m_fontCharacters[m_bindIdx];
+      CTextSupportShader::CharacterInstance& inst = fc.m_charData[m_instIdx];
+      inst.m_mulColor.a() = opacity;
+      fc.m_dirty = true;
+      break;
+    }
+    case Command::ImageRender: {
+      BooImage& img = rb.m_images[m_bindIdx];
+      img.m_imageData.m_color.a() = opacity;
+      img.m_dirty = true;
+      break;
+    }
+    default:
+      break;
+    }
+  }
+};
+
+CTextRenderBuffer::CTextRenderBuffer(CTextRenderBuffer&&) noexcept = default;
+
 CTextRenderBuffer::CTextRenderBuffer(EMode mode, CGuiWidget::EGuiModelDrawFlags df) : x0_mode(mode), m_drawFlags(df) {}
 
-CTextRenderBuffer::BooImage::BooImage(const CFontImageDef& imgDef, const zeus::CVector2i& offset) : m_imageDef(imgDef) {
+CTextRenderBuffer::~CTextRenderBuffer() = default;
-  m_imageData.SetMetrics(imgDef, offset);
-}
 
-void CTextRenderBuffer::BooPrimitiveMark::SetOpacity(CTextRenderBuffer& rb, float opacity) {
+CTextRenderBuffer& CTextRenderBuffer::operator=(CTextRenderBuffer&&) noexcept = default;
-  switch (m_cmd) {
-  case Command::CharacterRender: {
-    BooFontCharacters& fc = rb.m_fontCharacters[m_bindIdx];
-    CTextSupportShader::CharacterInstance& inst = fc.m_charData[m_instIdx];
-    inst.m_mulColor.a() = opacity;
-    fc.m_dirty = true;
-    break;
-  }
-  case Command::ImageRender: {
-    BooImage& img = rb.m_images[m_bindIdx];
-    img.m_imageData.m_color.a() = opacity;
-    img.m_dirty = true;
-    break;
-  }
-  default:
-    break;
-  }
-}
 
 void CTextRenderBuffer::CommitResources() {
   if (m_committed)
@@ -125,6 +158,8 @@ void CTextRenderBuffer::SetPrimitiveOpacity(int idx, float opacity) {
   m_primitiveMarks[idx].SetOpacity(*this, opacity);
 }
 
+u32 CTextRenderBuffer::GetPrimitiveCount() const { return m_primitiveMarks.size(); }
+
 void CTextRenderBuffer::Render(const zeus::CColor& col, float time) const {
   const_cast<CTextRenderBuffer*>(this)->CommitResources();
 

Runtime/GuiSys/CTextRenderBuffer.hpp

@@ -65,35 +65,13 @@ private:
   hecl::UniformBufferPool<CTextSupportShader::Uniform>::Token m_uniBuf;
   hecl::UniformBufferPool<CTextSupportShader::Uniform>::Token m_uniBuf2;
 
-  struct BooFontCharacters {
+  struct BooFontCharacters;
-    TLockedToken<CRasterFont> m_font;
-    hecl::VertexBufferPool<CTextSupportShader::CharacterInstance>::Token m_instBuf;
-    boo::ObjToken<boo::IShaderDataBinding> m_dataBinding;
-    boo::ObjToken<boo::IShaderDataBinding> m_dataBinding2;
-    std::vector<CTextSupportShader::CharacterInstance> m_charData;
-    u32 m_charCount = 0;
-    bool m_dirty = true;
-    BooFontCharacters(const CToken& token) : m_font(token) {}
-  };
   std::vector<BooFontCharacters> m_fontCharacters;
 
-  struct BooImage {
+  struct BooImage;
-    CFontImageDef m_imageDef;
-    hecl::VertexBufferPool<CTextSupportShader::ImageInstance>::Token m_instBuf;
-    std::vector<boo::ObjToken<boo::IShaderDataBinding>> m_dataBinding;
-    std::vector<boo::ObjToken<boo::IShaderDataBinding>> m_dataBinding2;
-    CTextSupportShader::ImageInstance m_imageData;
-    bool m_dirty = true;
-    BooImage(const CFontImageDef& imgDef, const zeus::CVector2i& offset);
-  };
   std::vector<BooImage> m_images;
 
-  struct BooPrimitiveMark {
+  struct BooPrimitiveMark;
-    Command m_cmd;
-    u32 m_bindIdx;
-    u32 m_instIdx;
-    void SetOpacity(CTextRenderBuffer& rb, float opacity);
-  };
   std::vector<BooPrimitiveMark> m_primitiveMarks;
   u32 m_imagesCount = 0;
   u32 m_activeFontCh = UINT32_MAX;
@@ -108,7 +86,12 @@ private:
 #endif
 
 public:
+  CTextRenderBuffer(CTextRenderBuffer&& other) noexcept;
   CTextRenderBuffer(EMode mode, CGuiWidget::EGuiModelDrawFlags df);
+  ~CTextRenderBuffer();
+
+  CTextRenderBuffer& operator=(CTextRenderBuffer&& other) noexcept;
+
 #if 0
     void SetPrimitive(const Primitive&, int);
     Primitive GetPrimitive(int) const;
@@ -119,7 +102,7 @@ public:
     void AddPaletteChange(const CGraphicsPalette& palette);
 #else
   void SetPrimitiveOpacity(int idx, float opacity);
-  u32 GetPrimitiveCount() const { return m_primitiveMarks.size(); }
+  u32 GetPrimitiveCount() const;
 #endif
   void SetMode(EMode mode);
   void Render(const zeus::CColor& col, float) const;