More stuff done at Project Ultra

- Added renderspace
- Revision System (to not always update pRenderspace
- added some test scene

include/pd/ultra/elems/element.hpp

@@ -1,10 +1,12 @@
 #pragma once
 
 #include <pd/lithium/lithium.hpp>
+#include <pd/ultra/flags.hpp>
 
 namespace PD {
 namespace Ultra {
-class ElementBase {
+class Canvas;
+class PD_API ElementBase {
  public:
   ElementBase() {}
   ~ElementBase() {}
@@ -14,8 +16,22 @@ class ElementBase {
    * Reset Function (for PD::Pool::FastReset)
    */
   virtual void Reset() {}
+  void Update(Canvas& c);
 
- private:
+  void SetAlignment(UltraAlignment a) { pAlignment = a; }
+  void SetPosition(const PD::fvec2& pos) { pPos = pos; }
+  void SetPosition(float x, float y) { pPos = PD::fvec2(x, y); }
+  void SetSize(const PD::fvec2& size) { pSize = size; }
+  void SetSize(float w, float h) { pSize = PD::fvec2(w, h); }
+
+ protected:
+  bool RevisionUpdate(PD::u32 req);
+  PD::u32 pCanvasRev = 0;
+  PD::Li::Rect pRenderspace;
+  UltraAlignment pAlignment = 0;
+  PD::fvec2 pPos;
+  PD::fvec2 pSize;
+  ElementBase* pParent = nullptr;
 };
 }  // namespace Ultra
 }  // namespace PD

include/pd/ultra/elems/image.hpp

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <pd/core/core.hpp>
+#include <pd/ultra/elems/element.hpp>
+
+namespace PD {
+namespace Ultra {
+class PD_API Image : public ElementBase {
+ public:
+  Image() {}
+  Image(PD::Li::Texture* tex, const PD::fvec2& pos, float rounding = 0.f,
+        UltraAlignment align = 0)
+      : pColor(0xffffffff), pRounding(rounding) {
+    this->pAlignment = align;
+    this->pPos = pos;
+    SetTexture(tex);
+  }
+  Image(PD::Li::Texture* tex, float x, float y, float rounding = 0.f,
+        UltraAlignment align = 0)
+      : pColor(0xffffffff), pRounding(rounding) {
+    this->pAlignment = align;
+    this->pPos = PD::fvec2(x, y);
+    SetTexture(tex);
+  }
+  ~Image() {}
+
+  void Draw(PD::Li::Drawlist& l) override;
+
+  void SetColor(const PD::Color& color) { pColor = color; }
+  void SetRounding(float r) { pRounding = r; }
+  void SetTexture(PD::Li::Texture* tex) {
+    pTex = tex;
+    SetSize(pTex->GetSize());
+  }
+
+ private:
+  PD::Color pColor = 0xffffffff;
+  PD::Li::Texture* pTex = nullptr;
+  float pRounding = 0.f;
+};
+}  // namespace Ultra
+
+}  // namespace PD

include/pd/ultra/elems/rect.hpp

@@ -8,20 +8,28 @@ namespace Ultra {
 class PD_API Rect : public ElementBase {
  public:
   Rect() {}
+  Rect(const PD::fvec2& pos, const PD::fvec2& size, const PD::Color& color,
+       float rounding = 0.f, UltraAlignment align = 0)
+      : pColor(color), pRounding(rounding) {
+    this->pAlignment = align;
+    this->pPos = pos;
+    this->pSize = size;
+  }
+  Rect(float x, float y, float w, float h, const PD::Color& color,
+       float rounding = 0.f, UltraAlignment align = 0)
+      : pColor(color), pRounding(rounding) {
+    this->pAlignment = align;
+    this->pPos = PD::fvec2(x, y);
+    this->pSize = PD::fvec2(w, h);
+  }
   ~Rect() {}
 
   void Draw(PD::Li::Drawlist& l) override;
 
-  void SetPosition(const PD::fvec2& pos) { pPos = pos; }
-  void SetPosition(float x, float y) { pPos = PD::fvec2(x, y); }
-  void SetSize(const PD::fvec2& size) { pSize = size; }
-  void SetSize(float w, float h) { pSize = PD::fvec2(w, h); }
   void SetColor(const PD::Color& color) { pColor = color; }
   void SetRounding(float r) { pRounding = r; }
 
  private:
-  PD::fvec2 pPos;
-  PD::fvec2 pSize;
   PD::Color pColor;
   float pRounding = 0.f;
 };

include/pd/ultra/elems/text.hpp

@@ -12,13 +12,10 @@ class PD_API Text : public ElementBase {
 
   void Draw(PD::Li::Drawlist& l) override;
 
-  void SetPosition(const PD::fvec2& pos) { pPos = pos; }
-  void SetPosition(float x, float y) { pPos = PD::fvec2(x, y); }
   void SetColor(const PD::Color& color) { pColor = color; }
   void SetText(const std::string& text) { pText = text; }
 
  private:
-  PD::fvec2 pPos;
   PD::Color pColor;
   std::string pText;
 };