tri11paragon
/
graphs
mirror of https://github.com/tri11paragon/graphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hi

main
Brett 2024-05-15 13:48:06 -04:00
parent 113646c190
commit 8dbddb79fa
3 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(graphs VERSION 0.0.43) project(graphs VERSION 0.0.44)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)

12
include/graph.h
View File

@ -26,6 +26,14 @@
namespace im = ImGui; namespace im = ImGui;
enum class anim_state_t
{
NONE,
HIGHLIGHT_NODE,
SELECT_NODE,
HIGHLIGHT_TO_SELECT
};
struct bounding_box struct bounding_box
{ {
int min_x = 0; int min_x = 0;
@ -57,7 +65,6 @@ class graph_t
static constexpr float POINT_SIZE = 35; static constexpr float POINT_SIZE = 35;
blt::i32 selected_node = -1; blt::i32 selected_node = -1;
blt::i32 highlighted_node = -1;
blt::quad_easing easing; blt::quad_easing easing;
blt::quint_easing highlight_easing; blt::quint_easing highlight_easing;
@ -111,9 +118,6 @@ class graph_t
void reset_mouse_highlight() void reset_mouse_highlight()
{ {
if (highlighted_node != -1)
nodes[highlighted_node].setOutlineColor(color::POINT_OUTLINE_COLOR);
highlighted_node = -1;
highlight_easing.reset(); highlight_easing.reset();
} }

50
src/graph.cpp
View File

@ -15,6 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <blt/gfx/window.h>
#include <graph.h> #include <graph.h>
#include <random> #include <random>
#include <blt/gfx/raycast.h> #include <blt/gfx/raycast.h>
@ -85,9 +86,8 @@ void graph_t::process_mouse_drag(const blt::i32 width, const blt::i32 height)
global_matrices.getOrtho())); global_matrices.getOrtho()));
bool mouse_pressed = blt::gfx::isMousePressed(0); bool mouse_pressed = blt::gfx::isMousePressed(0);
blt::i32 new_selection = selected_node;
if (selected_node < 0)
{
for (const auto& [index, node] : blt::enumerate(nodes)) for (const auto& [index, node] : blt::enumerate(nodes))
{ {
const auto pos = node.getPosition(); const auto pos = node.getPosition();
@ -95,36 +95,42 @@ void graph_t::process_mouse_drag(const blt::i32 width, const blt::i32 height)
const auto mag = dist.magnitude(); const auto mag = dist.magnitude();
if (mag < POINT_SIZE && mouse_pressed) if (mag < POINT_SIZE && (selected_node == -1 || !mouse_pressed))
{ {
selected_node = static_cast<blt::i32>(index); new_selection = static_cast<blt::i32>(index);
reset_mouse_highlight();
break; break;
} else if (mag < POINT_SIZE * (node.getOutlineScale() + (node.getOutlineScale() - 1) * 2)) }
}
if (new_selection != selected_node)
{ {
highlighted_node = static_cast<blt::i32>(index); if (selected_node != -1)
nodes[selected_node].setOutlineColor(color::POINT_OUTLINE_COLOR);
} }
if (!mouse_pressed && blt::gfx::mouseReleaseLastFrame())
{
reset_mouse_drag();
} }
} else
selected_node = new_selection;
// if (!mouse_pressed && selected_node != -1 && found && nodes[selected_node].getOutlineColor() != color::POINT_HIGHLIGHT_COLOR)
// {
// highlight_easing.progress(8 * static_cast<float>(blt::gfx::getFrameDeltaSeconds()));
// nodes[selected_node].setOutlineColor(highlight_easing.apply(color::POINT_OUTLINE_COLOR, color::POINT_HIGHLIGHT_COLOR));
// }
//
// if (!found)
// reset_mouse_highlight();
if (selected_node != -1 && mouse_pressed)
{ {
auto& node = nodes[selected_node]; auto& node = nodes[selected_node];
easing.progress(8 * static_cast<float>(blt::gfx::getFrameDeltaSeconds())); easing.progress(8 * static_cast<float>(blt::gfx::getFrameDeltaSeconds()));
node.setOutlineColor(easing.apply(color::POINT_HIGHLIGHT_COLOR, color::POINT_SELECT_COLOR)); node.setOutlineColor(easing.apply(color::POINT_OUTLINE_COLOR, color::POINT_SELECT_COLOR));
node.getPositionRef() = mouse_pos; node.getPositionRef() = mouse_pos;
} }
if (highlighted_node != -1)
{
highlight_easing.progress(8 * static_cast<float>(blt::gfx::getFrameDeltaSeconds()));
BLT_TRACE("Hmew");
nodes[highlighted_node].setOutlineColor(highlight_easing.apply(color::POINT_OUTLINE_COLOR, color::POINT_HIGHLIGHT_COLOR));
} else
reset_mouse_highlight();
if (!mouse_pressed)
{
reset_mouse_drag();
}
} }
void graph_t::handle_mouse() void graph_t::handle_mouse()