+ Parsing object system

srcs/class/Scene.cpp

@@ -22,40 +22,71 @@ Scene::~Scene()
 	delete (_camera);
 }
 
-Camera		*Scene::getCamera(void) const
+bool		Scene::parseScene(char *name)
 {
-	return (_camera);
+	std::ifstream	file(name);
+	std::string		line;
+
+	if (!file.is_open())
+	{
+		std::cout << "Error opening the file" << std::endl;
+		file.close();
+		return (false);
+	}
+
+	SceneParser		scene_parser(this);
+
+	while (std::getline(file, line))
+	{
+		if (!scene_parser.parseLine(line))
+		{
+			std::cerr << line << std::endl;
+			file.close();
+			return (false);
+		}
+	}
+	file.close();
+	return (true);
 }
 
+
 void		Scene::addObject(Object *object)
 {
 	_objects.push_back(object);
-
 	this->updateGPUData();
 }
 
 void		Scene::updateGPUData()
 {
-	_gpuObjects.clear();
+
+	_gpu_objects.clear();
 	for (const auto& obj : _objects)
 	{
-		GPUObject gpuObj;
-		gpuObj.position = obj->getPosition();
-		gpuObj.color = obj->getMaterial()->color;
-		gpuObj.roughness = obj->getMaterial()->roughness;
-		gpuObj.specular = obj->getMaterial()->specular;
-		gpuObj.type = static_cast<int>(obj->getType());
+		GPUObject gpu_obj;
+		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.type = static_cast<int>(obj->getType());
 		
-		if (obj->getType() == Object::Type::SPHERE) {
+		if (obj->getType() == Object::Type::SPHERE)
+		{
 			auto sphere = static_cast<const Sphere*>(obj);
-			gpuObj.radius = sphere->getRadius();
+			gpu_obj.radius = sphere->getRadius();
 		}
 		
-		_gpuObjects.push_back(gpuObj);
+		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
 {
-	return (_gpuObjects);
+	return (_gpu_objects);
+}
+
+Camera		*Scene::getCamera(void) const
+{
+	return (_camera);
 }

srcs/class/SceneParser.cpp

@@ -0,0 +1,47 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   SceneParser.cpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: TheRed <TheRed@students.42.fr>             +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/12/26 21:43:51 by TheRed            #+#    #+#             */
+/*   Updated: 2024/12/26 21:43:51 by TheRed           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "SceneParser.hpp"
+
+SceneParser::SceneParser(Scene *scene) : _scene(scene)
+{
+	object_parsers["sp"] = [](std::stringstream& ss) -> Object*
+	{
+		try { return (new Sphere(ss)); }
+		catch (const std::exception& e) { throw; }
+	};
+}
+
+bool		SceneParser::parseLine(const std::string &line)
+{
+	if (line.empty() || line[0] == '#')
+		return (true);
+	
+	std::stringstream	ss(line);
+	std::string			identifier;
+	
+	ss >> identifier;
+
+	auto it = object_parsers.find(identifier);
+	if (it != object_parsers.end())
+	{
+		try {
+			Object *obj = it->second(ss);
+			_scene->addObject(obj);
+		} catch (const std::exception& e) {
+			std::cerr << "Error parsing sphere: " << e.what() << std::endl;
+			return false;
+		}
+	}
+
+	return (true);
+}

srcs/class/Window.cpp

@@ -12,10 +12,10 @@
 
 #include "Window.hpp"
 
-Window::Window(int width, int height, const char *title, int sleep)
+Window::Window(Scene *scene, int width, int height, const char *title, int sleep)
 {
-	_scene = new Scene();
-
+	_scene = scene;
+	
 	if (!glfwInit())
 	{
 		fprintf( stderr, "Failed to initialize GLFW\n" );
@@ -130,11 +130,6 @@ GLFWwindow	*Window::getWindow(void) const
 	return (_window);
 }
 
-Scene		*Window::getScene(void) const
-{
-	return (_scene);
-}
-
 float		Window::getFps(void) const
 {
 	return (_fps);