Merge pull request #7 from memeToasty/trees

Trees
memeToasty · Sep 5, 2022 · 3fbc0ad · 3fbc0ad
2 parents c38aa1b + c4a58c3
commit 3fbc0ad
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/source/node.cpp b/source/node.cpp
@@ -2,22 +2,23 @@
 #include "node.hpp"
 #include <citro2d.h>
 
-Node::Node(const char* text, float x, float y, float size) {
-    this->size = size * 20;
+Node::Node(const char* text, float x, float y, float scale) {
+    this->scale = scale;
     this->x = x;
     this->y = y;
-    //TODO Fix text positioning on Circle
-    this->text = new Text(text, &this->x, &this->y, size);
-    *this->text->xPos -= this->text->staticText.width / 2;
+
+    this->text = new Text(text, x, y, scale);
 }
 
 void Node::render(bool active) {
 
+    this->text->xPos = this->x - (this->text->staticText.width / 2 * scale);
+    this->text->yPos = this->y - (this->scale * 15);
 
     if (active) {
-        C2D_DrawCircleSolid(x, y, 0, size, activeColor);
+        C2D_DrawCircleSolid(x, y, 0, scale * 15, activeColor);
     } else {
-        C2D_DrawCircleSolid(x, y, 0, size, color);
+        C2D_DrawCircleSolid(x, y, 0, scale * 15, color);
     }
     this->text->render();
 }
diff --git a/source/node.hpp b/source/node.hpp
@@ -10,10 +10,10 @@ class Node {
         static const u32 activeColor = C2D_Color32(0xFF, 0x00, 0x00, 0xFF);
     public:
         Text* text;
-        float x,y ;
-        float size;
+        float x,y;
+        float scale;
 
-        Node(const char* text, float x, float y, float size);
+        Node(const char* text, float x, float y, float scale);
 
         void render(bool active);
 };

diff --git a/source/text.cpp b/source/text.cpp
@@ -18,7 +18,7 @@ void Text::deInit()
     cfguExit();
 }
 
-Text::Text(const char* text, float* x, float* y, float scale)
+Text::Text(const char* text, float x, float y, float scale)
 {
     this->xPos = x;
     this->yPos = y;
@@ -33,5 +33,5 @@ void Text::render()
 { 
     C2D_TextFontParse(&staticText, font, textBuf, text);
     C2D_TextOptimize(&staticText);
-    C2D_DrawText(&staticText, 0, *xPos, *yPos, 0.0f, textScale, textScale);
+    C2D_DrawText(&staticText, 0, xPos, yPos, 0.0f, textScale, textScale);
 }
diff --git a/source/text.hpp b/source/text.hpp
@@ -12,12 +12,12 @@ class Text
     static C2D_TextBuf textBuf;
     C2D_Text staticText;
     static C2D_Font font;
-    float* xPos;
-    float* yPos;
+    float xPos;
+    float yPos;
     float textScale;
     const char* text;
 
-    Text(const char* text, float* x, float* y, float scale);
+    Text(const char* text, float x, float y, float scale);
 
 
     void render();

diff --git a/source/visuals.cpp b/source/visuals.cpp
@@ -12,6 +12,8 @@
 SwkbdState swkbd;
 char mybuf[10];
 
+static const int PADDING = 30;
+
 void accessElement(unsigned int accessedIndex)
 {
 	activeIndex = accessedIndex;
@@ -94,13 +96,9 @@ void initArray()
 	}
 	// Init Tree view
 	nodeArray.clear();
-	for (unsigned short i = 0; i < arrayLen; i++) 
-	{
-		nodeArray.push_back(new Node(&std::to_string(array[i]).c_str()[0],0,i*10, 0.5f));
-	}
 
-	unsigned short height = (unsigned short) floor(log2(nodeArray.size()));
-	float yGap = SCREEN_HEIGHT / height;
+	unsigned short height = (unsigned short) floor(log2(arrayLen));
+	float yGap = (SCREEN_HEIGHT  - (2 * PADDING)) / height;
 	//Go through every layer of binary tree with size of the nodeArray
 	for (unsigned short h = 0; h <= height; ++h) {
 
@@ -110,14 +108,11 @@ void initArray()
 		for (unsigned short i = 0; i < (unsigned short) pow(2,h); ++i) {
 			int absoluteI = pow(2,h) - 1 + i;
 
-			if (absoluteI > (int) nodeArray.size() - 1) {
+			if (absoluteI > (int) arrayLen - 1) {
 				break;
 			}
 
-			Node* currentNode = nodeArray.at(absoluteI);
-
-			currentNode->x = leftOffset + i * xGap;
-			currentNode->y = h * yGap;
+			nodeArray.push_back(new Node(std::to_string(array[i]).c_str(), leftOffset + i * xGap, h * yGap + PADDING, 10.0f / arrayLen ));
 		}
 	}
 }