Added Screens

This commit is contained in:
Julian Nießner
2018-05-11 10:48:06 +02:00
parent c7426bf24b
commit d07c36a4f7
5 changed files with 66 additions and 35 deletions

View File

@@ -1,7 +1,38 @@
#include "GameScreen.h"
#include <entityx/entityx.h>
GameScreen::GameScreen() {
#include <iostream>
GameScreen::GameScreen(Renderer* renderer, Assets* assets) {
std::cout << "GameScreen got created!" << std::endl;
this->renderer = renderer;
this->assets = assets;
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)},
Vertex2D{glm::vec2(0.5f,0.5f), glm::vec2(1.0f,0.0f)},
Vertex2D{glm::vec2(-0.5f,0.5f), glm::vec2(0.0f,0.0f)}
});
std::vector<unsigned int> indices({
0,1,3,
1,2,3
});
obj = new Mesh(vertices,indices,assets->getTexture("police_officer"));
camera = new OrtographicCamera();
//Create Entities
//entityx::EntityX ex;
//entityx::Entity charakter = ex.entities.create();
//charakter.assign<Position>();
}
GameScreen::~GameScreen() {
delete camera;
delete obj;
}
void GameScreen::hide() {
@@ -13,6 +44,14 @@ void GameScreen::pause() {
}
void GameScreen::render() {
//Drawing
Shader defaultShader = assets->getShader("defaultShader");
defaultShader.SetMatrix4("MVP",camera->getCombinedMatrix(),true);
//Draw Mesh
renderer->draw(*obj,defaultShader);
}
void GameScreen::update() {
}