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

fix : Remet le système de coordonnée d'opengl

parent 4a50779d

include/GlApplication.hpp

+4 −2
Changes for include/GlApplication.hpp: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <memory>



#include "RenderObject.hpp"

#include "model/Player.hpp"

#include "model/Spaceship.hpp"



class RenderObject;
@@ -29,7 +30,8 @@ class GlApplication : public Application { 


    private:

        enum ModelKeys {

            SPACESHIP,

            SPACESHIP_1,

            SPACESHIP_2,

            PLANKS,

            TRON

        };
@@ -42,7 +44,7 @@ class GlApplication : public Application { 
        static void resize(GLFWwindow * window, int framebufferWidth, int framebufferHeight);

        static void keyCallback(GLFWwindow * window, int key, int scancode, int action, int mods);

        void continuousKey(float deltaTime);

        void computeView(int player);

        void computeView(Player player);



        void processPlayer1Input(GLFWwindow *window, float deltaTime);

        void processPlayer2Input(GLFWwindow *window, float deltaTime);

include/model/Player.hpp

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



enum Player {one, two};
 
 No newline at end of file

include/model/Spaceship.hpp

+1 −2
Changes for include/model/Spaceship.hpp: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 
#include "glm/glm.hpp"



#include "model/Entity.hpp"



enum Player {one, two};

#include "model/Player.hpp"



class Spaceship : public Entity {

    private:

meshes/cross.obj

deleted100644 → 0
+0 −114
Changes for meshes/cross.obj: 0 added lines, 114 removed lines.
Original line number Diff line number Diff line 
####

#

# OBJ File Generated by Meshlab

#

####

# Object cross.obj

#

# Vertices: 32

# Faces: 30

#

####

#mtllib ./cross.obj.mtl



vn -2.000000 1.000000 -2.000000

v -0.500000 0.500000 -1.500000

vn -1.000000 -2.000000 -1.000000

v -0.500000 -0.500000 -1.500000

vn -4.000000 -2.000000 -4.000000

v -0.500000 -0.500000 -0.500000

vn -2.000000 4.000000 -2.000000

v -0.500000 0.500000 -0.500000

vn 2.000000 -1.000000 -2.000000

v 0.500000 -0.500000 -1.500000

vn 2.000000 -4.000000 -2.000000

v 0.500000 -0.500000 -0.500000

vn 1.000000 2.000000 -1.000000

v 0.500000 0.500000 -1.500000

vn 4.000000 2.000000 -4.000000

v 0.500000 0.500000 -0.500000

vn -1.000000 -2.000000 -1.000000

v -0.500000 -1.500000 -0.500000

vn -2.000000 -1.000000 2.000000

v -0.500000 -1.500000 0.500000

vn -2.000000 -4.000000 2.000000

v -0.500000 -0.500000 0.500000

vn 2.000000 -1.000000 -2.000000

v 0.500000 -1.500000 -0.500000

vn 1.000000 -2.000000 1.000000

v 0.500000 -1.500000 0.500000

vn 4.000000 -2.000000 4.000000

v 0.500000 -0.500000 0.500000

vn -2.000000 1.000000 -2.000000

v -1.500000 0.500000 -0.500000

vn -1.000000 -2.000000 -1.000000

v -1.500000 -0.500000 -0.500000

vn -2.000000 -1.000000 2.000000

v -1.500000 -0.500000 0.500000

vn -1.000000 2.000000 1.000000

v -1.500000 0.500000 0.500000

vn 2.000000 -1.000000 -2.000000

v 1.500000 -0.500000 -0.500000

vn 1.000000 -2.000000 1.000000

v 1.500000 -0.500000 0.500000

vn 1.000000 2.000000 -1.000000

v 1.500000 0.500000 -0.500000

vn 2.000000 1.000000 2.000000

v 1.500000 0.500000 0.500000

vn -4.000000 2.000000 4.000000

v -0.500000 0.500000 0.500000

vn -2.000000 1.000000 -2.000000

v -0.500000 1.500000 -0.500000

vn -1.000000 2.000000 1.000000

v -0.500000 1.500000 0.500000

vn 1.000000 2.000000 -1.000000

v 0.500000 1.500000 -0.500000

vn 2.000000 1.000000 2.000000

v 0.500000 1.500000 0.500000

vn 2.000000 4.000000 2.000000

v 0.500000 0.500000 0.500000

vn -2.000000 -1.000000 2.000000

v -0.500000 -0.500000 1.500000

vn -1.000000 2.000000 1.000000

v -0.500000 0.500000 1.500000

vn 1.000000 -2.000000 1.000000

v 0.500000 -0.500000 1.500000

vn 2.000000 1.000000 2.000000

v 0.500000 0.500000 1.500000

# 32 vertices, 0 vertices normals





usemtl material_0

f 2//2 3//3 4//4 1//1

f 5//5 6//6 3//3 2//2

f 7//7 5//5 2//2 1//1

f 7//7 8//8 6//6 5//5

f 1//1 4//4 8//8 7//7

f 9//9 10//10 11//11 3//3

f 12//12 13//13 10//10 9//9

f 6//6 12//12 9//9 3//3

f 6//6 14//14 13//13 12//12

f 16//16 17//17 18//18 15//15

f 3//3 11//11 17//17 16//16

f 4//4 3//3 16//16 15//15

f 19//19 20//20 14//14 6//6

f 21//21 19//19 6//6 8//8

f 21//21 22//22 20//20 19//19

f 15//15 18//18 23//23 4//4

f 4//4 23//23 25//25 24//24

f 26//26 8//8 4//4 24//24

f 26//26 27//27 28//28 8//8

f 8//8 28//28 22//22 21//21

f 24//24 25//25 27//27 26//26

f 13//13 14//14 11//11 10//10

f 11//11 23//23 18//18 17//17

f 11//11 29//29 30//30 23//23

f 14//14 31//31 29//29 11//11

f 28//28 32//32 31//31 14//14

f 20//20 22//22 28//28 14//14

f 23//23 30//30 32//32 28//28

f 28//28 27//27 25//25 23//23

f 31//31 32//32 30//30 29//29

# 30 faces, 0 coords texture



# End of File

meshes/fighter/fighter.blend

−2.66 KiB (779 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file