Commit ad9f1044 authored by Justine Martin's avatar Justine Martin 💖
Browse files

feat : Ajout d'une skybox

parent 4443ed7d

glitter @ 71da43c6

Compare 2b5bb541 to 71da43c6
Changes for glitter: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
Subproject commit 2b5bb5417f9dc0aff393bb9131f8bd70f5c51598
 
Subproject commit 71da43c663f3973e1f85b492bc2d10e4d5369fe9

include/GlApplication.hpp

+1 −0
Changes for include/GlApplication.hpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class GlApplication : public Application { 
            SPACESHIP_2,

            LASER_1,

            LASER_2,

            SKYBOX,

            PLANKS,

            TRON

        };

include/RenderObject.hpp

+4 −0
Changes for include/RenderObject.hpp: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ class RenderObject { 
		 */

		void update(const glm::mat4 & proj, const glm::mat4 & view, const glm::mat4 &model);



		void setDisableLightning(const bool &disableLightning);



	private:

		RenderObject();

		void loadWavefront(const std::string & objname);
@@ -59,4 +61,6 @@ class RenderObject { 
		std::unique_ptr<Sampler> m_diffusemap;

		std::unique_ptr<Sampler> m_normalmap;

		std::unique_ptr<Sampler> m_specularmap;



		std::shared_ptr<Program> program;

};

meshes/cubemap.png

0 → 100644
+13.7 MiB
Loading image diff...

meshes/skybox.blend

0 → 100644
+816 KiB

File added.

No diff preview for this file type.

View file