cleanup, reshaper
Brett
parent
a6badf5e9d
commit
8d6d85cc33
|
|
@ -0,0 +1,103 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="BackendCodeEditorSettings">
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppClangFormat/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/EditorConfig/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXPRESSION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_FOR_STMT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_TERNARY/@EntryValue" value="ALIGN_ALL" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_CLASS_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_USER_LINEBREAKS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_COMMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INT_ALIGN_EQ/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_BLOCK_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_SEMICOLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_SEMICOLON/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_UNARY_OPERATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_ARRAY_ACCESS_BRACKETS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_METHOD_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPECIAL_ELSE_IF_TREATMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_BINARY_OPSIGN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_TERNARY_OPSIGNS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="NEXT_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="NEXT_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="NEXT_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DECLARATION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_INDENTATION/@EntryValue" value="All" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_ARGUMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_PARAMETER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_ARGUMENT/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_PARAMETER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_DECLARATIONS/@EntryValue" value="0" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_ACCESS_SPECIFIERS_FROM_CLASS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CLASS_MEMBERS_FROM_ACCESS_SPECIFIERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/LINE_BREAK_AFTER_COLON_IN_MEMBER_INITIALIZER_LISTS/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/MEMBER_INITIALIZER_LIST_STYLE/@EntryValue" value="ON_SINGLE_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_NAMESPACE_DEFINITIONS_ON_SAME_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_NESTED_DECLARATOR/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_ABSTRACT_DECL/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_ABSTRACT_DECL/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BETWEEN_CLOSING_ANGLE_BRACKETS_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_DECLARATION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_BLOCKS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_ARGUMENTS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_PARAMETERS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BREAK_TEMPLATE_DECLARATION/@EntryValue" value="LINE_BREAK" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="NEXT_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/FREE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="NEXT_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INITIALIZER_BRACES/@EntryValue" value="END_OF_LINE_NO_SPACE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_STYLE/@EntryValue" value="Space" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Double" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
|
||||||
|
<option name="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue" value="true" type="bool" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.25)
|
cmake_minimum_required(VERSION 3.25)
|
||||||
project(graphs VERSION 0.0.26)
|
project(graphs VERSION 0.0.27)
|
||||||
|
|
||||||
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)
|
||||||
|
|
|
||||||
109
src/main.cpp
109
src/main.cpp
|
|
@ -27,6 +27,7 @@
|
||||||
#include <blt/std/ranges.h>
|
#include <blt/std/ranges.h>
|
||||||
#include <blt/std/time.h>
|
#include <blt/std/time.h>
|
||||||
#include <blt/math/log_util.h>
|
#include <blt/math/log_util.h>
|
||||||
|
#include <blt/gfx/input.h>
|
||||||
|
|
||||||
#include <graph_base.h>
|
#include <graph_base.h>
|
||||||
#include <force_algorithms.h>
|
#include <force_algorithms.h>
|
||||||
|
|
@ -49,8 +50,9 @@ struct bounding_box
|
||||||
int max_x = 0;
|
int max_x = 0;
|
||||||
int max_y = 0;
|
int max_y = 0;
|
||||||
|
|
||||||
bounding_box(int min_x, int min_y, int max_x, int max_y): min_x(min_x), min_y(min_y), max_x(max_x), max_y(max_y)
|
bounding_box(const int min_x, const int min_y, const int max_x, const int max_y): min_x(min_x), min_y(min_y), max_x(max_x), max_y(max_y)
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
|
|
||||||
bool is_screen = true;
|
bool is_screen = true;
|
||||||
};
|
};
|
||||||
|
|
@ -60,7 +62,7 @@ class graph_t
|
||||||
private:
|
private:
|
||||||
std::vector<node> nodes;
|
std::vector<node> nodes;
|
||||||
blt::hashset_t<edge, edge_hash> edges;
|
blt::hashset_t<edge, edge_hash> edges;
|
||||||
blt::hashmap_t<blt::u64, blt::hashset_t<blt::u64>> connected_nodes;
|
blt::hashmap_t<blt::u64, blt::hashset_t<blt::u64> > connected_nodes;
|
||||||
bool sim = false;
|
bool sim = false;
|
||||||
bool run_infinitely = true;
|
bool run_infinitely = true;
|
||||||
float sim_speed = 1;
|
float sim_speed = 1;
|
||||||
|
|
@ -73,8 +75,8 @@ class graph_t
|
||||||
|
|
||||||
blt::i32 current_node = -1;
|
blt::i32 current_node = -1;
|
||||||
|
|
||||||
void create_random_graph(bounding_box bb, blt::size_t min_nodes, blt::size_t max_nodes, blt::f64 connectivity, blt::f64 scaling_connectivity,
|
void create_random_graph(bounding_box bb, const blt::size_t min_nodes, const blt::size_t max_nodes, const blt::f64 connectivity,
|
||||||
blt::f64 distance_factor)
|
const blt::f64 scaling_connectivity, const blt::f64 distance_factor)
|
||||||
{
|
{
|
||||||
// don't allow points too close to the edges of the window.
|
// don't allow points too close to the edges of the window.
|
||||||
if (bb.is_screen)
|
if (bb.is_screen)
|
||||||
|
|
@ -90,7 +92,7 @@ class graph_t
|
||||||
std::uniform_real_distribution pos_x_dist(static_cast<blt::f32>(bb.min_x), static_cast<blt::f32>(bb.max_x));
|
std::uniform_real_distribution pos_x_dist(static_cast<blt::f32>(bb.min_x), static_cast<blt::f32>(bb.max_x));
|
||||||
std::uniform_real_distribution pos_y_dist(static_cast<blt::f32>(bb.min_y), static_cast<blt::f32>(bb.max_y));
|
std::uniform_real_distribution pos_y_dist(static_cast<blt::f32>(bb.min_y), static_cast<blt::f32>(bb.max_y));
|
||||||
|
|
||||||
auto node_count = node_count_dist(dev);
|
const auto node_count = node_count_dist(dev);
|
||||||
|
|
||||||
for (blt::size_t i = 0; i < node_count; i++)
|
for (blt::size_t i = 0; i < node_count; i++)
|
||||||
{
|
{
|
||||||
|
|
@ -103,11 +105,10 @@ class graph_t
|
||||||
for (const auto& node : nodes)
|
for (const auto& node : nodes)
|
||||||
{
|
{
|
||||||
const auto& rp = node.getRenderObj().pos;
|
const auto& rp = node.getRenderObj().pos;
|
||||||
float dx = rp.x() - x;
|
const float dx = rp.x() - x;
|
||||||
float dy = rp.y() - y;
|
const float dy = rp.y() - y;
|
||||||
float dist = std::sqrt(dx * dx + dy * dy);
|
|
||||||
|
|
||||||
if (dist <= POINT_SIZE)
|
if (const float dist = std::sqrt(dx * dx + dy * dy); dist <= POINT_SIZE)
|
||||||
{
|
{
|
||||||
can_break = false;
|
can_break = false;
|
||||||
break;
|
break;
|
||||||
|
|
@ -119,23 +120,22 @@ class graph_t
|
||||||
nodes.push_back(node({x, y, POINT_SIZE}));
|
nodes.push_back(node({x, y, POINT_SIZE}));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto& node1 : blt::enumerate(nodes))
|
for (const auto& [index1, node1] : blt::enumerate(nodes))
|
||||||
{
|
{
|
||||||
for (const auto& node2 : blt::enumerate(nodes))
|
for (const auto& [index2, node2] : blt::enumerate(nodes))
|
||||||
{
|
{
|
||||||
if (node1.first == node2.first)
|
if (index1 == index2)
|
||||||
continue;
|
continue;
|
||||||
auto diff = node2.second.getPosition() - node1.second.getPosition();
|
const auto diff = node2.getPosition() - node1.getPosition();
|
||||||
auto diff_sq = (diff * diff);
|
const auto diff_sq = (diff * diff);
|
||||||
auto dist = distance_factor / static_cast<float>(std::sqrt(diff_sq.x() + diff_sq.y()));
|
const auto dist = distance_factor / static_cast<float>(std::sqrt(diff_sq.x() + diff_sq.y()));
|
||||||
double dexp;
|
double dexp;
|
||||||
if (dist == 0)
|
if (dist == 0)
|
||||||
dexp = 0;
|
dexp = 0;
|
||||||
else
|
else
|
||||||
dexp = 1 / (std::exp(dist) - dist);
|
dexp = 1 / (std::exp(dist) - dist);
|
||||||
auto rand = chance(dev);
|
if (const auto rand = chance(dev); rand <= connectivity && rand >= dexp * scaling_connectivity)
|
||||||
if (rand <= connectivity && rand >= dexp * scaling_connectivity)
|
connect(index1, index2);
|
||||||
connect(node1.first, node2.first);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -162,14 +162,14 @@ class graph_t
|
||||||
public:
|
public:
|
||||||
graph_t() = default;
|
graph_t() = default;
|
||||||
|
|
||||||
void make_new(const bounding_box& bb, blt::size_t min_nodes, blt::size_t max_nodes, blt::f64 connectivity)
|
void make_new(const bounding_box& bb, const blt::size_t min_nodes, const blt::size_t max_nodes, const blt::f64 connectivity)
|
||||||
{
|
{
|
||||||
create_random_graph(bb, min_nodes, max_nodes, connectivity, 0, 25);
|
create_random_graph(bb, min_nodes, max_nodes, connectivity, 0, 25);
|
||||||
use_Eades();
|
use_Eades();
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset(const bounding_box& bb, blt::size_t min_nodes, blt::size_t max_nodes, blt::f64 connectivity, blt::f64 scaling_connectivity,
|
void reset(const bounding_box& bb, const blt::size_t min_nodes, const blt::size_t max_nodes, const blt::f64 connectivity,
|
||||||
blt::f64 distance_factor)
|
const blt::f64 scaling_connectivity, const blt::f64 distance_factor)
|
||||||
{
|
{
|
||||||
sim = false;
|
sim = false;
|
||||||
current_iterations = 0;
|
current_iterations = 0;
|
||||||
|
|
@ -180,7 +180,7 @@ class graph_t
|
||||||
create_random_graph(bb, min_nodes, max_nodes, connectivity, scaling_connectivity, distance_factor);
|
create_random_graph(bb, min_nodes, max_nodes, connectivity, scaling_connectivity, distance_factor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void connect(blt::u64 n1, blt::u64 n2)
|
void connect(const blt::u64 n1, const blt::u64 n2)
|
||||||
{
|
{
|
||||||
edges.insert(edge{n1, n2});
|
edges.insert(edge{n1, n2});
|
||||||
connected_nodes[n1].insert(n2);
|
connected_nodes[n1].insert(n2);
|
||||||
|
|
@ -192,7 +192,7 @@ class graph_t
|
||||||
return edges.contains({e1, e2});
|
return edges.contains({e1, e2});
|
||||||
}
|
}
|
||||||
|
|
||||||
void render(double frame_time)
|
void render(const double frame_time)
|
||||||
{
|
{
|
||||||
if (sim && (current_iterations < max_iterations || run_infinitely) && max_force_last > threshold)
|
if (sim && (current_iterations < max_iterations || run_infinitely) && max_force_last > threshold)
|
||||||
{
|
{
|
||||||
|
|
@ -217,7 +217,7 @@ class graph_t
|
||||||
// update positions
|
// update positions
|
||||||
for (auto& v : nodes)
|
for (auto& v : nodes)
|
||||||
{
|
{
|
||||||
float sim_factor = static_cast<float>(frame_time * sim_speed) * 0.05f;
|
const float sim_factor = static_cast<float>(frame_time * sim_speed) * 0.05f;
|
||||||
v.getPositionRef() += v.getVelocityRef() * equation->cooling_factor(current_iterations) * sim_factor;
|
v.getPositionRef() += v.getVelocityRef() * equation->cooling_factor(current_iterations) * sim_factor;
|
||||||
max_force_last = std::max(max_force_last, v.getVelocityRef().magnitude());
|
max_force_last = std::max(max_force_last, v.getVelocityRef().magnitude());
|
||||||
}
|
}
|
||||||
|
|
@ -246,32 +246,27 @@ class graph_t
|
||||||
current_node = -1;
|
current_node = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void process_mouse_drag(blt::i32 width, blt::i32 height)
|
void process_mouse_drag(const blt::i32 width, const blt::i32 height)
|
||||||
{
|
{
|
||||||
auto mouse_pos = blt::make_vec2(blt::gfx::calculateRay2D(width, height, global_matrices.getScale2D(), global_matrices.getView2D(),
|
const auto mouse_pos = blt::make_vec2(blt::gfx::calculateRay2D(width, height, global_matrices.getScale2D(), global_matrices.getView2D(),
|
||||||
global_matrices.getOrtho()));
|
global_matrices.getOrtho()));
|
||||||
|
|
||||||
if (current_node < 0)
|
if (current_node < 0)
|
||||||
{
|
{
|
||||||
|
for (const auto& [index, node] : blt::enumerate(nodes))
|
||||||
for (const auto& n : blt::enumerate(nodes))
|
|
||||||
{
|
{
|
||||||
auto pos = n.second.getPosition();
|
const auto pos = node.getPosition();
|
||||||
|
const auto dist = pos - mouse_pos;
|
||||||
|
|
||||||
auto dist = pos - mouse_pos;
|
if (const auto mag = dist.magnitude(); mag < POINT_SIZE)
|
||||||
auto mag = dist.magnitude();
|
|
||||||
|
|
||||||
if (mag < POINT_SIZE)
|
|
||||||
{
|
{
|
||||||
current_node = static_cast<blt::i32>(n.first);
|
current_node = static_cast<blt::i32>(index);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
{
|
|
||||||
nodes[current_node].getPositionRef() = mouse_pos;
|
nodes[current_node].getPositionRef() = mouse_pos;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void use_Eades()
|
void use_Eades()
|
||||||
{
|
{
|
||||||
|
|
@ -293,17 +288,17 @@ class graph_t
|
||||||
sim = false;
|
sim = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string getSimulatorName()
|
[[nodiscard]] std::string getSimulatorName() const
|
||||||
{
|
{
|
||||||
return equation->name();
|
return equation->name();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto* getSimulator()
|
[[nodiscard]] auto* getSimulator() const
|
||||||
{
|
{
|
||||||
return equation.get();
|
return equation.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto getCoolingFactor()
|
[[nodiscard]] auto getCoolingFactor() const
|
||||||
{
|
{
|
||||||
return equation->cooling_factor(current_iterations);
|
return equation->cooling_factor(current_iterations);
|
||||||
}
|
}
|
||||||
|
|
@ -313,22 +308,22 @@ class graph_t
|
||||||
current_iterations = 0;
|
current_iterations = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool& getIterControl()
|
[[nodiscard]] bool& getIterControl()
|
||||||
{
|
{
|
||||||
return run_infinitely;
|
return run_infinitely;
|
||||||
}
|
}
|
||||||
|
|
||||||
float& getSimSpeed()
|
[[nodiscard]] float& getSimSpeed()
|
||||||
{
|
{
|
||||||
return sim_speed;
|
return sim_speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
float& getThreshold()
|
[[nodiscard]] float& getThreshold()
|
||||||
{
|
{
|
||||||
return threshold;
|
return threshold;
|
||||||
}
|
}
|
||||||
|
|
||||||
int& getMaxIterations()
|
[[nodiscard]] int& getMaxIterations()
|
||||||
{
|
{
|
||||||
return max_iterations;
|
return max_iterations;
|
||||||
}
|
}
|
||||||
|
|
@ -343,13 +338,8 @@ class engine_t
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
graph_t graph;
|
graph_t graph;
|
||||||
public:
|
|
||||||
void init(const blt::gfx::window_data& data)
|
|
||||||
{
|
|
||||||
graph.make_new({0, 0, data.width, data.height}, 5, 25, 0.2);
|
|
||||||
}
|
|
||||||
|
|
||||||
void render(const blt::gfx::window_data& data, double ft)
|
void draw_gui(const blt::gfx::window_data& data, const double ft)
|
||||||
{
|
{
|
||||||
if (im::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
|
if (im::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
|
||||||
{
|
{
|
||||||
|
|
@ -425,7 +415,7 @@ class engine_t
|
||||||
if (im::Button("Reset Iterations"))
|
if (im::Button("Reset Iterations"))
|
||||||
graph.reset_iterations();
|
graph.reset_iterations();
|
||||||
im::Text("Select a system:");
|
im::Text("Select a system:");
|
||||||
auto current_sim = graph.getSimulatorName();
|
const auto current_sim = graph.getSimulatorName();
|
||||||
const char* items[] = {"Eades", "Fruchterman & Reingold"};
|
const char* items[] = {"Eades", "Fruchterman & Reingold"};
|
||||||
static int item_current = 0;
|
static int item_current = 0;
|
||||||
ImGui::ListBox("##SillyBox", &item_current, items, 2, 2);
|
ImGui::ListBox("##SillyBox", &item_current, items, 2, 2);
|
||||||
|
|
@ -450,6 +440,17 @@ class engine_t
|
||||||
}
|
}
|
||||||
im::End();
|
im::End();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
void init(const blt::gfx::window_data& data)
|
||||||
|
{
|
||||||
|
graph.make_new({0, 0, data.width, data.height}, 5, 25, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
void render(const blt::gfx::window_data& data, const double ft)
|
||||||
|
{
|
||||||
|
draw_gui(data, ft);
|
||||||
|
|
||||||
auto& io = ImGui::GetIO();
|
auto& io = ImGui::GetIO();
|
||||||
|
|
||||||
|
|
@ -458,6 +459,8 @@ class engine_t
|
||||||
else
|
else
|
||||||
graph.reset_mouse_drag();
|
graph.reset_mouse_drag();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
graph.render(ft);
|
graph.render(ft);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -497,8 +500,8 @@ void update(const blt::gfx::window_data& data)
|
||||||
|
|
||||||
renderer_2d.render();
|
renderer_2d.render();
|
||||||
|
|
||||||
auto currentTime = blt::system::nanoTime();
|
const auto currentTime = blt::system::nanoTime();
|
||||||
auto diff = currentTime - lastTime;
|
const auto diff = currentTime - lastTime;
|
||||||
lastTime = currentTime;
|
lastTime = currentTime;
|
||||||
ft = static_cast<double>(diff) / 1000000000.0;
|
ft = static_cast<double>(diff) / 1000000000.0;
|
||||||
fps = 1 / ft;
|
fps = 1 / ft;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue