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

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

parent 4a50779d
Loading
Loading
Loading
Loading
+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);
+3
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
+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:
−114

File deleted.

−2.66 KiB (779 KiB)

File changed.

No diff preview for this file type.

Loading