feat: light, color and texture XML

include/engine/scene/Entity.hpp

@@ -24,13 +24,16 @@
 #include "engine/render/BoundingSphere.hpp"
 #include "engine/render/Model.hpp"
 #include "engine/render/RenderPipelineManager.hpp"
+#include "engine/scene/Material.hpp"
 
 namespace engine::scene {
 
 class Entity {
 private:
     std::shared_ptr<render::Model> model;
     render::BoundingSphere boundingSphere;
+    std::string texturePath;
+    Material material;
 
 public:
     Entity(const tinyxml2::XMLElement *modelElement,

include/engine/scene/Material.hpp

@@ -0,0 +1,35 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include <glm/mat4x4.hpp>
+#include <tinyxml2.h>
+
+namespace engine::scene {
+
+class Material {
+protected:
+    glm::vec3 diffuse;
+    glm::vec3 ambient;
+    glm::vec3 specular;
+    glm::vec3 emissive;
+    float shininess;
+
+public:
+    Material();
+    explicit Material(const tinyxml2::XMLElement *colorElement);
+};
+
+}

include/engine/scene/Scene.hpp

@@ -22,6 +22,7 @@
 #include "engine/render/RenderPipelineManager.hpp"
 #include "engine/scene/camera/Camera.hpp"
 #include "engine/scene/Group.hpp"
+#include "engine/scene/light/Light.hpp"
 
 namespace engine::scene {
 
@@ -31,6 +32,7 @@ class Scene {
     std::unique_ptr<camera::Camera> camera;
     std::vector<std::unique_ptr<Group>> groups;
     render::Axis xAxis, yAxis, zAxis;
+    std::vector<std::unique_ptr<light::Light>> lights;
 
 public:
     explicit Scene(const std::string &file);

include/engine/scene/light/DirectionalLight.hpp

@@ -0,0 +1,29 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include "Light.hpp"
+
+namespace engine::scene::light {
+
+class DirectionalLight : public Light {
+private:
+    glm::vec3 direction;
+
+public:
+    explicit DirectionalLight(const glm::vec3 &_direction);
+};
+
+}

include/engine/scene/light/Light.hpp

@@ -0,0 +1,30 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include <glm/vec3.hpp>
+
+namespace engine::scene::light {
+
+class Light {
+protected:
+    glm::vec3 color;
+
+public:
+    Light();
+    virtual ~Light() = default;
+};
+
+}

include/engine/scene/light/LightFactory.hpp

@@ -0,0 +1,28 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include <tinyxml2.h>
+
+#include "engine/scene/light/Light.hpp"
+
+namespace engine::scene::light {
+
+class LightFactory {
+public:
+    static std::unique_ptr<Light> createFromXML(const tinyxml2::XMLElement *lightElement);
+};
+
+}

include/engine/scene/light/PointLight.hpp

@@ -0,0 +1,29 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include "Light.hpp"
+
+namespace engine::scene::light {
+
+class PointLight : public Light {
+private:
+    glm::vec3 position;
+
+public:
+    explicit PointLight(const glm::vec3 &_position);
+};
+
+}

include/engine/scene/light/Spotlight.hpp

@@ -0,0 +1,31 @@
+/// Copyright 2025 Ana Oliveira, Humberto Gomes, Mariana Rocha, Sara Lopes
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+
+#pragma once
+
+#include "Light.hpp"
+
+namespace engine::scene::light {
+
+class Spotlight : public Light {
+private:
+    glm::vec3 position;
+    glm::vec3 direction;
+    float cutoff;
+
+public:
+    explicit Spotlight(const glm::vec3 &_position, const glm::vec3 &_direction, float _cutoff);
+};
+
+}

include/utils/XMLUtils.hpp

@@ -25,6 +25,9 @@ class XMLUtils {
     static const tinyxml2::XMLElement *getSingleChild(const tinyxml2::XMLNode *parent,
                                                       const std::string &name);
     static glm::vec3 getXYZ(const tinyxml2::XMLElement *element);
+    static glm::vec3 getRGB(const tinyxml2::XMLElement *element);
+    static glm::vec3 getLightDirection(const tinyxml2::XMLElement *element);
+    static glm::vec3 getLightPosition(const tinyxml2::XMLElement *element);
 };
 
 }

professorTests/scenes/test_files_phase_4/notes for phase IV.txt

@@ -0,0 +1,15 @@
+Notes on phase IV:
+
+- the light direction is assumed to be the direction towards the light.
+- For lighting to work properly when scales are applied to models, the following code should be added to the initialization:
+
+	glEnable(GL_RESCALE_NORMAL);
+
+	Activating this feature will result in normalized normals after applying the geometric transformations, and before applying lighting. This is relevant when using scales-
+
+- To allow for ambient colors to be reproduced without having to activate the ambient component for all lights, the following code should be added to the initialization:
+
+	float amb[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
+	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, amb);
+
+- Regarding texture mapping as provided in the screen shots, groups may offer different mappings for the cone and box, in which case the group should build a project XML file to illustrate their mapping.

professorTests/scenes/test_files_phase_4/test_4_1.xml

@@ -0,0 +1,26 @@
+<world>
+    <window width="512" height="512" />
+    <camera>
+	    <position x="1.757135" y="1.799201" z="3.416921" />
+	    <lookAt x="0" y="0" z="0" />
+	    <up x="0" y="1" z="0" />
+        <projection fov="60" near="1" far="1000" />
+    </camera>
+
+	<lights>
+		<light type="directional" dirX="1" dirY="0.7" dirZ="0.5"/>
+	</lights>
+	<group>
+  		<models>
+			<model file="../../models/box_2_3.3d" > <!-- generator box 2 3 box_2_3.3d -->
+				<color>
+                    <diffuse R="200" G="200" B="000" />
+                    <ambient R="50" G="50" B="00" />
+                    <specular R="0" G="0" B="0" />
+                    <emissive R="0" G="0" B="0" />
+                    <shininess value="0" />
+                </color>
+			</model>
+ 		</models>
+ 	</group>
+</world>

professorTests/scenes/test_files_phase_4/test_4_2.xml

@@ -0,0 +1,26 @@
+<world>
+    <window width="512" height="512" />
+    <camera>
+	    <position x="1.757135" y="1.799201" z="3.416921" />
+	    <lookAt x="0" y="0" z="0" />
+	    <up x="0" y="1" z="0" />
+        <projection fov="60" near="1" far="1000" />
+    </camera>
+
+	<lights>
+		<light type="directional" dirX="1" dirY="0.7" dirZ="0.5"/>
+	</lights>
+	<group>
+  		<models>
+			<model file="../../models/box_2_3.3d" > <!-- generator box 2 3 box_2_3.3d -->
+				<color>
+                    <diffuse R="200" G="200" B="000" />
+                    <ambient R="50" G="50" B="00" />
+                    <specular R="0" G="0" B="0" />
+                    <emissive R="255" G="0" B="0" />
+                    <shininess value="0" />
+                </color>
+			</model>
+ 		</models>
+ 	</group>
+</world>