changed styling a little

Author: richzli

src/components/core.cpp

@@ -10,7 +10,7 @@ void init_shaders() {
 // same deal with these
 void init_component_defaults() {
     _component_defaults = {
-        std::make_shared<circle>(glm::vec2(0, 0), 50),
+        std::make_shared<circle>(glm::vec2(0, 0), 20),
         std::make_shared<arrow>(glm::vec2(0, 0), glm::vec2(0, 0), 10.0f),
         std::make_shared<line>(glm::vec2(0, 0), glm::vec2(0, 0), 10.0f)
     };

src/engine/graph/edge.cpp

@@ -8,6 +8,8 @@ edge::edge(
     bool directed,
     std::shared_ptr<data> value
 ) : item(value) {
+    this->id = id;
+    
     this->u = u;
     this->v = v;
     this->directed = directed;

src/engine/graph/graph.cpp

@@ -3,9 +3,8 @@
 graph::graph(int n, bool directed) {
     this->node_cnt = n;
     for (int i = 0; i < n; ++i) {
-        nodes[i] = std::make_shared<node>();
+        add_node();
     }
-
     this->edge_cnt = 0;
 
     this->directed = directed;
@@ -41,6 +40,6 @@ int graph::add_edge(int u, int v) {
 }
 
 int graph::add_node() {
-    this->nodes[node_cnt] = std::make_shared<node>();
+    this->nodes[node_cnt] = std::make_shared<node>(node_cnt);
     return node_cnt++;
 }

src/engine/graph/node.cpp

@@ -2,16 +2,20 @@
 #include "edge.hpp"
 
 node::node(
-    int index,
+    int id,
     std::shared_ptr<data> value
 ) : item(value) {
-    this->id = index;
+    this->id = id;
 
     this->component = std::static_pointer_cast<node_component>(
         _component_defaults._node->copy()
     );
 }
 
+node::node(
+    int id
+) : node(id, std::make_shared<data>()) { }
+
 node::node() : node(0, std::make_shared<data>()) { }
 
 node::~node() {

src/engine/graph/node.hpp

@@ -9,6 +9,7 @@ class edge;
 class node : public item {
 public:
     node();
+    node(int id);
     node(int id, std::shared_ptr<data> value);
     ~node();
 

src/engine/scene.cpp

@@ -33,6 +33,7 @@ void scene::select(glm::vec2 pt) {
         if (obj->hit(pt_to_world(pt))) {
             obj->set_color(RED);
             selected_object = v;
+            selected_object->select();
             return;
         }
     }
@@ -41,6 +42,7 @@ void scene::select(glm::vec2 pt) {
         if (obj->hit(pt_to_world(pt))) {
             obj->set_color(RED);
             selected_object = e;
+            selected_object->select();
             return;
         }
     }
@@ -80,19 +82,23 @@ void scene::draw() {
     for (const auto & [i, e] : this->g->get_edges()) {
         if (e != selected_object) {
             e->get_component()->draw(view, projection);
-            draw_text("edge" + std::to_string(i), e->label(), pt_to_screen(e->get_component()->get_center()), 0);
+            draw_text("edge" + std::to_string(e->get_id()), e->label(), e->get_component()->get_center(), 0);
         }
     }
+    if (std::dynamic_pointer_cast<edge>(selected_object) != nullptr) {
+        selected_object->get_component()->draw(view, projection);
+        draw_text("edge" + std::to_string(selected_object->get_id()), selected_object->label(), selected_object->get_component()->get_center(), 0);
+    }
+
     for (const auto & [i, v] : this->g->get_nodes()) {
         if (v != selected_object) {
             v->get_component()->draw(view, projection);
-            draw_text("node" + std::to_string(i), v->label(), pt_to_screen(v->get_component()->get_center()), 0);
+            draw_text("node" + std::to_string(v->get_id()), v->label(), v->get_component()->get_center(), 0);
         }
     }
-
-    if (selected_object != nullptr) {
+    if (std::dynamic_pointer_cast<node>(selected_object) != nullptr) {
         selected_object->get_component()->draw(view, projection);
-        draw_text("s" + std::to_string(selected_object->get_id()), selected_object->label(), pt_to_screen(selected_object->get_component()->get_center()), 0);
+        draw_text("node" + std::to_string(selected_object->get_id()), selected_object->label(), selected_object->get_component()->get_center(), 0);
     }
 }
 
@@ -143,7 +149,7 @@ void scene::draw_text(std::string label, std::string text, glm::vec2 pos, int si
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
 	ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-    ImGui::SetNextWindowPos(pos - (glm::vec2) ImGui::CalcTextSize(text.c_str()) / 2.0f);
+    ImGui::SetNextWindowPos(pt_to_screen(pos) - (glm::vec2) ImGui::CalcTextSize(text.c_str()) / 2.0f);
 
     ImGui::Begin(label.c_str(), nullptr, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_NoInputs);