From bb0852cc0e5c2ee5b8ca12793fc7b53fc1a297fa Mon Sep 17 00:00:00 2001
From: MitchellHansen <mitchellhansen4@gmail.com>
Date: Tue, 13 Dec 2016 15:29:28 -0800
Subject: [PATCH] various tweaking and figuring on the octree. The weird hybrid
 dfs bfs thing they have going will be annoying to do in one pass. Might defer
 it out to two passes. First building the octree, second culling and passing
 the octree to the gpu

---
 src/Map.cpp  | 21 ++++++++++++---------
 src/main.cpp |  2 --
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Map.cpp b/src/Map.cpp
index f649abc..9d597c4 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -55,7 +55,7 @@ Map::Map(sf::Vector3i position) {
 	
 	load_unload(position);
 
-	for (int i = 0; i < 8192; i++) {
+	for (int i = 0; i < 1024; i++) {
 		block[i] = 0;
 	}
 }
@@ -130,25 +130,27 @@ int64_t Map::generate_children(sf::Vector3i pos, int dim) {
 
 	std::vector<int64_t> cps;
 	int64_t tmp = 0;
+	int64_t ret_pos = stack_position;
 
 	if (dim == 1) {
 
+		// These don't bound check, should they?
 		if (getVoxel(t1))
 			SetBit(16, &tmp);
 		if (getVoxel(t2))
-			SetBit(16, &tmp);
+			SetBit(17, &tmp);
 		if (getVoxel(t3))
-			SetBit(16, &tmp);
+			SetBit(18, &tmp);
 		if (getVoxel(t4))
-			SetBit(16, &tmp);
+			SetBit(19, &tmp);
 		if (getVoxel(t5))
-			SetBit(16, &tmp);
+			SetBit(20, &tmp);
 		if (getVoxel(t6))
-			SetBit(16, &tmp);
+			SetBit(21, &tmp);
 		if (getVoxel(t7))
-			SetBit(16, &tmp);
+			SetBit(22, &tmp);
 		if (getVoxel(t8))
-			SetBit(16, &tmp);
+			SetBit(23, &tmp);
 
 		cps.push_back(tmp);
 
@@ -159,7 +161,6 @@ int64_t Map::generate_children(sf::Vector3i pos, int dim) {
 		int curr_stack_pos = stack_position;
 
 
-
 		tmp = generate_children(t1, dim / 2);
 		if (tmp != 0)
 			cps.push_back(tmp);
@@ -208,6 +209,8 @@ void Map::generate_octree() {
 		arr[i] = 0;
 	}
 
+	generate_children(sf::Vector3i(0, 0, 0), 64);
+
 	int* dataset = new int[32 * 32 * 32];
 	for (int i = 0; i < 32 * 32 * 32; i++) {
 		dataset[0] = rand() % 2;
diff --git a/src/main.cpp b/src/main.cpp
index 7d15bd8..3fc5852 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,4 @@
 #include "GL_Testing.h"
-#include <vulkan/vulkan.h>
-#include <vulkan/vk_sdk_platform.h>
 #ifdef linux
 #include <CL/cl.h>
 #include <CL/opencl.h>