brammie15/dae16-VerhulstBram-GameProject
1
0
Fork 0
mirror of https://github.com/HowestDAE/dae16-VerhulstBram.git synced 2025-12-16 14:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix camera, added more collsion stuff

Browse Source 
added pink color
This commit is contained in:
Bram Verhulst
2024-03-19 10:20:07 +01:00
parent 6f2a6ead37
commit d5e4aa9752
13 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Game/Game.cpp
View File

@@ -9,10 +9,14 @@
#include "utils.h"
#include "WorldLevel.h"
Rectf Game::VIEWPORT{};
Game::Game(const Window& window)
: BaseGame { window }, m_Camera(Camera()), m_WorldLevel(WorldLevel(&m_Camera, GetViewPort()))
{
Initialize();
Game::VIEWPORT = GetViewPort(); //TODO: See if this can be removed
}
Game::~Game() {
@@ -28,18 +32,6 @@ void Game::Cleanup() {
void Game::Update(float elapsedSec) {
const Uint8* pStates = SDL_GetKeyboardState(nullptr);
// if (pStates[SDL_SCANCODE_RIGHT]) {
// m_CameraOffset.x += 200 * elapsedSec;
// }
// if (pStates[SDL_SCANCODE_LEFT]) {
// m_CameraOffset.x -= 200 * elapsedSec;
// }
// if (pStates[SDL_SCANCODE_UP]) {
// m_CameraOffset.y += 200 * elapsedSec;
// }
// if (pStates[SDL_SCANCODE_DOWN]) {
// m_CameraOffset.y -= 200 * elapsedSec;
// }
if(m_IsRightMouseDown) {
Point2f newCameraPos = m_MousePos + m_MouseOffset;
@@ -50,9 +42,9 @@ void Game::Update(float elapsedSec) {
m_WorldLevel.Update(elapsedSec);
}
void Game::Draw() const {
utils::ClearBackground(Color4f(0.0f, 0.0f, 0.3f, 1.0f));
m_WorldLevel.Draw();
@@ -66,8 +58,8 @@ 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(m_MousePos);
m_MousePos = Point2f{float(e.x), float(e.y)};
m_WorldLevel.MouseMove(Point2f { float(e.x), float(e.y) });
}
void Game::ProcessMouseDownEvent(const SDL_MouseButtonEvent& e) {
@@ -92,8 +84,5 @@ void Game::ProcessMouseUpEvent(const SDL_MouseButtonEvent& e) {
//}
}
void Game::ProcessImGui() {
m_WorldLevel.ProcessImGui();
}