BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP Fullscreen Stuff (UI not scaling properly yet)

Browse Source
This commit is contained in:
sippeangelo
2014-06-01 03:05:42 +02:00
parent a6906886f5
commit 72420d4248
6 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GUI/Frame.h
+4
View File
@@ -25,6 +25,9 @@ public:
Bottom
};
static const float BaseWidth = 1280.f;
static const float BaseHeight = 720.f;
// Set up a base frame with an event broker
Frame(std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
: EventBroker(eventBroker)
@@ -180,6 +183,7 @@ protected:
std::string m_Name;
int m_Layer;
bool m_Hidden;
glm::vec2 Scale;
std::shared_ptr<Frame> m_Parent;
typedef std::multimap<std::string, std::shared_ptr<Frame>> Children_t; // name -> frame
src/GUI/GameFrame.h
+2 -2
View File
@@ -26,13 +26,13 @@ public:
{
vp1 = new Viewport(worldFrame, "Viewport1", m_World);
vp1->X = 0;
vp1->Width = 640;
vp1->Width = this->Width / 2.f;
//new PlayerHUD(vp1, "PlayerHUD", m_World, 1);
new VehicleSelection(vp1, "VehicleSelection", m_World, 1);
vp2 = new Viewport(worldFrame, "Viewport2", m_World);
vp2->X = vp1->Right();
vp2->Width = 640;
vp2->Width = this->Width / 2.f;
new PlayerHUD(vp2, "PlayerHUD", m_World, 2);
m_FreeCamViewport = new Viewport(worldFrame, "ViewportFreeCam", m_World);