Some test inputs and commentarys

This commit is contained in:
Julian Nießner
2018-05-25 12:13:06 +02:00
parent 3169790299
commit ae5fa3f2aa
14 changed files with 108 additions and 33 deletions

View File

@@ -1,5 +1,6 @@
#include "GameScreen.h"
#include <entityx/entityx.h>
#include <SDL.h>
#include <iostream>
@@ -8,6 +9,8 @@ GameScreen::GameScreen(Renderer* renderer, Assets* assets) {
this->renderer = renderer;
this->assets = assets;
//Vertex2D can be defined like this, because it an aggregate class.
// see https://stackoverflow.com/questions/4178175/what-are-aggregates-and-pods-and-how-why-are-they-special
std::vector<Vertex2D> vertices({
Vertex2D{glm::vec2(-0.5f,-0.5f), glm::vec2(0.0f,1.0f)},
Vertex2D{glm::vec2(0.5f,-0.5f), glm::vec2(1.0f,1.0f)},
@@ -22,6 +25,7 @@ GameScreen::GameScreen(Renderer* renderer, Assets* assets) {
obj = new Mesh(vertices,indices,assets->getTexture("police_officer"));
inputHandler = new InputHandler();
camera = new OrtographicCamera();
//Create Entities
@@ -33,6 +37,7 @@ GameScreen::GameScreen(Renderer* renderer, Assets* assets) {
GameScreen::~GameScreen() {
delete camera;
delete obj;
delete inputHandler;
}
void GameScreen::hide() {
@@ -52,7 +57,13 @@ void GameScreen::render() {
}
void GameScreen::update() {
SDL_Event event;
while(SDL_PollEvent(&event) != 0) {
Command* command = inputHandler->handleInput(&event);
if (command) {
command->execute(*camera);
}
}
}
void GameScreen::resize() {