Commit 008b833b authored by Justine Martin's avatar Justine Martin 💖
Browse files

Merge branch 'features/asteroid'

parents 0dc20cb0 5beb39f9

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/Entity.cpp src/model/Missile.cpp src/model/Box.cpp)

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

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

README.md

+6 −0
Changes for README.md: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# GLEngine



Moteur OpenGL pour la synthèse d'images



# Resources 



Texture astéroid : https://3dtextures.me/2021/04/09/rock-040/

Texture skybox : 

Model et texture vaisseau : https://niko-3d-models.itch.io/free-sc-fi-spaceships-pack
 
 No newline at end of file

include/GlApplication.hpp

+4 −0
Changes for include/GlApplication.hpp: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ 


#include <iostream>

#include <memory>

#include <cstdlib>

#include <ctime>



#include "GuiElement.hpp"

#include "RenderObject.hpp"

#include "model/Asteroid.hpp"

#include "model/Missile.hpp"

#include "model/Player.hpp"

#include "model/Spaceship.hpp"
@@ -37,6 +40,7 @@ class GlApplication : public Application { 
            SPACESHIP_2,

            LASER_1,

            LASER_2,

            ASTEROID,

            SKYBOX,

            PLANKS,

            TRON,

include/model/Asteroid.hpp

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



#include <cstdlib>

#include <ctime>



#include <glm/ext.hpp>



#include "model/Entity.hpp"



#define ASTEROID_SPEED 0.1



class Asteroid : public Entity {

    private:



        glm::vec3 rotationAngle;



    public:

        Asteroid();

        ~Asteroid();



        void update(const float &deltaTime) override;

};

include/model/Entity.hpp

+2 −1
Changes for include/model/Entity.hpp: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 


class Entity {

    public:

        glm::vec3 m_position;

        

        Entity();

        virtual void update(const float &time);
@@ -35,7 +37,6 @@ class Entity { 


        glm::mat4 m_modelMatrix;



        glm::vec3 m_position;

        glm::quat m_rotation;

        glm::vec3 m_scale;