Commit 1e08f790 authored by Justine Martin's avatar Justine Martin 💖
Browse files

feat : Gestion de la barre de point de vie

parent 0f2365ca

CMakeLists.txt

+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ include_directories("glitter/ext/tinyobjloader" 
		${OPENGL_INCLUDE_DIR})



add_executable(GLE-test src/main.cpp src/RenderObject.cpp src/GuiElement.cpp src/RenderObjectPart.cpp src/GlApplication.cpp

               src/model/Spaceship.cpp src/model/Asteroid.cpp src/model/Entity.cpp src/model/Missile.cpp)

               src/model/Spaceship.cpp src/model/Asteroid.cpp src/model/LifeGui.cpp src/model/Entity.cpp src/model/Missile.cpp)

target_link_libraries(GLE-test utils ${GLFW3_LIBRARIES} ${GLEW_LIBRARIES})

include/GlApplication.hpp

+3 −0
Changes for include/GlApplication.hpp: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "GuiElement.hpp"

#include "RenderObject.hpp"

#include "model/Asteroid.hpp"

#include "model/LifeGui.hpp"

#include "model/Missile.hpp"

#include "model/Player.hpp"

#include "model/Spaceship.hpp"
@@ -96,6 +97,8 @@ class GlApplication : public Application { 
        std::shared_ptr<GuiElement> lose;

        std::shared_ptr<GuiElement> draw;



        std::shared_ptr<LifeGui> healthbar;



        int winner;



        Program guiProgram;

include/GuiElement.hpp

+7 −1
Changes for include/GuiElement.hpp: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,16 +15,22 @@ class GuiElement { 
		glm::vec2 dimension;



		Sampler textureSampler;

		Texture texture;

		std::shared_ptr<Texture> texture;

		VAO vao;



		glm::mat4 modelMatrix;



		void computeModelMatrix();



		void createElement(Program &program);



	protected:

		void setTexture(std::shared_ptr<Texture> &newTexture);



	public: 



		GuiElement(Program &program, const std::string &texturePath);

		GuiElement(Program &program);



		void setPosition(glm::vec2 position);

		void setDimension(glm::vec2 dimension);

include/model/LifeGui.hpp

0 → 100644
+18 −0
Changes for include/model/LifeGui.hpp: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line 
#pragma once



#include <glApi.hpp>



#include "GuiElement.hpp"



class LifeGui : public GuiElement {

	public:



		LifeGui(Program &program);



		void setCurrentLife(const unsigned int &life);



	private:

		std::shared_ptr<Texture> hp_3_texture;

		std::shared_ptr<Texture> hp_2_texture;

		std::shared_ptr<Texture> hp_1_texture;

};
 
 No newline at end of file

meshes/life1.png

0 → 100644
+179 KiB
Loading image diff...