mirror of
https://github.com/HowestDAE/dae16-VerhulstBram.git
synced 2025-12-16 14:41:49 +01:00
Fix precompiled headers
Added edge detection (if it works :/)
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
#include <imgui.h>
|
||||
#include "pch.h"
|
||||
#include "Game.h"
|
||||
|
||||
@@ -6,13 +5,14 @@
|
||||
|
||||
#include "colors.h"
|
||||
#include "utils.h"
|
||||
#include "WorldLevel.h"
|
||||
#include "Levels/World/WorldLevel.h"
|
||||
|
||||
|
||||
Rectf Game::VIEWPORT {};
|
||||
|
||||
Game::Game(const Window& window)
|
||||
: BaseGame { window }, m_Camera(Camera()), m_WorldLevel(WorldLevel(&m_Camera, GetViewPort())) {
|
||||
: BaseGame { window }, m_Camera(Camera()), m_WorldLevel(WorldLevel(&m_Camera, GetViewPort())),
|
||||
m_MainMenuLevel(MainMenuLevel(&m_Camera)), m_pCurrentLevel(&m_WorldLevel) {
|
||||
Initialize();
|
||||
Game::VIEWPORT = GetViewPort(); //TODO: See if this can be removed
|
||||
}
|
||||
@@ -39,13 +39,13 @@ void Game::Update(float elapsedSec) {
|
||||
m_MouseOffset = m_Camera.GetPosition();
|
||||
}
|
||||
|
||||
m_WorldLevel.Update(elapsedSec);
|
||||
m_pCurrentLevel->Update(elapsedSec);
|
||||
}
|
||||
|
||||
|
||||
void Game::Draw() const {
|
||||
utils::ClearBackground(Color4f(0.0f, 0.0f, 0.3f, 1.0f));
|
||||
m_WorldLevel.Draw();
|
||||
m_pCurrentLevel->Draw();
|
||||
}
|
||||
|
||||
void Game::ProcessKeyDownEvent(const SDL_KeyboardEvent& e) {
|
||||
@@ -57,7 +57,7 @@ void Game::ProcessKeyUpEvent(const SDL_KeyboardEvent& e) {
|
||||
|
||||
void Game::ProcessMouseMotionEvent(const SDL_MouseMotionEvent& e) {
|
||||
m_MousePos = Point2f { float(e.x), float(e.y) };
|
||||
m_WorldLevel.MouseMove(Point2f { float(e.x), float(e.y) });
|
||||
m_pCurrentLevel->MouseMove(Point2f { float(e.x), float(e.y) });
|
||||
}
|
||||
|
||||
void Game::ProcessMouseDownEvent(const SDL_MouseButtonEvent& e) {
|
||||
@@ -82,5 +82,5 @@ void Game::ProcessMouseUpEvent(const SDL_MouseButtonEvent& e) {
|
||||
//}
|
||||
}
|
||||
void Game::ProcessImGui() {
|
||||
m_WorldLevel.ProcessImGui();
|
||||
m_pCurrentLevel->ProcessImGui();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user