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

+ | Better parsing

Browse Source
This commit is contained in:
TheRedShip
2025-01-12 19:34:16 +01:00
parent 1908057434
commit a551347084
3 changed files with 77 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
RT Normal file
View File

Binary file not shown.

8
includes/RT/Scene.hpp
View File

@ -57,22 +57,16 @@ class Scene
void addObject(Object *object); void addObject(Object *object);
void addMaterial(Material *material); void addMaterial(Material *material);
void updateGPUData();
const std::vector<GPUObject> &getObjectData() const; const std::vector<GPUObject> &getObjectData() const;
std::vector<GPUMaterial> &getMaterialData(); std::vector<GPUMaterial> &getMaterialData();
Camera *getCamera(void) const; Camera *getCamera(void) const;
Material *getMaterial(int material_index); GPUMaterial getMaterial(int material_index);
private: private:
std::vector<Object *> _objects;
std::vector<Material *> _materials;
std::vector<GPUObject> _gpu_objects; std::vector<GPUObject> _gpu_objects;
std::vector<GPUMaterial> _gpu_materials; std::vector<GPUMaterial> _gpu_materials;
Camera *_camera; Camera *_camera;
}; };

168
srcs/class/Scene.cpp
View File

@ -50,103 +50,87 @@ bool Scene::parseScene(char *name)
} }
void Scene::addObject(Object *object) void Scene::addObject(Object *obj)
{ {
_objects.push_back(object); GPUObject gpu_obj;
this->updateGPUData();
gpu_obj.mat_index = obj->getMaterialIndex();
gpu_obj.position = obj->getPosition();
gpu_obj.type = static_cast<int>(obj->getType());
if (obj->getType() == Object::Type::SPHERE)
{
auto sphere = static_cast<Sphere *>(obj);
gpu_obj.radius = sphere->getRadius();
}
else if (obj->getType() == Object::Type::PLANE)
{
auto plane = static_cast<Plane *>(obj);
gpu_obj.normal = plane->getNormal();
}
else if (obj->getType() == Object::Type::QUAD)
{
auto quad = static_cast<Quad *>(obj);
gpu_obj.vertex1 = quad->getUp();
gpu_obj.vertex2 = quad->getRight();
}
else if (obj->getType() == Object::Type::TRIANGLE)
{
auto triangle = static_cast<Triangle *>(obj);
gpu_obj.vertex1 = triangle->getVertex2();
gpu_obj.vertex2 = triangle->getVertex3();
gpu_obj.normal = triangle->getNormal();
}
else if (obj->getType() == Object::Type::CUBE)
{
auto cube = static_cast<Cube *>(obj);
gpu_obj.position = cube->getPosition();
gpu_obj.vertex1 = cube->getSize();
}
else if (obj->getType() == Object::Type::CYLINDER)
{
auto cylinder = static_cast<Cylinder *>(obj);
gpu_obj.normal = glm::vec3(cylinder->getRadius(), cylinder->getHeight(), 0.0f);
gpu_obj.transform = glm::mat4(cylinder->getRotation());
}
else if (obj->getType() == Object::Type::PORTAL)
{
auto portal = static_cast<Portal *>(obj);
gpu_obj.vertex1 = portal->getUp();
gpu_obj.vertex2 = portal->getRight();
gpu_obj.normal = portal->getNormal();
gpu_obj.transform = glm::mat4(portal->getRotation());
int i = _gpu_objects.size();
GPUObject &linked = _gpu_objects[i - 2];
if (portal->getLinkedPortalIndex() == -1)
{
if (linked.type == (int)Object::Type::PORTAL && linked.radius == static_cast<int>(i))
portal->setLinkedPortalIndex(i - 2);
else
portal->setLinkedPortalIndex(i + 2);
}
gpu_obj.radius = portal->getLinkedPortalIndex();
}
_gpu_objects.push_back(gpu_obj);
} }
void Scene::addMaterial(Material *material) void Scene::addMaterial(Material *material)
{ {
_materials.push_back(material);
this->updateGPUData();
}
void Scene::updateGPUData()
{
GPUObject gpu_obj;
GPUMaterial gpu_mat; GPUMaterial gpu_mat;
_gpu_objects.clear(); gpu_mat.color = material->color;
_gpu_materials.clear(); gpu_mat.emission = material->emission;
gpu_mat.roughness = material->roughness;
for (unsigned int i = 0; i < _objects.size(); i++) gpu_mat.metallic = material->metallic;
{ gpu_mat.refraction = material->refraction;
Object *obj = _objects[i]; gpu_mat.type = material->type;
gpu_obj.mat_index = obj->getMaterialIndex(); _gpu_materials.push_back(gpu_mat);
gpu_obj.position = obj->getPosition();
gpu_obj.type = static_cast<int>(obj->getType());
if (obj->getType() == Object::Type::SPHERE)
{
auto sphere = static_cast<Sphere *>(obj);
gpu_obj.radius = sphere->getRadius();
}
else if (obj->getType() == Object::Type::PLANE)
{
auto plane = static_cast<Plane *>(obj);
gpu_obj.normal = plane->getNormal();
}
else if (obj->getType() == Object::Type::QUAD)
{
auto quad = static_cast<Quad *>(obj);
gpu_obj.vertex1 = quad->getUp();
gpu_obj.vertex2 = quad->getRight();
}
else if (obj->getType() == Object::Type::TRIANGLE)
{
auto triangle = static_cast<Triangle *>(obj);
gpu_obj.vertex1 = triangle->getVertex2();
gpu_obj.vertex2 = triangle->getVertex3();
gpu_obj.normal = triangle->getNormal();
}
else if (obj->getType() == Object::Type::CUBE)
{
auto cube = static_cast<Cube *>(obj);
gpu_obj.position = cube->getPosition();
gpu_obj.vertex1 = cube->getSize();
}
else if (obj->getType() == Object::Type::CYLINDER)
{
auto cylinder = static_cast<Cylinder *>(obj);
gpu_obj.normal = glm::vec3(cylinder->getRadius(), cylinder->getHeight(), 0.0f);
gpu_obj.transform = glm::mat4(cylinder->getRotation());
}
else if (obj->getType() == Object::Type::PORTAL)
{
auto portal = static_cast<Portal *>(obj);
gpu_obj.vertex1 = portal->getUp();
gpu_obj.vertex2 = portal->getRight();
gpu_obj.normal = portal->getNormal();
gpu_obj.transform = glm::mat4(portal->getRotation());
Portal *linked = static_cast<Portal *>(_objects[i - 2]);
if (portal->getLinkedPortalIndex() == -1)
{
if (linked->getType() == Object::Type::PORTAL && linked->getLinkedPortalIndex() == static_cast<int>(i))
portal->setLinkedPortalIndex(i - 2);
else
portal->setLinkedPortalIndex(i + 2);
}
gpu_obj.radius = portal->getLinkedPortalIndex();
}
_gpu_objects.push_back(gpu_obj);
}
for (const auto &material : _materials)
{
gpu_mat.color = material->color;
gpu_mat.emission = material->emission;
gpu_mat.roughness = material->roughness;
gpu_mat.metallic = material->metallic;
gpu_mat.refraction = material->refraction;
gpu_mat.type = material->type;
_gpu_materials.push_back(gpu_mat);
}
} }
const std::vector<GPUObject>& Scene::getObjectData() const const std::vector<GPUObject>& Scene::getObjectData() const
@ -164,9 +148,9 @@ Camera *Scene::getCamera(void) const
return (_camera); return (_camera);
} }
Material *Scene::getMaterial(int material_index) GPUMaterial Scene::getMaterial(int material_index)
{ {
if (material_index < 0 || material_index >= (int)_materials.size()) if (material_index < 0 || material_index >= (int)_gpu_materials.size())
throw std::runtime_error("Incorrect material index"); throw std::runtime_error("Incorrect material index");
return (_materials[material_index]); return (_gpu_materials[material_index]);
} }