diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bvh-node.hpp | 148 | ||||
| -rw-r--r-- | include/utils.hpp | 3 | ||||
| -rw-r--r-- | include/window.hpp | 1 |
3 files changed, 124 insertions, 28 deletions
diff --git a/include/bvh-node.hpp b/include/bvh-node.hpp index 78780e7..ee5068b 100644 --- a/include/bvh-node.hpp +++ b/include/bvh-node.hpp @@ -3,6 +3,7 @@ #include <vector>
#include <algorithm>
+#include <fstream>
#include "aabb.hpp"
#include "sphere.hpp"
@@ -11,44 +12,137 @@ class bvh_node { public:
bvh_node() = default;
bvh_node(sphere& sphere, int32_t sphere_id): bounding_box(sphere.bounding_box), sphere_id(sphere_id){}
- bvh_node(sphere* spheres, size_t start, size_t end, bvh_node* root_node, int32_t id) {
- left_node_id = id * 2;
- right_node_id = id * 2 + 1;
+ // bvh_node(sphere* spheres, size_t start, size_t end, bvh_node* root_node, int32_t id) {
+ // left_node_id = id * 2;
+ // right_node_id = id * 2 + 1;
- bvh_node left, right;
+ // bvh_node left, right;
- // int axis = randi(0, 2);
- // auto comparator = (axis == 0) ? box_x_comparator : (axis == 1) ? box_y_comparator : box_z_comparator;
+ // // int axis = randi(0, 2);
+ // // auto comparator = (axis == 0) ? box_x_comparator : (axis == 1) ? box_y_comparator : box_z_comparator;
- size_t span = end - start;
+ // size_t span = end - start;
- if (span == 1) {
- root_node[left_node_id - 1] = root_node[right_node_id - 1] = { spheres[start], (int32_t)start };
- } else if (span == 2) {
- // if (comparator(spheres[start], spheres[start + 1]) {
- root_node[left_node_id - 1] = { spheres[start], (int32_t)start };
- root_node[right_node_id - 1] = { spheres[start], (int32_t)start + 1 };
- // } else {
- // root_node[left_node_id - 1] = { spheres[start + 1], start + 1 };
- // root_node[right_node_id - 1] = { spheres[start], start };
- // }
+ // if (span == 1) {
+ // root_node[left_node_id - 1] = root_node[right_node_id - 1] = { spheres[start], (int32_t)start };
+ // } else if (span == 2) {
+ // // if (comparator(spheres[start], spheres[start + 1]) {
+ // root_node[left_node_id - 1] = { spheres[start], (int32_t)start };
+ // root_node[right_node_id - 1] = { spheres[start], (int32_t)start + 1 };
+ // // } else {
+ // // root_node[left_node_id - 1] = { spheres[start + 1], start + 1 };
+ // // root_node[right_node_id - 1] = { spheres[start], start };
+ // // }
+ // } else {
+ // uint32_t mid = start + span / 2;
+ // root_node[left_node_id - 1] = { spheres, start, mid, root_node, left_node_id };
+ // root_node[right_node_id - 1] = { spheres, mid, end, root_node, right_node_id };
+ // }
+
+ // bounding_box = aabb::surrounding_box(root_node[left_node_id - 1].bounding_box, root_node[right_node_id -1].bounding_box);
+ // }
+
+ aabb bounding_box;
+
+ int32_t left_id = -1;
+
+ int32_t sphere_id = -1;
+ uint32_t padding[2];
+};
+
+class bvh {
+public:
+ // TODO: Fix one level too deep BVH
+ void build(sphere* spheres, uint32_t spheres_count) {
+ nodes = std::vector<bvh_node>(spheres_count * spheres_count);
+ boxes = std::vector<aabb>(spheres_count);
+
+ for (uint32_t sphere_id = 0; sphere_id < spheres_count; sphere_id++) {
+ boxes[sphere_id] = spheres[sphere_id].bounding_box;
+ }
+
+ nodes[0] = bvh_node();
+
+ nodes[0].bounding_box = compute_bounds(0, spheres_count);
+ subdivide(0, 0, spheres_count);
+ }
+
+ //-------------------------
+ // BVH exporter for graphviz
+ //-------------------------
+ void exporter() {
+ std::cout << "digraph bvh {" << std::endl;
+
+ std::cout << "\t r";
+ preorder(nodes[0].left_id, nodes[0].sphere_id);
+
+ std::cout << "\t r";
+ preorder(nodes[0].left_id + 1, nodes[0].sphere_id);
+
+ std::cout << "}" << std::endl;
+ }
+
+ void preorder(int32_t id, int32_t sphere_id) {
+ if (id <= 0) {
+ if (sphere_id < 0) {
+ std::cout << ";" << std::endl;
} else {
- uint32_t mid = start + span / 2;
- root_node[left_node_id - 1] = { spheres, start, mid, root_node, left_node_id };
- root_node[right_node_id - 1] = { spheres, mid, end, root_node, right_node_id };
+ std::cout << " -> sphere_" << sphere_id << ";" << std::endl;
}
+ return;
+ }
- bounding_box = aabb::surrounding_box(root_node[left_node_id - 1].bounding_box, root_node[right_node_id -1].bounding_box);
+ std::cout << " -> " << id;
+ preorder(nodes[id].left_id, nodes[id].sphere_id);
+
+ if (nodes[id].left_id > -1) {
+ std::cout << "\t " << id;
+ preorder(nodes[id].left_id + 1, nodes[id].sphere_id);
}
+ }
- aabb bounding_box;
+private:
+
+ aabb compute_bounds(uint32_t begin, uint32_t end) {
+ aabb global_box = aabb();
+
+ for (uint32_t box_id = begin; box_id < end; box_id++) {
+ global_box = aabb::surrounding_box(global_box, boxes[box_id]);
+ }
+
+ return global_box;
+ }
- // Store sphere id ?
- int32_t left_node_id = -1;
- int32_t right_node_id = -1;
+ void subdivide(uint32_t parent_id, uint32_t begin, uint32_t end) {
+ if ((end - begin) == 0) {
+ return;
+ }
+
+ auto left_id = parent_id * 2 + 1;
+ auto right_id = parent_id * 2 + 2;
+
+ nodes[parent_id].left_id = left_id;
+
+ nodes[left_id] = bvh_node();
+ nodes[right_id] = bvh_node();
+
+ nodes[left_id].bounding_box = compute_bounds(begin, begin + ((end - begin) / 2));
+ nodes[right_id].bounding_box = compute_bounds(begin + ((end - begin) / 2), end);
+
+ if ((end - begin) == 2) {
+ nodes[left_id].sphere_id = begin;
+ nodes[right_id].sphere_id = begin + 1;
+ } else if ((end - begin) == 1) {
+ nodes[left_id].sphere_id = begin;
+ } else {
+ subdivide(left_id, begin, begin + ((end - begin) / 2));
+ subdivide(right_id, begin + ((end - begin) / 2), end);
+ }
+ }
- int32_t sphere_id = -1;
- uint32_t padding;
+public:
+ std::vector<bvh_node> nodes;
+ std::vector<aabb> boxes;
};
#endif // !__BVH_NODE_HPP_
diff --git a/include/utils.hpp b/include/utils.hpp index a95c95d..ee48d2c 100644 --- a/include/utils.hpp +++ b/include/utils.hpp @@ -28,7 +28,8 @@ struct input_data { uint32_t sample_index; uint32_t spheres_count; - uint32_t padding[3]; + uint32_t debug_bvh; + uint32_t padding[2]; }; std::vector<uint8_t> get_shader_code(const char* path); diff --git a/include/window.hpp b/include/window.hpp index 5a8bcc8..d2a8a78 100644 --- a/include/window.hpp +++ b/include/window.hpp @@ -38,6 +38,7 @@ enum KEYS: uint32_t { SHIFT = 0x10, CTRL, ALT, + SPACE = 0x20, A = 0x41, B, C, |