Loading include/GlApplication.hpp +4 −2 Changes for include/GlApplication.hpp: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ #include <memory> #include "RenderObject.hpp" #include "model/Player.hpp" #include "model/Spaceship.hpp" class RenderObject; Loading @@ -29,7 +30,8 @@ class GlApplication : public Application { private: enum ModelKeys { SPACESHIP, SPACESHIP_1, SPACESHIP_2, PLANKS, TRON }; Loading @@ -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); Loading include/model/Player.hpp +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 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 Loading @@ -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: Loading meshes/cross.obj −114 File deleted. Show changes meshes/fighter/fighter.blend −2.66 KiB (779 KiB) File changed.No diff preview for this file type. View original file View changed file Loading
include/GlApplication.hpp +4 −2 Changes for include/GlApplication.hpp: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ #include <memory> #include "RenderObject.hpp" #include "model/Player.hpp" #include "model/Spaceship.hpp" class RenderObject; Loading @@ -29,7 +30,8 @@ class GlApplication : public Application { private: enum ModelKeys { SPACESHIP, SPACESHIP_1, SPACESHIP_2, PLANKS, TRON }; Loading @@ -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); Loading
include/model/Player.hpp +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
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 Loading @@ -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: Loading
meshes/fighter/fighter.blend −2.66 KiB (779 KiB) File changed.No diff preview for this file type. View original file View changed file