fix(sidebar): Node cannot be placed in the sidebar domain

Author: Stone-r1

src/board.cpp

@@ -49,7 +49,7 @@ Vector2 Board::isInNodeDomain(Vector2 mousePosition) {
  return {0.0f, 0.0f};
 }
 
-void Board::addNode(Vector2 mousePosition) {
+void Board::addNode(Vector2 mousePosition, float currentRadius) {
  for (const Node& node : nodes) {
  float minDistance = node.getNodeRadius() * 3;
 
@@ -65,7 +65,7 @@ void Board::addNode(Vector2 mousePosition) {
  }
  }
 
- Node currentNode = Node(lastNodeIndex, mousePosition, 50.0f);
+ Node currentNode = Node(lastNodeIndex, mousePosition, currentRadius);
  nodes[lastNodeIndex++] = currentNode;
 }
 

src/board.h

@@ -33,7 +33,7 @@ class Board {
 
  Vector2 isInNodeDomain(Vector2 mousePosition);
 
- void addNode(Vector2 mousePosition);
+ void addNode(Vector2 mousePosition, float currentRadius);
  void addEdge(Vector2 firstNodePosition, Vector2 secondNodePosition);
  void removeEdge(Vector2 firstNodePosition, Vector2 secondNodePosition);
  void removeNode(Vector2 mousePosition);

src/main.cpp

@@ -1,6 +1,9 @@
 #include "board.h"
 #include <iostream>
 #include "raylib.h"
+#include "sidebar.h"
+
+const float radius = 50.0f;
 
 int main() {
  int monitor = GetCurrentMonitor();
@@ -9,12 +12,16 @@ int main() {
  SetTargetFPS(60);
 
  Board board;
+ Sidebar sidebar(GetScreenHeight());
  Vector2 selectedNode = {-1, -1};
 
  while (!WindowShouldClose()) { 
  Vector2 mouse = GetMousePosition();
  if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) {
- board.addNode(mouse);
+ sidebar.handleMouse(mouse);
+ if (!sidebar.isInSidebarDomain(mouse, radius)) {
+ board.addNode(mouse, radius);
+ }
  }
 
  if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) {
@@ -34,6 +41,7 @@ int main() {
 
  BeginDrawing();
  ClearBackground(WHITE);
+ sidebar.draw();
  board.drawNodes();
  board.drawEdges();
 
@@ -42,3 +50,4 @@ int main() {
 
  CloseWindow();
 }
+

src/sidebar.cpp

@@ -1,6 +1,7 @@
 #include "raylib.h"
 #include "sidebar.h"
 #include <vector>
+#include <iostream>
 #include <string>
 
 const float margin = 10.0f;
@@ -29,3 +30,35 @@ void Sidebar::draw() {
  DrawText(button.label.c_str(), button.domain.x + margin, button.domain.y + margin, 18, BLACK);
  }
 }
+
+void Sidebar::handleMouse(Vector2 mousePosition) {
+ if (mousePosition.x > width || mousePosition.y > height) {
+ return;
+ }
+
+ for (const auto& button : buttons) {
+ const Rectangle& rect = button.domain;
+ if (mousePosition.x > rect.x && mousePosition.x < rect.x + rect.width &&
+ mousePosition.y > rect.y && mousePosition.y < rect.y + rect.height) {
+ std::cout << "Is In Domain of " << button.label << '\n';
+ }
+ }
+}
+
+bool Sidebar::isInSidebarDomain(Vector2 mousePosition, float currentRadius) {
+ if (mousePosition.x - currentRadius < width && mousePosition.y - currentRadius < height) {
+ return true;
+ }
+ return false;
+}
+
+/*
+struct Button {
+ Rectangle domain;
+ std::string label;
+ bool clicked;
+
+ Button(Rectangle rect, const std::string& str)
+ : domain(rect), label(str), clicked(false) {}
+};
+*/

src/sidebar.h

@@ -25,14 +25,11 @@ class Sidebar {
  std::vector<Button> buttons;
 
 public:
- Sidebar(int screenHeight);
- 
- int getSidebarX() const;
- int getSidebarWidth() const;
- int getSidebarHeight() const;
+ Sidebar(int screenHeight); 
 
  void draw();
  void handleMouse(Vector2 mousePosition);
+ bool isInSidebarDomain(Vector2 mousePosition, float currentRadius);
 
  bool isButtonClicked(const std::string& label);
  void resetClick();