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

Cut down a few of the compiler warnings, refactored the octree into its own file. Refactored all map items into their own subfolder

Browse Source
This commit is contained in:
MitchellHansen
2017-03-22 23:51:46 -07:00
parent 2ad7383406
commit 7c534500f6
15 changed files with 537 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cpp
View File

@@ -28,7 +28,7 @@
#include <chrono>
#include <SFML/Graphics.hpp>
#include <SFML/Network.hpp>
#include "Old_Map.h"
#include "map/Old_Map.h"
#include "raycaster/RayCaster.h"
#include "raycaster/Hardware_Caster.h"
#include "Vector4.hpp"
@@ -40,7 +40,6 @@
#include "imgui/imgui-SFML.h"
#include "imgui/imgui.h"
const int WINDOW_X = 1440;
const int WINDOW_Y = 900;
const int WORK_SIZE = WINDOW_X * WINDOW_Y;
@@ -94,7 +93,7 @@ int main() {
// ni.stop_listening_for_clients();
// =============================
Map _map(sf::Vector3i(0, 0, 0));
Map _map(32);
_map.generate_octree();
_map.a.print_block(0);
_map.test_map();
@@ -278,8 +277,8 @@ int main() {
handle->set_position(light);
}
light_pos[0] = sin(elapsed_time) * 100.0f + 300.0f;
light_pos[1] = sin(elapsed_time) * 100.0f + 300.0f;
light_pos[0] = static_cast<float>(sin(elapsed_time) * 100.0f + 300.0f);
light_pos[1] = static_cast<float>(sin(elapsed_time) * 100.0f + 300.0f);
sf::Vector3f light(light_pos[0], light_pos[1], light_pos[2]);
handle->set_position(light);