brammie15/dae16-VerhulstBram-GameProject
1
0
Fork 0
mirror of https://github.com/HowestDAE/dae16-VerhulstBram.git synced 2026-02-04 09:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Screen system

Browse Source 
Added FuelScreen (Working buttons)
Added SellScreen (Nothing working)
This commit is contained in:
Bram Verhulst
2024-04-04 00:07:45 +02:00
parent df9e2f0b64
commit eb4c7b4d76
20 changed files with 759 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Engine/structs.cpp
View File

@@ -1,6 +1,8 @@
#include "base.h"
#include "structs.h"
#include <ostream>
//-----------------------------------------------------------------
// Window Constructors
//-----------------------------------------------------------------
@@ -52,6 +54,10 @@ Point2f operator/(float right, const Point2f& left) {
Point2f operator*(float right, const Point2f& left) {
return Point2f{ right * left.x, right * left.y };
}
std::ostream& operator<<(std::ostream& os, const Point2f& p) {
os << "Point2f( " << p.x << ", " << p.y << " )" << std::endl;
return os;
}
//-----------------------------------------------------------------
// Rectf Constructors
//-----------------------------------------------------------------

3
Engine/structs.h
View File

@@ -26,6 +26,7 @@ struct Point2f
Point2f operator*( const Point2f& other ) const;
Point2f operator/( float other ) const;
Point2f operator-( const Point2f& other ) const;
float x;
float y;
@@ -34,6 +35,8 @@ struct Point2f
Point2f operator/(float right, const Point2f& left);
Point2f operator*(float right, const Point2f& left);
std::ostream& operator<<(std::ostream& os, const Point2f& p);
struct Rectf
{
Rectf( );

11
Engine/utils.cpp
View File

@@ -705,6 +705,17 @@ Point2f utils::GetMousePos() {
//TODO: make the screen size a global or something
return Point2f { float(x), float(500.f - y) };
}
bool utils::IsMouseButtonDown(int button) {
const Uint32 pStates = SDL_GetMouseState(nullptr, nullptr);
if (pStates & SDL_BUTTON(button)) {
return true;
}
return false;
}
static Point2f ViewportSize{ 900.f, 500.f }; //TODO: somehow move this (Ask teacher)
Point2f utils::GetViewport() {
return ViewportSize;
}
bool utils::isMouseDown(int button) {
const Uint32 pStates = SDL_GetMouseState(nullptr, nullptr);

5
Engine/utils.h
View File

@@ -112,5 +112,10 @@ namespace utils
bool isKeyUp(int keycode);
Point2f GetMousePos();
bool IsMouseButtonDown(int button);
Point2f GetViewport();
}