Add Canvas

Canvas contains the RenderTexture2D
contains the Tree
and now it's eazy to add more modules

inc/App.hpp

@@ -1,5 +1,5 @@
 #include <vector>
-#include "Tree.hpp"
+#include "Canvas.hpp"
 
 class App
 {
@@ -15,7 +15,7 @@ public:
 private:
   int pos = 0;
   int screenWidth, screenHeight;
-  std::vector<Tree> trees;
+  std::vector<Canvas> canvases;
   Vector2 center;
   float rotation = 0.0f;
   Rectangle destB;

inc/Canvas.hpp

@@ -0,0 +1,18 @@
+#include "raylib.h"
+#include "Tree.hpp"
+
+class Canvas
+{
+
+public:
+  Canvas() = default;
+  ~Canvas() = default;
+  void init(int size);
+  void newGen();
+  void draw(Rectangle dest, float rotation);
+  void deinit();
+
+private:
+  Tree tree;
+  RenderTexture2D target = {0};
+};

inc/Tree.hpp

@@ -24,15 +24,13 @@ class Tree
 {
 
 public:
-  Tree(int size);
+  Tree() = default;
-  ~Tree();
+  ~Tree() = default;
-  void draw(Rectangle dest, float rotation);
+  void init(int size);
-  void newTree();
+  void newGen();
-  void deinit();
 
 private:
   int size = 0;
-  RenderTexture2D target = {0};
   Vector2 start = {0};
   std::vector<Branch> branches;
   std::list<DrawArgs> draw_calls;

src/App.cpp

@@ -10,17 +10,20 @@ void App::init(int screenWidth, int screenHeight)
 {
   this->screenWidth = screenWidth;
   this->screenHeight = screenHeight;
-  trees.emplace_back(screenWidth);
+  canvases.assign(2, {});
-  trees.emplace_back(screenWidth);
 
-  for (auto &&tree : trees)
+  for (auto &&canvas : canvases)
-    tree.newTree();
+  {
+    canvas.init(screenWidth);
+    canvas.newGen();
+  }
 
   center = {(float)screenWidth / 2, (float)screenHeight / 2};
   float rotation = 0.0f;
   destA = CalculateRect(center, rotation, screenWidth, screenWidth);
   destB = {destA.x, destA.y, (float)screenWidth, (float)screenWidth};
 }
+
 void App::update()
 {
   if (IsMouseButtonDown(MOUSE_BUTTON_LEFT))
@@ -35,7 +38,7 @@ void App::update()
 
   if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT))
   {
-    trees[1 - pos].newTree();
+    canvases[1 - pos].newGen();
     pos = 1 - pos;
     rotation = 0.0f;
     center.x = screenWidth / 2;
@@ -47,14 +50,14 @@ void App::update()
 void App::draw()
 {
   ClearBackground(RED);
-  trees[pos].draw(destB, 0.0f);
+  canvases[pos].draw(destB, 0.0f);
-  trees[1 - pos].draw(destA, rotation);
+  canvases[1 - pos].draw(destA, rotation);
 }
 
 void App::deinit()
 {
-  for (size_t i = 0; i < trees.size(); i++)
+  for (size_t i = 0; i < canvases.size(); i++)
   {
-    trees[i].deinit();
+    canvases[i].deinit();
   }
 }

src/Canvas.cpp

@@ -0,0 +1,30 @@
+#include "Canvas.hpp"
+
+void Canvas::init(int size)
+{
+  tree.init(size);
+  target = LoadRenderTexture(size, size);
+}
+
+void Canvas::newGen()
+{
+  BeginTextureMode(target);
+  ClearBackground(WHITE);
+
+  tree.newGen();
+
+  EndTextureMode();
+}
+
+void Canvas::draw(Rectangle dest, float rotation)
+{
+  Rectangle source = {0, 0, (float)target.texture.width, (float)-target.texture.height};
+  Vector2 origin = {0.0f, 0.0f};
+  rotation = 360 - rotation;
+  DrawTexturePro(target.texture, source, dest, origin, rotation, WHITE);
+}
+
+void Canvas::deinit()
+{
+  UnloadRenderTexture(target);
+}

src/Tree.cpp

@@ -5,41 +5,20 @@
 #include "Math.hpp"
 
 // Public
-Tree::Tree(int size)
+void Tree::init(int size)
 {
   this->size = size;
-  target = LoadRenderTexture(size, size);
   start.x = size / 2;
   start.y = size;
 
   branches.assign(11, {});
 }
 
-Tree::~Tree()
+void Tree::newGen()
-{
-}
-
-void Tree::draw(Rectangle dest, float rotation)
-{
-  Rectangle source = {0, 0, (float)target.texture.width, (float)-target.texture.height};
-  Vector2 origin = {0.0f, 0.0f};
-  rotation = 360 - rotation;
-  DrawTexturePro(target.texture, source, dest, origin, rotation, WHITE);
-}
-
-void Tree::newTree()
 {
   generateBranches();
 
-  BeginTextureMode(target);
-  ClearBackground(WHITE);
   drawTree();
-  EndTextureMode();
-}
-
-void Tree::deinit()
-{
-  UnloadRenderTexture(target);
 }
 
 // Private