diff --git a/CMakeLists.txt b/CMakeLists.txt index 193639a..a7c2375 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(graphs VERSION 0.0.36) +project(graphs VERSION 0.0.37) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) diff --git a/lib/BLT-With-Graphics-Template b/lib/BLT-With-Graphics-Template index e674819..2c85c0f 160000 --- a/lib/BLT-With-Graphics-Template +++ b/lib/BLT-With-Graphics-Template @@ -1 +1 @@ -Subproject commit e67481934450d248478c82dd36f71e799733fe01 +Subproject commit 2c85c0f93c9028ae8db7b19c107af4b2fe4978a6 diff --git a/pull_all.sh b/pull_all.sh new file mode 100755 index 0000000..0bc0ab7 --- /dev/null +++ b/pull_all.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +git pull +cd lib/BLT-With-Graphics-Template +git pull +cd - +cd lib/BLT-With-Graphics-Template/libraries/BLT +git pull +cd - diff --git a/src/force_algorithms.cpp b/src/force_algorithms.cpp index 853de1c..d2f02b7 100644 --- a/src/force_algorithms.cpp +++ b/src/force_algorithms.cpp @@ -38,6 +38,8 @@ 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); diff --git a/src/main.cpp b/src/main.cpp index aeab7d5..cc4ed61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -549,18 +549,18 @@ void process_string(const std::string& str) int main(int, const char**) { - blt::template_engine_t templateEngine; - templateEngine.set("LAYOUT_STRING", "layout (location = ${IF(LAYOUT_LOCATION) { LAYOUT_LOCATION } ELSE { ~DISCARD }}) "); - templateEngine.set("LAYOUT_LOCATION", "1"); - - auto result = templateEngine.evaluate(shader_pp_screen_frag); - - if (result) - BLT_TRACE(result.value()); - else - BLT_TRACE("Function Failed: %d", static_cast(result.error())); - - return 0; +// blt::template_engine_t templateEngine; +// templateEngine.set("LAYOUT_STRING", "layout (location = ${IF(LAYOUT_LOCATION) { LAYOUT_LOCATION } ELSE { ~DISCARD }}) "); +// templateEngine.set("LAYOUT_LOCATION", "1"); +// +// auto result = templateEngine.evaluate(shader_pp_screen_frag); +// +// if (result) +// BLT_TRACE(result.value()); +// else +// BLT_TRACE("Function Failed: %d", static_cast(result.error())); +// +// return 0; blt::gfx::init(blt::gfx::window_data{"Graphing Lovers United", init, update, 1440, 720}.setSyncInterval(1)); global_matrices.cleanup(); resources.cleanup();