More bugfixing on the negative ray directions. Again having the forgetful while loop
This commit is contained in:
@@ -42,12 +42,12 @@ class Application {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static const int WINDOW_X = 1366;
|
// static const int WINDOW_X = 1366;
|
||||||
static const int WINDOW_Y = 768;
|
// static const int WINDOW_Y = 768;
|
||||||
// static const int WINDOW_X = 500;
|
// static const int WINDOW_X = 500;
|
||||||
// static const int WINDOW_Y = 500;
|
// static const int WINDOW_Y = 500;
|
||||||
// static const int WINDOW_X = 5;
|
static const int WINDOW_X = 50;
|
||||||
// static const int WINDOW_Y = 5;
|
static const int WINDOW_Y = 50;
|
||||||
static const int MAP_X;
|
static const int MAP_X;
|
||||||
static const int MAP_Y;
|
static const int MAP_Y;
|
||||||
static const int MAP_Z;
|
static const int MAP_Z;
|
||||||
|
|||||||
@@ -175,6 +175,8 @@ struct TraversalState get_oct_vox(
|
|||||||
// Break
|
// Break
|
||||||
while (dimension > 1) {
|
while (dimension > 1) {
|
||||||
|
|
||||||
|
ts.oct_pos = ts.sub_oct_pos;
|
||||||
|
|
||||||
// Do the logic steps to find which sub oct we step down into
|
// Do the logic steps to find which sub oct we step down into
|
||||||
uchar3 masks = select((uchar3)(0, 0, 0),
|
uchar3 masks = select((uchar3)(0, 0, 0),
|
||||||
(uchar3)(idx_set_x_mask, idx_set_y_mask, idx_set_z_mask),
|
(uchar3)(idx_set_x_mask, idx_set_y_mask, idx_set_z_mask),
|
||||||
@@ -186,7 +188,6 @@ struct TraversalState get_oct_vox(
|
|||||||
ts.idx_stack[ts.scale] = masks.x | masks.y | masks.z;
|
ts.idx_stack[ts.scale] = masks.x | masks.y | masks.z;
|
||||||
|
|
||||||
// Set our voxel position to the (0,0) of the correct oct by rerunning the logic step
|
// Set our voxel position to the (0,0) of the correct oct by rerunning the logic step
|
||||||
ts.oct_pos = ts.sub_oct_pos;
|
|
||||||
ts.sub_oct_pos += select((int3)(0), (int3)(dimension/2), position >= (int3)(dimension/2) + ts.oct_pos);
|
ts.sub_oct_pos += select((int3)(0), (int3)(dimension/2), position >= (int3)(dimension/2) + ts.oct_pos);
|
||||||
|
|
||||||
int mask_index = ts.idx_stack[ts.scale];
|
int mask_index = ts.idx_stack[ts.scale];
|
||||||
@@ -204,6 +205,8 @@ struct TraversalState get_oct_vox(
|
|||||||
return ts;
|
return ts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// If all went well and we found a valid non-leaf oct then we will traverse further down the hierarchy
|
// If all went well and we found a valid non-leaf oct then we will traverse further down the hierarchy
|
||||||
ts.scale++;
|
ts.scale++;
|
||||||
ts.parent_stack_position++;
|
ts.parent_stack_position++;
|
||||||
@@ -376,7 +379,7 @@ __kernel void raycaster(
|
|||||||
uchar prev_val = traversal_state.idx_stack[traversal_state.scale];
|
uchar prev_val = traversal_state.idx_stack[traversal_state.scale];
|
||||||
uchar this_face_mask = 0;
|
uchar this_face_mask = 0;
|
||||||
|
|
||||||
// Check the voxel face that we traversed
|
// Check the voxel face that we traversed, do a select to OR the value out of the three masks
|
||||||
uchar3 tmp = select((uchar3)(0), (uchar3)(idx_set_x_mask,idx_set_y_mask,idx_set_z_mask), convert_uchar3(face_mask == (1,1,1)));
|
uchar3 tmp = select((uchar3)(0), (uchar3)(idx_set_x_mask,idx_set_y_mask,idx_set_z_mask), convert_uchar3(face_mask == (1,1,1)));
|
||||||
this_face_mask = tmp.x | tmp.y | tmp.z;
|
this_face_mask = tmp.x | tmp.y | tmp.z;
|
||||||
|
|
||||||
@@ -386,15 +389,23 @@ __kernel void raycaster(
|
|||||||
// Mask index is the 1D index'd value of the idx for interaction with the valid / leaf masks
|
// Mask index is the 1D index'd value of the idx for interaction with the valid / leaf masks
|
||||||
uchar mask_index = traversal_state.idx_stack[traversal_state.scale];
|
uchar mask_index = traversal_state.idx_stack[traversal_state.scale];
|
||||||
|
|
||||||
|
// If facemask sign is positive, mask_index > prev_val
|
||||||
|
// if negative mask_index < prev_val
|
||||||
|
int3 signed_face_mask = face_mask * voxel_step;
|
||||||
|
bool mask_tripped = (mask_index > prev_val) * ((signed_face_mask.x + signed_face_mask.y + signed_face_mask.z) == -1) +
|
||||||
|
(mask_index < prev_val) * ((signed_face_mask.x + signed_face_mask.y + signed_face_mask.z) == 1);
|
||||||
|
|
||||||
// Whether or not the next oct we want to enter in the current CD's valid mask is 1 or 0
|
// Whether or not the next oct we want to enter in the current CD's valid mask is 1 or 0
|
||||||
// Check to see if the idx increased or decreased
|
// Check to see if the idx increased or decreased
|
||||||
// If it decreased, thus invalid
|
// If it decreased, thus invalid
|
||||||
// Pop up the stack until the oct that the idx flip is valid and we landed on a valid oct
|
// Pop up the stack until the oct that the idx flip is valid and we landed on a valid oct
|
||||||
bool is_valid = select(false,
|
bool is_valid = select(false,
|
||||||
(bool)(traversal_state.parent_stack[traversal_state.parent_stack_position] >> 16) & mask_8[mask_index],
|
(bool)(traversal_state.parent_stack[traversal_state.parent_stack_position] >> 16) & mask_8[mask_index],
|
||||||
mask_index > prev_val);
|
mask_tripped == false);
|
||||||
|
|
||||||
while ((mask_index < prev_val || !is_valid) && traversal_state.scale >= 1) {
|
|
||||||
|
|
||||||
|
while ((mask_tripped || !is_valid) && traversal_state.scale >= 1) {
|
||||||
|
|
||||||
// Clear and pop the idx stack
|
// Clear and pop the idx stack
|
||||||
traversal_state.idx_stack[traversal_state.scale] = 0;
|
traversal_state.idx_stack[traversal_state.scale] = 0;
|
||||||
@@ -412,6 +423,10 @@ __kernel void raycaster(
|
|||||||
// track of the sub_oct we're coming from
|
// track of the sub_oct we're coming from
|
||||||
//traversal_state.sub_oct_pos = traversal_state.oct_pos;
|
//traversal_state.sub_oct_pos = traversal_state.oct_pos;
|
||||||
|
|
||||||
|
// Update the prev_val for our new idx
|
||||||
|
prev_val = traversal_state.idx_stack[traversal_state.scale];
|
||||||
|
|
||||||
|
// Use the prev val to subtract out the sub oct we were in to get to our oct pos
|
||||||
// select take the dumb MSB truth value for vector types
|
// select take the dumb MSB truth value for vector types
|
||||||
// so we just gotta do this component wise, dumb
|
// so we just gotta do this component wise, dumb
|
||||||
traversal_state.oct_pos.x -= select(0, jump_power, (prev_val & idx_set_x_mask));
|
traversal_state.oct_pos.x -= select(0, jump_power, (prev_val & idx_set_x_mask));
|
||||||
@@ -422,15 +437,19 @@ __kernel void raycaster(
|
|||||||
traversal_state.current_descriptor =
|
traversal_state.current_descriptor =
|
||||||
traversal_state.parent_stack[traversal_state.parent_stack_position];
|
traversal_state.parent_stack[traversal_state.parent_stack_position];
|
||||||
|
|
||||||
// Update the prev_val for our new idx
|
|
||||||
prev_val = traversal_state.idx_stack[traversal_state.scale];
|
|
||||||
|
|
||||||
// Apply the face mask to the new idx for the while check
|
// Apply the face mask to the new idx for the while check
|
||||||
traversal_state.idx_stack[traversal_state.scale] ^= this_face_mask;
|
traversal_state.idx_stack[traversal_state.scale] ^= this_face_mask;
|
||||||
|
|
||||||
// Get the mask index of the new idx and check the valid status
|
// Get the mask index of the new idx and check the valid status
|
||||||
mask_index = traversal_state.idx_stack[traversal_state.scale];
|
mask_index = traversal_state.idx_stack[traversal_state.scale];
|
||||||
is_valid = (traversal_state.parent_stack[traversal_state.parent_stack_position] >> 16) & mask_8[mask_index];
|
is_valid = (traversal_state.parent_stack[traversal_state.parent_stack_position] >> 16) & mask_8[mask_index];
|
||||||
|
|
||||||
|
// TODO : SOMETHING WEIRD GOING ON HERE. Line skipping and forgetful while loop. Might be this statement
|
||||||
|
|
||||||
|
// Check to see if the mask tripped, this will override the is_valid on the while loop
|
||||||
|
mask_tripped = (mask_index > prev_val) * ((signed_face_mask.x + signed_face_mask.y + signed_face_mask.z) == -1) +
|
||||||
|
(mask_index < prev_val) * ((signed_face_mask.x + signed_face_mask.y + signed_face_mask.z) == 1);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -1,8 +1,8 @@
|
|||||||
#include "Application.h"
|
#include "Application.h"
|
||||||
|
|
||||||
const int Application::MAP_X = 32;
|
const int Application::MAP_X = 16;
|
||||||
const int Application::MAP_Y = 32;
|
const int Application::MAP_Y = 16;
|
||||||
const int Application::MAP_Z = 32;
|
const int Application::MAP_Z = 16;
|
||||||
|
|
||||||
Application::Application() {
|
Application::Application() {
|
||||||
|
|
||||||
@@ -52,8 +52,8 @@ bool Application::init_clcaster() {
|
|||||||
|
|
||||||
|
|
||||||
camera = std::make_shared<Camera>(
|
camera = std::make_shared<Camera>(
|
||||||
sf::Vector3f(3.8f, 3.4f, 2.6f), // Starting position
|
sf::Vector3f(2.34f, 2.5f, 7.17f), // Starting position
|
||||||
sf::Vector2f(1.56f, .81f), // Direction
|
sf::Vector2f(2.424f, 3.141f), // Direction
|
||||||
window.get()
|
window.get()
|
||||||
);
|
);
|
||||||
raycaster->assign_camera(camera);
|
raycaster->assign_camera(camera);
|
||||||
|
|||||||
+2
-2
@@ -4,8 +4,8 @@
|
|||||||
CLCaster::CLCaster() {}
|
CLCaster::CLCaster() {}
|
||||||
CLCaster::~CLCaster() {
|
CLCaster::~CLCaster() {
|
||||||
|
|
||||||
delete[] viewport_matrix;
|
//delete[] viewport_matrix;
|
||||||
delete[] viewport_image;
|
//delete[] viewport_image;
|
||||||
|
|
||||||
camera.reset();
|
camera.reset();
|
||||||
map.reset();
|
map.reset();
|
||||||
|
|||||||
Reference in New Issue
Block a user