From 8a1eb5e43008b72d9160bb536a904f3515e0ca19 Mon Sep 17 00:00:00 2001 From: MitchellHansen Date: Sat, 3 Mar 2018 06:43:52 -0800 Subject: [PATCH] Running on windows, for some reason doesn't crash as well --- include/Camera.h | 2 +- src/Application.cpp | 2 +- src/GraphTimer.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/Camera.h b/include/Camera.h index cc78b06..f8226cc 100644 --- a/include/Camera.h +++ b/include/Camera.h @@ -8,7 +8,7 @@ #include "imgui/imgui.h" #include "imgui/imgui-SFML.h" #include "util.hpp" -#include + /** diff --git a/src/Application.cpp b/src/Application.cpp index e209790..eae5f3a 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -35,7 +35,7 @@ bool Application::init_clcaster() { raycaster->add_to_settings_buffer("octree_dimensions", "OCTDIM", MAP_X); // TODO: ALLOW RVALUES FOR SETTINGS BUFFER - int64_t oct_enabled = 0; + uint64_t oct_enabled = 0; raycaster->add_to_settings_buffer("using_octree", "OCTENABLED", oct_enabled); map = std::make_shared(MAP_X); diff --git a/src/GraphTimer.cpp b/src/GraphTimer.cpp index b61f5ce..cd70546 100644 --- a/src/GraphTimer.cpp +++ b/src/GraphTimer.cpp @@ -26,6 +26,7 @@ unsigned int GraphTimer::create_line(std::string label) { unsigned int GraphTimer::delete_line(unsigned int idx){ fps_vectors.erase(fps_vectors.begin() + idx); + return 1; } void GraphTimer::start(unsigned int idx){