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

bringing up to date

Browse Source
This commit is contained in:
MitchellHansen
2017-06-29 01:52:30 -07:00
parent c7bde50e0d
commit 32e58d516a
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@@ -92,10 +92,10 @@ int main() {
// ============================= // =============================
Map _map(32); Map _map(32);
_map.test(); //_map.test();
_map.dump_logs(); _map.dump_logs();
//std::cin.get(); std::cin.get();
//return 0; return 0;
// ============================= // =============================
sf::RenderWindow window(sf::VideoMode(WINDOW_X, WINDOW_Y), "SFML"); sf::RenderWindow window(sf::VideoMode(WINDOW_X, WINDOW_Y), "SFML");

1
src/map/Map.cpp
View File

@@ -66,6 +66,7 @@ uint64_t Map::generate_children(sf::Vector3i pos, int voxel_scale) {
uint64_t child_descriptor = 0; uint64_t child_descriptor = 0;
std::vector<uint64_t> descriptor_array; std::vector<uint64_t> descriptor_array;
std::vector<uint64_t> index_array;
// Generate down the recursion, returning the descriptor of the current node // Generate down the recursion, returning the descriptor of the current node
for (int i = 0; i < v.size(); i++) { for (int i = 0; i < v.size(); i++) {

21
src/map/Octree.cpp
View File

@@ -13,16 +13,19 @@ Octree::Octree() {
// Copy to stack enables the hybrid depth-breadth first tree by taking // Copy to stack enables the hybrid depth-breadth first tree by taking
// a list of valid non-leaf child descriptors contained under a common parent. // a list of valid non-leaf child descriptors contained under a common parent.
// It takes the list of children, and the current level in the voxel hierarchy.
// It returns the index to the first element of the
uint64_t Octree::copy_to_stack(std::vector<uint64_t> children, unsigned int voxel_scale) { uint64_t Octree::copy_to_stack(std::vector<uint64_t> children, unsigned int voxel_scale) {
//// Check for the 15 bit boundry // Check for the 15 bit boundry
//if (stack_pos - children.size() > stack_pos) { if (stack_pos - children.size() > stack_pos) {
// global_pos = stack_pos; global_pos = stack_pos;
// stack_pos = 0x8000; stack_pos = 0x8000;
//} }
//else { else {
// stack_pos -= children.size(); stack_pos -= children.size();
//} }
// Copy to stack needs to keep track of an "anchor_stack" which will hopefully facilitate // Copy to stack needs to keep track of an "anchor_stack" which will hopefully facilitate
// relative pointer generation for items being copied to the stack // relative pointer generation for items being copied to the stack
@@ -35,7 +38,7 @@ uint64_t Octree::copy_to_stack(std::vector<uint64_t> children, unsigned int voxe
stack_pos -= children.size(); //stack_pos -= children.size();
memcpy(&descriptor_buffer[stack_pos + global_pos], children.data(), children.size() * sizeof(uint64_t)); memcpy(&descriptor_buffer[stack_pos + global_pos], children.data(), children.size() * sizeof(uint64_t));
// Return the bitmask encoding the index of that value // Return the bitmask encoding the index of that value