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

Turned off experimental phong lighting in the kernel

Browse Source 
fixed all compiler errors thrown by MSVC
Switched experimental octree map back to the old map
Refactored old map system, prettied it up
This commit is contained in:
MitchellHansen
2016-10-29 00:42:49 -07:00
parent 391dc63ec8
commit 561c07c602
11 changed files with 587 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Map.cpp
View File

@@ -27,30 +27,30 @@ struct block {
void Map::generate_octree() {
char* arr[8192];
for (int i = 0; i < 8192; i++) {
arr[i] = 0;
}
char* arr[8192];
for (int i = 0; i < 8192; i++) {
arr[i] = 0;
}
int* dataset = new int[32 * 32 * 32];
for (int i = 0; i < 32 * 32 * 32; i++) {
dataset[0] = i;
}
int level = log2(32);
int level = static_cast<int>(log2(32));
leaf top_node;
top_node.level = level;
leaf top_node;
top_node.level = level;
for (int i = 0; i < 16 * 16 * 16; i++){
for (int i = 0; i < 8 * 8 * 8; i++){
for (int i = 0; i < 4 * 4 * 4; i++){
for (int i = 0; i < 2 * 2 * 2; i++){
for (int i = 0; i < 16 * 16 * 16; i++) {
for (int i = 0; i < 8 * 8 * 8; i++) {
for (int i = 0; i < 4 * 4 * 4; i++) {
for (int i = 0; i < 2 * 2 * 2; i++) {
}
}
}
}
}
}
}
}
@@ -67,13 +67,13 @@ void Map::generate_octree() {
unsigned int leafmask = 255;
unsigned int validmask = leafmask << 8;
parent &= validmask;
parent &= leafmask;
std::cout << BitCount(parent & leafmask);
unsigned int children[8] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned int children[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
}