Running on windows, for some reason doesn't crash as well

master
MitchellHansen 7 years ago
parent 8f6ecae4cb
commit 8a1eb5e430

@ -8,7 +8,7 @@
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "imgui/imgui-SFML.h" #include "imgui/imgui-SFML.h"
#include "util.hpp" #include "util.hpp"
#include <X11/Xlib.h>
/** /**

@ -35,7 +35,7 @@ bool Application::init_clcaster() {
raycaster->add_to_settings_buffer("octree_dimensions", "OCTDIM", MAP_X); raycaster->add_to_settings_buffer("octree_dimensions", "OCTDIM", MAP_X);
// TODO: ALLOW RVALUES FOR SETTINGS BUFFER // 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); raycaster->add_to_settings_buffer("using_octree", "OCTENABLED", oct_enabled);
map = std::make_shared<Map>(MAP_X); map = std::make_shared<Map>(MAP_X);

@ -26,6 +26,7 @@ unsigned int GraphTimer::create_line(std::string label) {
unsigned int GraphTimer::delete_line(unsigned int idx){ unsigned int GraphTimer::delete_line(unsigned int idx){
fps_vectors.erase(fps_vectors.begin() + idx); fps_vectors.erase(fps_vectors.begin() + idx);
return 1;
} }
void GraphTimer::start(unsigned int idx){ void GraphTimer::start(unsigned int idx){

Loading…
Cancel
Save