diff --git a/.objs/srcs/RT.o b/.objs/srcs/RT.o new file mode 100644 index 0000000..2056efa Binary files /dev/null and b/.objs/srcs/RT.o differ diff --git a/.objs/srcs/class/Camera.o b/.objs/srcs/class/Camera.o new file mode 100644 index 0000000..d8dc0c6 Binary files /dev/null and b/.objs/srcs/class/Camera.o differ diff --git a/.objs/srcs/class/Scene.o b/.objs/srcs/class/Scene.o new file mode 100644 index 0000000..1e6c32d Binary files /dev/null and b/.objs/srcs/class/Scene.o differ diff --git a/.objs/srcs/class/SceneParser.o b/.objs/srcs/class/SceneParser.o new file mode 100644 index 0000000..e1f76db Binary files /dev/null and b/.objs/srcs/class/SceneParser.o differ diff --git a/.objs/srcs/class/Shader.o b/.objs/srcs/class/Shader.o new file mode 100644 index 0000000..bb0f2dd Binary files /dev/null and b/.objs/srcs/class/Shader.o differ diff --git a/.objs/srcs/class/Window.o b/.objs/srcs/class/Window.o new file mode 100644 index 0000000..be3fe0d Binary files /dev/null and b/.objs/srcs/class/Window.o differ diff --git a/.objs/srcs/gl.o b/.objs/srcs/gl.o new file mode 100644 index 0000000..1fd2381 Binary files /dev/null and b/.objs/srcs/gl.o differ diff --git a/RT b/RT new file mode 100755 index 0000000..2edb1a5 Binary files /dev/null and b/RT differ diff --git a/includes/RT/Scene.hpp b/includes/RT/Scene.hpp index a931e10..98b4900 100644 --- a/includes/RT/Scene.hpp +++ b/includes/RT/Scene.hpp @@ -19,15 +19,16 @@ struct GPUObject { alignas(16) glm::vec3 position; - int mat_index; - - float radius; // sphere - alignas(16) glm::vec3 normal; // plane + alignas(16) glm::vec3 normal; // plane triangle alignas(16) glm::vec3 vertex1; //quad triangle alignas(16) glm::vec3 vertex2; //quad triangle + float radius; // sphere + + int mat_index; int type; + }; struct GPUMaterial diff --git a/shaders/compute.glsl b/shaders/compute.glsl index 7a117d8..cb1b0d5 100644 --- a/shaders/compute.glsl +++ b/shaders/compute.glsl @@ -7,14 +7,14 @@ layout(binding = 1, rgba32f) uniform image2D accumulation_image; struct GPUObject { vec3 position; // 12 + 4 - int mat_index; // 4 - - float radius; // 4 vec3 normal; // 12 + 4 - + vec3 vertex1; // 12 + 4 vec3 vertex2; // 12 + 4 + + float radius; // 4 + int mat_index; // 4 int type; // 4 };