Gulum/DarkRP2D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Screens

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

37
src/DarkRP2D.cpp
View File

@@ -7,7 +7,7 @@
#include <GL/glew.h>
#include <iostream>
#include <entityx/entityx.h>
#include "screens/GameScreen.h"
DarkRP2D::~DarkRP2D() {
std::cout << "Game got destroyed!" << std::endl;
@@ -15,15 +15,14 @@ DarkRP2D::~DarkRP2D() {
ImGui_ImplSdlGL3_Shutdown();
ImGui::DestroyContext();
#endif
delete gameScreen;
delete assets;
delete obj;
delete inputHandler;
delete camera;
delete renderer;
}
void DarkRP2D::create () {
std::cout << "Hello World!" << std::endl;
std::cout << "Game got created!" << std::endl;
assets = new Assets();
assets->loadTexture("police_officer.png",true,"police_officer");
assets->loadShader("vert.shader","frag.shader",nullptr,"defaultShader");
@@ -31,26 +30,11 @@ void DarkRP2D::create () {
renderer = new Renderer();
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"));
inputHandler = new InputHandler();
font = new BitmapFont("arial.ttf");
camera = new OrtographicCamera();
entityx::EntityX ex;
entityx::Entity charakter = ex.entities.create();
charakter.assign<Position>();
gameScreen = new GameScreen(renderer,assets);
gameScreen->show();
#ifndef NDEBUG
//Setup IMGUI debugging
@@ -89,8 +73,7 @@ void DarkRP2D::update(unsigned int delta) {
command->execute();
}
}
//camera update
gameScreen->update();
}
#ifndef NDEBUG
@@ -104,17 +87,12 @@ void DarkRP2D::render(unsigned int delta) {
#ifndef NDEBUG
ImGui_ImplSdlGL3_NewFrame(gWindow);
#endif
//Drawing
Shader defaultShader = assets->getShader("defaultShader");
defaultShader.SetMatrix4("MVP",camera->getCombinedMatrix(),true);
//Draw Mesh
renderer->draw(*obj,defaultShader);
//texttest
Shader bitmapShader = assets->getShader("bitmapShader");
font->drawText(bitmapShader, "Hallo du noob", 25.0f, 25.0f, 1.f, glm::vec3(0.5f,0.8f,0.2f));
gameScreen->render();
#ifndef NDEBUG
// 1. Show a simple window.
@@ -135,6 +113,7 @@ void DarkRP2D::render(unsigned int delta) {
ImGui::Render();
ImGui_ImplSdlGL3_RenderDrawData(ImGui::GetDrawData());
#endif
SDL_GL_SwapWindow(gWindow);
}