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

Starting to condense the rendering and switching between the different

Browse Source 
methods
This commit is contained in:
MitchellHansen
2016-10-29 23:55:58 -07:00
parent ef4c001bf2
commit 51093beaca
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Old_map.h
View File

@@ -18,6 +18,7 @@ public:
Old_Map(sf::Vector3i dim); Old_Map(sf::Vector3i dim);
~Old_Map(); ~Old_Map();
void generate_from_data(char* dat, int len);
void generate_terrain(); void generate_terrain();
sf::Vector3i getDimensions(); sf::Vector3i getDimensions();

1
src/Old_map.cpp
View File

@@ -13,6 +13,7 @@ Old_Map::Old_Map(sf::Vector3i dim) {
Old_Map::~Old_Map() { Old_Map::~Old_Map() {
} }
void Old_Map::generate_terrain() { void Old_Map::generate_terrain() {
std::mt19937 gen; std::mt19937 gen;
std::uniform_real_distribution<double> dis(-1.0, 1.0); std::uniform_real_distribution<double> dis(-1.0, 1.0);

8
src/main.cpp
View File

@@ -1,4 +1,4 @@
#ifdef linux #ifdef linux
#include <CL/cl.h> #include <CL/cl.h>
#include <CL/opencl.h> #include <CL/opencl.h>
@@ -129,7 +129,7 @@ int main() {
c.create_buffer("view_matrix_buffer", sizeof(float) * 4 * view_res.x * view_res.y, view_matrix); c.create_buffer("view_matrix_buffer", sizeof(float) * 4 * view_res.x * view_res.y, view_matrix);
Camera camera( Camera camera(
sf::Vector3f(70, 60, 50), sf::Vector3f(0, 0, 0),
sf::Vector2f(0.0f, 1.00f) sf::Vector2f(0.0f, 1.00f)
); );
@@ -211,8 +211,8 @@ int main() {
//RayCaster ray_caster(map, map_dim, view_res); //RayCaster ray_caster(map, map_dim, view_res);
sf::Vector2f *dp = camera.get_direction_pointer(); sf::Vector2f *dp = camera.get_direction_pointer();
debug_text cam_text_x(1, 30, &dp->x, "X: "); debug_text cam_text_x(1, 30, &dp->x, "incli: ");
debug_text cam_text_y(2, 30, &dp->y, "Y: "); debug_text cam_text_y(2, 30, &dp->y, "asmth: ");
sf::Vector3f *mp = camera.get_movement_pointer(); sf::Vector3f *mp = camera.get_movement_pointer();
debug_text cam_text_mov_x(4, 30, &mp->x, "X: "); debug_text cam_text_mov_x(4, 30, &mp->x, "X: ");