tom/RT_GPU
1
0
Fork 0
mirror of https://github.com/TheRedShip/RT_GPU.git synced 2025-09-27 18:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ | Dragon and bvh

Browse Source
This commit is contained in:
TheRedShip
2025-01-18 12:30:35 +01:00
parent bb673d4af1
commit 5d3de6158b
20 changed files with 430842 additions and 25476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/RT/BVH.hpp
View File

@ -15,6 +15,7 @@
# include "RT.hpp"
struct GPUTriangle;
struct GPUObject;
struct GPUBvh;
@ -30,13 +31,13 @@ struct AABB
class BVH
{
public:
BVH(std::vector<GPUObject> &primitives, int first_primitive, int primitive_count);
BVH(std::vector<GPUTriangle> &primitives, int first_primitive, int primitive_count);
void showAABB(Scene *scene);
void updateBounds(std::vector <GPUObject> &primitives);
void subdivide(std::vector<GPUObject> &primitives);
void updateBounds(std::vector <GPUTriangle> &primitives);
void subdivide(std::vector<GPUTriangle> &primitives);
int size();

14
includes/RT/Scene.hpp
View File

@ -33,6 +33,16 @@ struct GPUObject
};
struct GPUTriangle
{
alignas(16) glm::vec3 position;
alignas(16) glm::vec3 vertex1;
alignas(16) glm::vec3 vertex2;
alignas(16) glm::vec3 normal;
int mat_index;
};
struct GPUMaterial
{
alignas(16) glm::vec3 color;
@ -86,6 +96,8 @@ class Scene
std::set<int> getGPULights();
const std::vector<GPUObject> &getObjectData() const;
const std::vector<GPUTriangle> &getTriangleData() const;
std::vector<GPUMaterial> &getMaterialData();
GPUVolume &getVolume();
std::vector<GPUBvh> &getBVH();
@ -97,6 +109,8 @@ class Scene
std::vector<GPUBvh> _gpu_bvh;
std::vector<GPUObject> _gpu_objects;
std::vector<GPUTriangle> _gpu_triangles;
std::vector<GPUMaterial> _gpu_materials;
std::set<int> _gpu_lights;

2
includes/RT/objects/Triangle.hpp
View File

@ -45,7 +45,7 @@ class Triangle : public Object
// _vertex2 -= _position; //optimization
// _vertex3 -= _position; //optimization
_normal = glm::normalize(glm::cross(_vertex2, _vertex3)); //optimization
_normal = glm::normalize(glm::cross(_vertex2 - _position, _vertex3 - _position)); //optimization
_mat_index = mat_index;
}