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

begin work on a new stage for this project! starting with tokenizer.

main
Brett 2024-07-26 22:08:00 -04:00
parent 4f4e5326ee
commit 5dbf56d65b
10 changed files with 226 additions and 143 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)
project(graphs VERSION 0.0.49)
project(graphs VERSION 0.1.0)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)

41
include/config.h Normal file
View File

@ -0,0 +1,41 @@
#pragma once
/*
* Copyright (C) 2024 Brett Terpstra
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef GRAPHS_CONFIG_H
#define GRAPHS_CONFIG_H
#include <blt/std/types.h>
#include <blt/math/vectors.h>
namespace conf
{
inline constexpr float DEFAULT_COOLING_FACTOR = 0.999999f;
inline constexpr float DEFAULT_MIN_COOLING = 40;
inline constexpr float DEFAULT_SPRING_LENGTH = 175.0;
inline constexpr float DEFAULT_INITIAL_TEMPERATURE = 100;
inline constexpr auto DEFAULT_IMAGE = "parker_point";
inline constexpr auto POINT_OUTLINE_COLOR = blt::make_color(0, 0.6, 0.6);
inline constexpr auto POINT_HIGHLIGHT_COLOR = blt::make_color(0, 1.0, 1.0);
inline constexpr auto POINT_SELECT_COLOR = blt::make_color(0, 0.9, 0.7);
inline constexpr auto EDGE_COLOR = blt::make_color(0, 0.8, 0);
inline constexpr auto EDGE_OUTLINE_COLOR = blt::make_color(0, 1, 0);
}
#endif //GRAPHS_CONFIG_H

15
include/force_algorithms.h
View File

@ -24,16 +24,16 @@
#include <blt/math/vectors.h>
#include <imgui.h>
#include <graph_base.h>
#include <config.h>
class force_equation
{
public:
using node_pair = const std::pair<blt::size_t, node>&;
protected:
float cooling_rate = 0.999999;
float min_cooling = 40;
float ideal_spring_length = 175.0;
float initial_temperature = 100;
float cooling_rate = conf::DEFAULT_COOLING_FACTOR;
float min_cooling = conf::DEFAULT_MIN_COOLING;
float initial_temperature = conf::DEFAULT_INITIAL_TEMPERATURE;
struct equation_data
{
@ -53,7 +53,7 @@ class force_equation
public:
[[nodiscard]] virtual blt::vec2 attr(node_pair v1, node_pair v2) const = 0;
[[nodiscard]] virtual blt::vec2 attr(node_pair v1, node_pair v2, const edge& edge) const = 0;
[[nodiscard]] virtual blt::vec2 rep(node_pair v1, node_pair v2) const = 0;
@ -75,10 +75,9 @@ class force_equation
class Eades_equation : public force_equation
{
protected:
float repulsive_constant = 24.0;
float spring_constant = 12.0;
public:
[[nodiscard]] blt::vec2 attr(node_pair v1, node_pair v2) const final;
[[nodiscard]] blt::vec2 attr(node_pair v1, node_pair v2, const edge& edge) const final;
[[nodiscard]] blt::vec2 rep(node_pair v1, node_pair v2) const final;
@ -93,7 +92,7 @@ class Eades_equation : public force_equation
class Fruchterman_Reingold_equation : public force_equation
{
public:
[[nodiscard]] blt::vec2 attr(node_pair v1, node_pair v2) const final;
[[nodiscard]] blt::vec2 attr(node_pair v1, node_pair v2, const edge& edge) const final;
[[nodiscard]] blt::vec2 rep(node_pair v1, node_pair v2) const final;

12
include/graph.h
View File

@ -19,10 +19,12 @@
#ifndef GRAPHS_GRAPH_H
#define GRAPHS_GRAPH_H
#include <config.h>
#include <graph_base.h>
#include <force_algorithms.h>
#include <blt/gfx/window.h>
#include <blt/math/interpolation.h>
#include <blt/std/utility.h>
namespace im = ImGui;
@ -99,9 +101,12 @@ class graph_t
connected_nodes[n2].insert(n1);
}
[[nodiscard]] bool connected(blt::u64 e1, blt::u64 e2) const
[[nodiscard]] std::optional<blt::ref<const edge>> connected(blt::u64 n1, blt::u64 n2) const
{
return edges.contains({e1, e2});
auto itr = edges.find(edge{n1, n2});
if (itr == edges.end())
return {};
return *itr;
}
void render();
@ -110,7 +115,7 @@ class graph_t
{
if (selected_node != -1)
{
nodes[selected_node].setOutlineColor(color::POINT_OUTLINE_COLOR);
nodes[selected_node].outline_color = conf::POINT_OUTLINE_COLOR;
easing.reset();
}
selected_node = -1;
@ -215,7 +220,6 @@ class engine_t
graph.process_mouse_drag(data.width, data.height);
}
graph.render();
}
};

84
include/graph_base.h
View File

@ -22,17 +22,16 @@
#include <blt/gfx/renderer/batch_2d_renderer.h>
#include <blt/std/types.h>
#include <blt/std/assert.h>
#include <color_constants.h>
#include <config.h>
class node
struct node
{
private:
float repulsiveness = 24.0f;
blt::gfx::point2d_t point;
float outline_scale = 1.25f;
blt::vec2 velocity;
blt::color4 outline_color = color::POINT_OUTLINE_COLOR;
public:
blt::color4 outline_color = conf::POINT_OUTLINE_COLOR;
explicit node(const blt::gfx::point2d_t& point): point(point)
{}
@ -55,38 +54,17 @@ class node
{
return point;
}
[[nodiscard]] float getOutlineScale() const
{
return outline_scale;
}
void setOutlineScale(float outlineScale)
{
outline_scale = outlineScale;
}
[[nodiscard]] const blt::color4& getOutlineColor() const
{
return outline_color;
}
void setOutlineColor(const blt::color4& c)
{
outline_color = c;
}
};
class edge
struct edge
{
private:
blt::u64 i1, i2;
float ideal_spring_length = conf::DEFAULT_SPRING_LENGTH;
float outline_scale = 2.0f;
float thickness = 2.0f;
blt::color4 color = color::EDGE_COLOR;
blt::color4 outline_color = color::EDGE_OUTLINE_COLOR;
public:
blt::color4 color = conf::EDGE_COLOR;
blt::color4 outline_color = conf::EDGE_OUTLINE_COLOR;
edge(blt::u64 i1, blt::u64 i2): i1(i1), i2(i2)
{
BLT_ASSERT(i1 != i2 && "Indices cannot be equal!");
@ -107,45 +85,9 @@ class edge
return i2;
}
[[nodiscard]] float getOutlineScale() const
{
return outline_scale;
}
void setOutlineScale(float outlineScale)
{
outline_scale = outlineScale;
}
[[nodiscard]] const blt::color4& getColor() const
{
return color;
}
void setColor(const blt::color4& c)
{
color = c;
}
[[nodiscard]] const blt::color4& getOutlineColor() const
{
return outline_color;
}
void setOutlineColor(const blt::color4& outlineColor)
{
outline_color = outlineColor;
}
[[nodiscard]] float getThickness() const
{
return thickness;
}
void setThickness(float t)
{
thickness = t;
}
private:
// we are trying to maintain this as an invariant.
blt::u64 i1, i2;
};
struct edge_hash

103
include/tokenizer.h Normal file
View File

@ -0,0 +1,103 @@
#pragma once
/*
* Copyright (C) 2024 Brett Terpstra
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef GRAPHS_TOKENIZER_H
#define GRAPHS_TOKENIZER_H
#include <graph_base.h>
#include <vector>
namespace proc
{
enum class token_e
{
SQUARE_OPEN, // [
SQUARE_CLOSE, // ]
CURLY_OPEN, // {
CURLY_CLOSE, // }
DOUBLE_QUOTE, // "
SINGLE_QUOTE, // '
SEMI, // ;
COLON, // :
COMMENT, // # or //
BLOCK_BEGIN, // /* or /**
BLOCK_CLOSE, // */
STAR, // *
TEXT, // any text inside quotes
IDENT, // identifier
VALUE, // numeric value
EQUAL, // =
COMMA, // ,
NEWLINE, // \n
};
struct token_t
{
// the type of this token
token_e token;
// position inside file
blt::size_t token_pos;
// all data associated with token. will contain all text if text or the token characters otherwise
std::string_view token_data;
};
/*
* Example format:
*
* // this is a comment!
* [[Textures]]
* parker.png
* silly.jpg; multiline.gif
* boi.bmp
*
* # so is this!
* [[Nodes]]
* jim: texture=parker.png, location=[0.0f, 10.0f];
* parker: texture=parker.png
* brett
*
* // can't make the other kind but imagine it works
* [[Edges]]
* jim, parker; brett, parker
* brett, jim
*
* [[Descriptions]]
* brett: me silly
* parker: boyfriend <3
* jim: parker's friend
*/
class tokenizer
{
public:
explicit tokenizer(std::string_view str): data(str)
{}
explicit tokenizer(std::string&& str): data(std::move(str))
{}
const std::vector<token_t>& tokenize();
private:
std::string data;
blt::size_t current_pos = 0;
std::vector<token_t> tokens;
};
}
#endif //GRAPHS_TOKENIZER_H

2
lib/BLT-With-Graphics-Template

@ -1 +1 @@
Subproject commit c9475afb2a37ce4126b5519b456f6e3ea4f9f978
Subproject commit bd9db118274d5c0db22ec8e1237f3f3db5bbab8f

24
src/force_algorithms.cpp
View File

@ -15,6 +15,15 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <force_algorithms.h>
#include <blt/std/utility.h>
/**
* Function for mixing between two points
*/
BLT_ATTRIB_NO_SIDE_EFFECTS inline float mix(const float v1, const float v2)
{
return (v1 + v2) / 2.0f;
}
/**
* --------------------------------------------------------
@ -37,9 +46,6 @@ force_equation::equation_data force_equation::calc_data(const std::pair<blt::siz
void force_equation::draw_inputs_base()
{
namespace im = ImGui;
im::InputFloat("Ideal Spring Length", &ideal_spring_length, 2.5, 10);
if (ideal_spring_length < 1)
ideal_spring_length = 1;
im::SliderFloat("Initial Temperature", &initial_temperature, 1, 100);
im::SliderFloat("Cooling Rate", &cooling_rate, 0, 0.999999, "%.6f");
im::InputFloat("Min Cooling", &min_cooling, 0.5, 1);
@ -51,24 +57,23 @@ void force_equation::draw_inputs_base()
* --------------------------------------------------------
*/
blt::vec2 Eades_equation::attr(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2) const
blt::vec2 Eades_equation::attr(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2, const edge& edge) const
{
auto data = calc_data(v1, v2);
return (spring_constant * std::log(data.mag / ideal_spring_length) * data.unit) - rep(v1, v2);
return (spring_constant * std::log(data.mag / edge.ideal_spring_length) * data.unit) - rep(v1, v2);
}
blt::vec2 Eades_equation::rep(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2) const
{
auto data = calc_data(v1, v2);
// scaling factor included because of the scales this algorithm is working on (large viewport)
auto scale = (repulsive_constant * 10000) / data.mag_sq;
auto scale = (mix(v1.second.repulsiveness, v2.second.repulsiveness) * 10000) / data.mag_sq;
return scale * data.unit_inv;
}
void Eades_equation::draw_inputs()
{
namespace im = ImGui;
im::InputFloat("Repulsive Constant", &repulsive_constant, 0.25, 10);
im::InputFloat("Spring Constant", &spring_constant, 0.25, 10);
}
@ -78,16 +83,17 @@ void Eades_equation::draw_inputs()
* --------------------------------------------------------
*/
blt::vec2 Fruchterman_Reingold_equation::attr(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2) const
blt::vec2 Fruchterman_Reingold_equation::attr(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2, const edge& edge) const
{
auto data = calc_data(v1, v2);
float scale = data.mag_sq / ideal_spring_length;
float scale = data.mag_sq / edge.ideal_spring_length;
return (scale * data.unit);
}
blt::vec2 Fruchterman_Reingold_equation::rep(const std::pair<blt::size_t, node>& v1, const std::pair<blt::size_t, node>& v2) const
{
auto data = calc_data(v1, v2);
const auto ideal_spring_length = conf::DEFAULT_SPRING_LENGTH;
float scale = (ideal_spring_length * ideal_spring_length) / data.mag;
return scale * data.unit_inv;
}

15
src/graph.cpp
View File

@ -21,7 +21,6 @@
#include <blt/gfx/raycast.h>
#include <blt/std/ranges.h>
#include <blt/math/interpolation.h>
#include <color_constants.h>
extern blt::gfx::batch_renderer_2d renderer_2d;
extern blt::gfx::matrix_state_manager global_matrices;
@ -44,8 +43,8 @@ void graph_t::render()
{
if (v1.first == v2.first)
continue;
if (connected(v1.first, v2.first))
attractive += equation->attr(v1, v2);
if (auto edge = connected(v1.first, v2.first))
attractive += equation->attr(v1, v2, edge->get());
repulsive += equation->rep(v1, v2);
}
v1.second.getVelocityRef() = attractive + repulsive;
@ -63,7 +62,7 @@ void graph_t::render()
}
for (const auto& point : nodes)
renderer_2d.drawPointInternal(blt::gfx::render_info_t::make_info("parker_point", point.getOutlineColor(), point.getOutlineScale()),
renderer_2d.drawPointInternal(blt::gfx::render_info_t::make_info(conf::DEFAULT_IMAGE),
point.getRenderObj(), 15.0f);
for (const auto& edge : edges)
{
@ -74,8 +73,8 @@ void graph_t::render()
{
auto n1 = nodes[edge.getFirst()];
auto n2 = nodes[edge.getSecond()];
auto draw_info = blt::gfx::render_info_t::make_info(edge.getColor(), edge.getOutlineColor(), edge.getOutlineScale());
renderer_2d.drawLine(draw_info, 5.0f, n1.getRenderObj().pos, n2.getRenderObj().pos, edge.getThickness());
auto draw_info = blt::gfx::render_info_t::make_info(edge.color);
renderer_2d.drawLine(draw_info, 5.0f, n1.getRenderObj().pos, n2.getRenderObj().pos, edge.thickness);
}
}
}
@ -105,7 +104,7 @@ void graph_t::process_mouse_drag(const blt::i32 width, const blt::i32 height)
if (new_selection != selected_node)
{
if (selected_node != -1)
nodes[selected_node].setOutlineColor(color::POINT_OUTLINE_COLOR);
nodes[selected_node].outline_color = conf::POINT_OUTLINE_COLOR;
}
if (mouse_pressed && new_selection == -1 && selected_node != -1)
@ -124,7 +123,7 @@ void graph_t::process_mouse_drag(const blt::i32 width, const blt::i32 height)
{
auto& node = nodes[selected_node];
easing.progress(8 * static_cast<float>(blt::gfx::getFrameDeltaSeconds()));
node.setOutlineColor(color::POINT_SELECT_COLOR);
node.outline_color = conf::POINT_SELECT_COLOR;
node.getPositionRef() = mouse_pos;
}
}

17
include/color_constants.h → src/tokenizer.cpp
View File

@ -1,5 +1,5 @@
#pragma once
/*
* <Short Description>
* Copyright (C) 2024 Brett Terpstra
*
* This program is free software: you can redistribute it and/or modify
@ -15,20 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <tokenizer.h>
#ifndef GRAPHS_COLOR_CONSTANTS_H
#define GRAPHS_COLOR_CONSTANTS_H
#include <blt/math/vectors.h>
namespace color
const std::vector<token_t>& proc::tokenizer::tokenize()
{
static inline constexpr blt::color4 POINT_OUTLINE_COLOR = blt::make_color(0, 0.6, 0.6);
static inline constexpr blt::color4 POINT_HIGHLIGHT_COLOR = blt::make_color(0, 1.0, 1.0);
static inline constexpr blt::color4 POINT_SELECT_COLOR = blt::make_color(0, 0.9, 0.7);
static inline constexpr blt::color4 EDGE_COLOR = blt::make_color(0, 0.8, 0);
static inline constexpr blt::color4 EDGE_OUTLINE_COLOR = blt::make_color(0, 1, 0);
}
#endif //GRAPHS_COLOR_CONSTANTS_H