mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed the paths in cmake, fixed two dumb sigabrts on termination

Browse Source
This commit is contained in:
mitchellhansen
2017-12-12 22:23:14 -08:00
parent 7bb1c5100f
commit cc0b078e17
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -14,7 +14,11 @@ if (WIN32)
set(SFML_INCLUDE_DIR ${SFML_ROOT}/include) set(SFML_INCLUDE_DIR ${SFML_ROOT}/include)
endif() endif()
set(OPENGL_LIBRARIES "/opt/amdgpu-pro/lib/x86_64-linux-gnu") # You're probably going to need to change these paths
if (UNIX)
set(OpenCL_INCLUDE_DIR /usr/include/CL)
set(OpenCL_LIBRARY /usr/lib/x86_64-linux-gnu/libOpenCL.so.1)
endif (UNIX)
set(SFML_COMPONENTS graphics window system network audio) set(SFML_COMPONENTS graphics window system network audio)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})

8
src/Application.cpp
View File

@@ -18,8 +18,8 @@ Application::Application() {
Application::~Application() { Application::~Application() {
light_handle->~LightHandle(); //light_handle->~LightHandle();
light_controller->~LightController(); //light_controller->~LightController();
} }
bool Application::init_clcaster() { bool Application::init_clcaster() {
@@ -98,13 +98,15 @@ bool Application::init_events() {
bool Application::game_loop() { bool Application::game_loop() {
while (window->isOpen()) { while (true) {
// Have the input handler empty the event stack, generate events for held keys, and then dispatch the events to listeners // Have the input handler empty the event stack, generate events for held keys, and then dispatch the events to listeners
input_handler.consume_sf_events(window.get()); input_handler.consume_sf_events(window.get());
input_handler.handle_held_keys(); input_handler.handle_held_keys();
input_handler.dispatch_events(); input_handler.dispatch_events();
if (!window->isOpen())
break;
// Time keeping // Time keeping
elapsed_time = elap_time(); elapsed_time = elap_time();
delta_time = elapsed_time - current_time; delta_time = elapsed_time - current_time;

5
src/CLCaster.cpp
View File

@@ -1,7 +1,10 @@
#include "CLCaster.h" #include "CLCaster.h"
CLCaster::CLCaster() {} CLCaster::CLCaster() {}
CLCaster::~CLCaster() {} CLCaster::~CLCaster() {
delete[] viewport_matrix;
delete[] viewport_image;
}
bool CLCaster::init() { bool CLCaster::init() {