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

+ | Material system

Browse Source
This commit is contained in:
TheRedShip
2024-12-24 12:02:52 +01:00
parent 216e9a684a
commit 2f217b50e9
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/RT/Object.hpp
View File

@ -26,14 +26,14 @@ class Object
{
protected:
glm::vec3 _position;
Material _material;
const Material *_material;
public:
Object(const glm::vec3& position, const Material& material) : _position(position), _material(material) {}
Object(const glm::vec3& position, const Material *material) : _position(position), _material(material) {}
virtual ~Object() = default;
const glm::vec3& getPosition() const { return (_position); }
const Material& getMaterial() const { return (_material); }
const glm::vec3 &getPosition() const { return (_position); }
const Material *getMaterial() const { return (_material); }
enum class Type {
SPHERE,

4
includes/RT/Scene.hpp
View File

@ -37,13 +37,13 @@ class Scene
~Scene();
Camera *getCamera(void) const;
void addObject(std::unique_ptr<Object> object);
void addObject(Object *object);
void updateGPUData();
const std::vector<GPUObject>& getGPUData() const;
private:
std::vector<std::unique_ptr<Object>> _objects;
std::vector<Object *> _objects;
std::vector<GPUObject> _gpuObjects;
Camera *_camera;

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

@ -18,7 +18,7 @@
class Sphere : public Object
{
public:
Sphere(const glm::vec3& position, float radius, const Material& material)
Sphere(const glm::vec3& position, float radius, const Material *material)
: Object(position, material), _radius(radius) {}
float getRadius() const { return (_radius); }

4
srcs/RT.cpp
View File

@ -30,7 +30,7 @@ int main(void)
glm::vec3 position(x, y, z);
float sphereSize = 0.8f + 0.4f * sin(angle * 2.0f);
window.getScene()->addObject(std::make_unique<Sphere>(position, sphereSize, redMaterial));
window.getScene()->addObject(new Sphere(position, sphereSize, &redMaterial));
}
GLuint objectSSBO;
@ -49,6 +49,8 @@ int main(void)
const std::vector<GPUObject> &gpu_data = window.getScene()->getGPUData();
window.getScene()->updateGPUData();
// Update SSBO with latest object data
glBindBuffer(GL_SHADER_STORAGE_BUFFER, objectSSBO);
glBufferData(GL_SHADER_STORAGE_BUFFER, gpu_data.size() * sizeof(GPUObject), gpu_data.data(), GL_DYNAMIC_DRAW);

12
srcs/class/Scene.cpp
View File

@ -27,9 +27,9 @@ Camera *Scene::getCamera(void) const
return (_camera);
}
void Scene::addObject(std::unique_ptr<Object> object)
void Scene::addObject(Object *object)
{
_objects.push_back(std::move(object));
_objects.push_back(object);
this->updateGPUData();
}
@ -41,13 +41,13 @@ void Scene::updateGPUData()
{
GPUObject gpuObj;
gpuObj.position = obj->getPosition();
gpuObj.color = obj->getMaterial().color;
gpuObj.roughness = obj->getMaterial().roughness;
gpuObj.specular = obj->getMaterial().specular;
gpuObj.color = obj->getMaterial()->color;
gpuObj.roughness = obj->getMaterial()->roughness;
gpuObj.specular = obj->getMaterial()->specular;
gpuObj.type = static_cast<int>(obj->getType());
if (obj->getType() == Object::Type::SPHERE) {
auto sphere = static_cast<const Sphere*>(obj.get());
auto sphere = static_cast<const Sphere*>(obj);
gpuObj.radius = sphere->getRadius();
}