From 9ea1305c27905f921554283e9962b55361c0bad8 Mon Sep 17 00:00:00 2001
From: Sebastian <hi@jbbth.net>
Date: Fri, 26 Jun 2026 01:50:32 +0200
Subject: [PATCH] ui improvements and texture tests

---
 Makefile                            |   4 ++
 resources/textures/round-delete.png | Bin 0 -> 3835 bytes
 src/button.h                        |   7 +++
 src/canvas.cpp                      |   4 +-
 src/datatypes.h                     |   1 +
 src/graph-manager.cpp               |  10 +++-
 src/graph-manager.h                 |   3 ++
 src/helper.h                        |   4 ++
 src/interactable.h                  |   2 +-
 src/midi-node.cpp                   |  74 +++++++++++++++++-----------
 src/node.cpp                        |   1 +
 src/selectable.h                    |   3 +-
 src/ui.cpp                          |  16 +++---
 src/vmath.h                         |   2 +-
 14 files changed, 89 insertions(+), 42 deletions(-)
 create mode 100644 resources/textures/round-delete.png

diff --git a/Makefile b/Makefile
index 84f779b..95fd776 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ LDLIBS := -lraylib -lasound -llibremidi -pthread
 LDFLAGS := -Llib -L/usr/lib -L/usr/local/lib
 
 SRCS := $(wildcard src/*.cpp)
+HDRS := $(wildcard src/*.h)
 OBJECTS := $(patsubst src/%.cpp,build/%.o, $(SRCS))
 
 viseq: $(OBJECTS)
@@ -17,6 +18,9 @@ $(OBJECTS): build/%.o : src/%.cpp
 	@mkdir -p build
 	$(CXX) -c $< -o $@ $(CXXFLAGS) $(CXXINC)
 
+src/%.cpp: $HDRS
+	touch $@
+
 clean:
 	rm -f build/*
 	rm -f viseq
diff --git a/resources/textures/round-delete.png b/resources/textures/round-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..53298e65ce83f8df1cf20da48cd36158e6b44645
GIT binary patch
literal 3835
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

literal 0
HcmV?d00001

diff --git a/src/button.h b/src/button.h
index 8e5c702..2201441 100644
--- a/src/button.h
+++ b/src/button.h
@@ -12,6 +12,13 @@ inline bool ViButton(Vec2Df mp, float x, float y, float radius, Color color){
 	return (Vector2Distance(mp, (Vector2){x,y}) < radius && IsMouseButtonPressed(MOUSE_BUTTON_LEFT));
 }
 
+inline bool ViTexButton(Vec2Df mp, Vec2Df position, float rotation, float radius, Texture2D tex, Color color){
+    float scale = (radius*2.0f) / (float)tex.width;
+    Vec2Df center_pos = position - Vec2Df((tex.width*scale)/1.0f * sin(rotation), (tex.height*scale)/1.0f * cos(rotation));
+    DrawTextureEx(tex, center_pos, rotation, scale, color);
+	return (Vector2Distance(mp, position) < radius && IsMouseButtonPressed(MOUSE_BUTTON_LEFT));
+}
+
 inline bool ViButton(Vec2Df mp, Vec2Df position, float radius, Color color){
 	return ViButton(mp, position.x, position.y, radius, color);
 }
diff --git a/src/canvas.cpp b/src/canvas.cpp
index c0f08b5..635e3ef 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -21,14 +21,14 @@ namespace VISEQ::APP::CANVAS {
     }
 
     void Canvas::pickUp() {
-        std::cout << "canvas pickUp" << std::endl;
+        //std::cout << "canvas pickUp" << std::endl;
         BASE::Draggable::pickUp();
         select_start = SCREEN_MOUSE;
         state->pushEvent({getPtr(), Interaction::DESELECT});
     }
 
     void Canvas::putDown() {
-        std::cout << "canvas putDown" << std::endl;
+        //std::cout << "canvas putDown" << std::endl;
         BASE::Draggable::putDown();
         state->pushEvent({getPtr(), Interaction::SELECT});
     }
diff --git a/src/datatypes.h b/src/datatypes.h
index 29cad7c..116eb0f 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -15,6 +15,7 @@
 #define VS_COLOR_PURPLE (Color){158, 134, 200, 255}
 #define VS_COLOR_PINK (Color){176, 82, 121, 255}
 #define VS_COLOR_BLUE (Color){108, 153, 187, 255}
+#define VS_COLOR_LIGHTBLUE (Color){143, 206, 255, 255}
 
 #define VS_COLOR_RED (Color){195, 83, 85, 255}
 #define VS_COLOR_BROWN (Color){84, 75, 61, 255}
diff --git a/src/graph-manager.cpp b/src/graph-manager.cpp
index 68d1b49..15b28d6 100644
--- a/src/graph-manager.cpp
+++ b/src/graph-manager.cpp
@@ -2,6 +2,7 @@
 
 #include "config-node.h"
 #include "datatypes.h"
+#include "helper.h"
 #include "state.h"
 #include "vmath.h"
 #include "raylib.h"
@@ -29,6 +30,10 @@ namespace VISEQ::GRAPH{
         return shared_from_this();
     }
 
+    void GraphManager::loadTextures(){
+       tex_delete = LoadTexture("resources/textures/round-delete.png");
+    }
+
     int GraphManager::getNodesSize(){
         return nodes.size();
     }
@@ -344,6 +349,7 @@ namespace VISEQ::GRAPH{
     void GraphManager::update(){
         if(!remove_edges.empty()) removeEdges();
         if(!split_edges.empty()) splitEdges();
+        if(tex_delete.width == 0 && IsWindowReady()) loadTextures();
     }
 
     void GraphManager::drawEdges(Vec2Df mouse_pos, Camera2D cam){
@@ -365,6 +371,8 @@ namespace VISEQ::GRAPH{
             unsigned char opacity_from = 250.0f - Clamp(from_to_handle.dist(mouse_pos), 0.0f, 220.0f);
             unsigned char opacity_to = 250.0f - Clamp(to_from_handle.dist(mouse_pos), 0.0f, 220.0f);
 
+            float opacity_normalized = Clamp((float)opacity / 255.0f, .0f, 1.0f);
+
             float midi_gate_v1 = 0.0f;
             float midi_gate_v2 = 0.0f; 
 
@@ -426,7 +434,7 @@ namespace VISEQ::GRAPH{
                 DrawLine(v1_position.x, v1_position.y, v2_position.x, v2_position.y, VS_COLOR_BLUE);
             }
 
-            if(ViButton(mouse_pos, flip_handle.x, flip_handle.y, 8.0f, (Color){232, 50, 32, opacity} )) removeEdge(c);
+            if(IsWindowReady() && ViTexButton(mouse_pos, flip_handle, HELPER::GetRotation(from_to_handle, to_from_handle), 8.0f, tex_delete, ColorLerp(Fade(VS_COLOR_WHITE, .0f), Fade(VS_COLOR_WHITE, 1.0f), opacity_normalized) )) removeEdge(c);
         }
     }
 
diff --git a/src/graph-manager.h b/src/graph-manager.h
index 1292080..42a185c 100644
--- a/src/graph-manager.h
+++ b/src/graph-manager.h
@@ -40,6 +40,7 @@ namespace VISEQ::GRAPH {
 			GraphManager() {}
 
 			std::shared_ptr<GraphManager> getPtr();
+            void loadTextures();
 			int getNodesSize();
 			void createMidiNode(Vec2Df position);
 			void createConfigNode(Vec2Df position);
@@ -84,6 +85,8 @@ namespace VISEQ::GRAPH {
 
             friend void from_json(const json& j, std::shared_ptr<GraphManager>& G);
             friend void to_json(json& j, const std::shared_ptr<GraphManager>& G);
+
+            Texture2D tex_delete;
 	};
 
 }
diff --git a/src/helper.h b/src/helper.h
index 9fc3858..2c17e95 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -15,4 +15,8 @@ namespace VISEQ::HELPER{
 			float rotation = Vector2Angle((Vector2){1,0}, (end - start)) * RAD2DEG;
 			DrawTextPro(GetFontDefault(), text.c_str(), text_position, (Vector2){0,0}, rotation, size, 2.0f, col);
 		}
+
+        inline float GetRotation(Vec2Df start, Vec2Df end){
+			return Vector2Angle((Vector2){1,0}, (end - start)) * RAD2DEG;
+        }
 }
diff --git a/src/interactable.h b/src/interactable.h
index 4a75844..09878a2 100644
--- a/src/interactable.h
+++ b/src/interactable.h
@@ -14,7 +14,7 @@ namespace VISEQ::BASE {
 			}
 
 			virtual ~Interactable() {}
-		
+			
 			bool is_hovering = false;
 			
 			int z_index = 0;
diff --git a/src/midi-node.cpp b/src/midi-node.cpp
index 093b263..0f35dcf 100644
--- a/src/midi-node.cpp
+++ b/src/midi-node.cpp
@@ -198,21 +198,24 @@ namespace VISEQ::GRAPH::NODES {
                 if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && !KEYS_DOWN.alt) modMidiPCProgram(wheel);
             break;}
             case PB:{
-                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*100);
-                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*1000);
-                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*10);
+                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*64);
+                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*2048);
+                if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel*256);
+                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPitchBend(wheel);
             break;}
             case AT:{
-                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel*100);
-                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel*1000);
-                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel*10);
+                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel*10);
+                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel*100);
+                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiAftertouch(wheel);
             break;}
             case PP:{
                 if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && !KEYS_DOWN.alt) modMidiPolyPressureNote(wheel);
+                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && !KEYS_DOWN.alt) modMidiPolyPressureNote(wheel*10);
                 
-                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*100);
-                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*1000);
-                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*10);
+                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*64);
+                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*2048);
+                if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel*256);
+                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) modMidiPolyPressureValue(wheel);
             break;}
         };
     }
@@ -252,23 +255,22 @@ namespace VISEQ::GRAPH::NODES {
                 break;}
         }
 
-        DrawRing(position, radius, radius + 4, 0, 360, 24, (Color){60, 60, 60, 255});
-        DrawRing(position, radius, radius + 4, 0.0f - 90.0f, (360.0f/127.0f) * getNotes().velocity - 90.0f, 24, (Color){158, 134, 200, 255});
-        DrawCircleLinesV(position, radius + 4, (Color){100, 100, 100, 255});
+        DrawRing(position, radius, radius + 4, 0, 360, 24, VS_COLOR_DARKGREY);
+        //DrawRing(position, radius, radius + 4, 0.0f - 90.0f, (360.0f/127.0f) * getNotes().velocity - 90.0f, 24, (Color){158, 134, 200, 255});
+        if(!selected) DrawCircleLinesV(position, radius + 4, VS_COLOR_GREY);
 
         float trigger_alpha = (1.f / getNotes().gate) * fade;
         
-        if(!picked_up && !selected && !in_selection_rect && !hovering()) DrawCircle(position.x, position.y, radius, ColorLerp(state->mode_color, VS_COLOR_RED, trigger_alpha));
-        if(picked_up || in_selection_rect || hovering()) DrawCircle(position.x, position.y, radius, (Color){108, 153, 187, 255});
-        if(selected) DrawCircle(position.x, position.y, radius, (Color){255, 153, 187, 255});
+        DrawCircle(position.x, position.y, radius, ColorLerp(state->settings.mode_colors[mode], VS_COLOR_RED, trigger_alpha));
+        if(hovering()) DrawCircleLinesV(position, radius + 4, VS_COLOR_PINK);
+        if(picked_up || (in_selection_rect && MOUSE_LEFT.down) || selected) DrawCircleLinesV(position, radius + 4, VS_COLOR_LIGHTBLUE);
+        //if(selected) DrawCircle(position.x, position.y, radius, (Color){255, 153, 187, 255});
 
         if(distributionMode == Distribution::RANDOM) DrawCircle(position.x, position.y, radius/2.0f, VS_COLOR_PINK);
         if(distributionMode == Distribution::ROUNDROBIN) DrawCircle(position.x, position.y, radius/2.0f, VS_COLOR_YELLOW);
         
-        if(selected) DrawCircleLinesV(position, radius+8, (Color){158, 255, 210, 255});
+        //if(selected) DrawCircleLinesV(position, radius+8, (Color){158, 255, 210, 255});
        
-        // TODO draw values of corresponding attribute when modifiers are pressed
-        //VMATH::Vec2D<float> title_position = position + VMATH::Vec2D<float>(radius + 7.0f, -(radius + 7.0f));
         VMATH::Vec2D<float> desc_position = position + VMATH::Vec2D<float>(radius + 7.0f, radius + 7.0f);
         switch(mode){
             case NOTE:{
@@ -285,10 +287,10 @@ namespace VISEQ::GRAPH::NODES {
                     if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawText("VALUE", desc_position, 8, WHITE);
                     if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawText("VELOCITY", desc_position, 8, WHITE);
                 
-                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE +.1", desc_position, 8, WHITE);                    
-                    if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE +1.0", desc_position, 8, WHITE);                    
-                    if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE +.01", desc_position, 8, WHITE);
-                    if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE +.001", desc_position, 8, WHITE);
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE 0.1s", desc_position, 8, WHITE);                    
+                    if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE 1.0s", desc_position, 8, WHITE);                    
+                    if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE 0.01s", desc_position, 8, WHITE);
+                    if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("GATE 0.001s", desc_position, 8, WHITE);
                 }
             break;}
             case CC:{
@@ -310,14 +312,23 @@ namespace VISEQ::GRAPH::NODES {
                 }
             break;}
             case PB:{
-                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPitchBend().value), position, 12, WHITE);
-                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPitchBend().value), position, 12, WHITE);
-                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPitchBend().value), position, 12, WHITE);
+                DrawCenteredText(std::format("{}", getPitchBend().value), position, 10, WHITE);
+                if(selected){
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawText("PITCHBEND", desc_position, 8, WHITE);
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("64", desc_position, 8, WHITE); 
+                    if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("2048", desc_position, 8, WHITE); 
+                    if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("256", desc_position, 8, WHITE);
+                    if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("1", desc_position, 8, WHITE);
+                }
             break;}
             case AT:{
-                if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getAftertouch().value), position, 12, WHITE);
-                if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getAftertouch().value), position, 12, WHITE);
-                if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getAftertouch().value), position, 12, WHITE);
+                DrawCenteredText(std::format("{}", getAftertouch().value), position, 12, WHITE);
+                if(selected){
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawText("AFTERTOUCH", desc_position, 8, WHITE);                    
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("10", desc_position, 8, WHITE);                    
+                    if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("100", desc_position, 8, WHITE);                    
+                    if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("1", desc_position, 8, WHITE); 
+                }
             break;}
             case PP:{
                 if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawCenteredText(MIDI::Notes[getPolyPressure().note], position, 12, WHITE);
@@ -325,6 +336,13 @@ namespace VISEQ::GRAPH::NODES {
                 if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPolyPressure().value), position, 12, WHITE);
                 if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPolyPressure().value), position, 12, WHITE);
                 if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawCenteredText(std::format("{}", getPolyPressure().value), position, 12, WHITE);
+                if(selected){
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && !KEYS_DOWN.alt) DrawText("POLYPRESSURE", desc_position, 8, WHITE);                    
+                    if(!KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("64", desc_position, 8, WHITE);                    
+                    if(KEYS_DOWN.ctrl && !KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("2048", desc_position, 8, WHITE);                    
+                    if(!KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("256", desc_position, 8, WHITE);                    
+                    if(KEYS_DOWN.ctrl && KEYS_DOWN.shift && KEYS_DOWN.alt) DrawText("1", desc_position, 8, WHITE); 
+                }
             break;}
         };
 
diff --git a/src/node.cpp b/src/node.cpp
index e01cae4..4dc25bf 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -63,6 +63,7 @@ namespace VISEQ::GRAPH::NODES {
             c->update();
         }
         if(free_connectors == 0) addConnector();
+        in_selection_rect = CheckCollisionPointRec(position, state->selection);
     }
 
     void Node::draw(Vec2Df mp, Camera2D cam) {}
diff --git a/src/selectable.h b/src/selectable.h
index 9213a48..f142e88 100644
--- a/src/selectable.h
+++ b/src/selectable.h
@@ -9,13 +9,14 @@ namespace VISEQ::BASE {
 			Selectable() {}
 			
 			bool in_selection_rect = false;
-			bool selected = false;
+			bool selected = false;	
 
 			bool copied = false;
 			bool highlighted = false;
 			bool erase = false;
 			Vec2Df selection_offset;
 
+            void update();
 			virtual bool clicked() override;
 
 			virtual bool select() = 0;
diff --git a/src/ui.cpp b/src/ui.cpp
index 2ac3be7..17422ee 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -93,14 +93,14 @@ namespace VISEQ::APP::UI{
         DrawText(std::format("{}", gm->getNodesSize()).c_str(), 20, state->settings.height - 70, 15, VS_COLOR_WHITE);
         DrawFPS(20, state->settings.height - 30);
 
-        std::string shorts[6] = {"NT","CC","PC","PB","AT","PP"};
-        for(int i = 0; i < 6; ++i){
-            Color col = state->settings.mode_colors[i];
-            Vec2Df pos = {state->settings.width - (6.0f*75.0f) + i*75.0f, state->settings.height - 75.0f};
-            DrawRing(pos, 30.0f, 34.0f, 0.0f, 360.0f, 24, state->node_mode == i ? VS_COLOR_WHITE : (Color){0,0,0,0}); 
-            DrawCircleV(pos, 30.0f, col);
-            DrawCenteredText(shorts[i], pos, 20, WHITE);
-        }
+       // std::string shorts[6] = {"NT","CC","PC","PB","AT","PP"};
+       // for(int i = 0; i < 6; ++i){
+       //     Color col = state->settings.mode_colors[i];
+       //     Vec2Df pos = {state->settings.width - (6.0f*75.0f) + i*75.0f, state->settings.height - 75.0f};
+       //     DrawRing(pos, 30.0f, 34.0f, 0.0f, 360.0f, 24, state->node_mode == i ? VS_COLOR_WHITE : (Color){0,0,0,0}); 
+       //     DrawCircleV(pos, 30.0f, col);
+       //     DrawCenteredText(shorts[i], pos, 20, WHITE);
+       // }
     }
 
     void AppUI::DrawCenteredText(std::string text, Vec2Df position, int size, Color color){	
diff --git a/src/vmath.h b/src/vmath.h
index e4ad3d5..bad5018 100644
--- a/src/vmath.h
+++ b/src/vmath.h
@@ -166,7 +166,7 @@ namespace VISEQ::VMATH{
 
 	template<typename T>
 	Vec2D<T> polarToCartesian(T r, T q) {
-		return Vec2D<T>{r * cos(q), r * sin(q)};
+		return Vec2D<T>{r * (T)cos(q), r * (T)sin(q)};
 	}
 }