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

+ | Real material shared system + parsing

Browse Source
This commit is contained in:
TheRedShip
2024-12-27 11:11:01 +01:00
parent 8941169f4a
commit ea3dd738f8
9 changed files with 105 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
srcs/class/Scene.cpp
View File

@ -56,17 +56,26 @@ void Scene::addObject(Object *object)
this->updateGPUData();
}
void Scene::addMaterial(Material *material)
{
_materials.push_back(material);
}
void Scene::updateGPUData()
{
GPUObject gpu_obj;
Material *mat;
_gpu_objects.clear();
for (const auto& obj : _objects)
{
GPUObject gpu_obj;
mat = getMaterial(obj->getMaterialIndex());
gpu_obj.position = obj->getPosition();
gpu_obj.color = obj->getMaterial()->color;
gpu_obj.roughness = obj->getMaterial()->roughness;
gpu_obj.specular = obj->getMaterial()->specular;
gpu_obj.color = mat->color;
gpu_obj.emission = mat->emission;
gpu_obj.roughness = mat->roughness;
gpu_obj.specular = mat->specular;
gpu_obj.type = static_cast<int>(obj->getType());
if (obj->getType() == Object::Type::SPHERE)
@ -74,19 +83,33 @@ void Scene::updateGPUData()
auto sphere = static_cast<const Sphere*>(obj);
gpu_obj.radius = sphere->getRadius();
}
std::cout << gpu_obj.position.x << " " << gpu_obj.position.y << " " << gpu_obj.position.z << " " << gpu_obj.radius << " " << gpu_obj.roughness << " " << gpu_obj.specular << std::endl;
_gpu_objects.push_back(gpu_obj);
}
}
const std::vector<GPUObject>& Scene::getGPUData() const
{
for (const auto& obj : _gpu_objects)
{
std::cout << "objType: " << obj.type << std::endl;
std::cout << "position: " << obj.position.x << " " << obj.position.y << " " << obj.position.z << std::endl;
std::cout << "color: " << obj.color.x << " " << obj.color.y << " " << obj.color.z << std::endl;
std::cout << "mat: " << obj.emission << " " << obj.roughness << " " << obj.specular << std::endl;
std::cout << "Size of GPUObject: " << sizeof(GPUObject) << " bytes" << std::endl;
}
return (_gpu_objects);
}
Camera *Scene::getCamera(void) const
{
return (_camera);
}
Material *Scene::getMaterial(int material_index)
{
if (material_index < 0 || material_index >= (int)_materials.size())
throw std::runtime_error("Incorrect material index");
return (_materials[material_index]);
}

43
srcs/class/SceneParser.cpp
View File

@ -21,6 +21,27 @@ SceneParser::SceneParser(Scene *scene) : _scene(scene)
};
}
void SceneParser::parseMaterial(std::stringstream &line)
{
float r,g,b;
float emission;
float roughness;
float specular;
Material *mat;
if (!(line >> r >> g >> b >> emission >> roughness >> specular))
throw std::runtime_error("Material: Missing material properties");
mat = new Material;
mat->color = glm::vec3(r / 255.0f, g / 255.0f, b / 255.0f);
mat->emission = emission;
mat->roughness = roughness;
mat->specular = specular;
_scene->addMaterial(mat);
}
bool SceneParser::parseLine(const std::string &line)
{
if (line.empty() || line[0] == '#')
@ -31,17 +52,25 @@ bool SceneParser::parseLine(const std::string &line)
ss >> identifier;
auto it = object_parsers.find(identifier);
if (it != object_parsers.end())
try
{
try {
auto it = object_parsers.find(identifier);
if (it != object_parsers.end())
{
Object *obj = it->second(ss);
(void) _scene->getMaterial(obj->getMaterialIndex()); //verify material
_scene->addObject(obj);
} catch (const std::exception& e) {
std::cerr << "Error parsing sphere: " << e.what() << std::endl;
return false;
}
if (identifier == "MAT")
this->parseMaterial(ss);
}
catch (const std::exception& e)
{
std::cerr << e.what() << std::endl;
return (false);
}
return (true);
}
}