Semi-working world rendering

2014-05-26 23:28:11 +02:00
parent 74239300bd
commit d4b28a2228
15 changed files with 509 additions and 206 deletions
@@ -4,6 +4,7 @@
 #include "GUI/Frame.h"
 #include "GUI/WorldFrame.h"
 #include "GUI/Viewport.h"
+#include "GUI/TextureFrame.h"

 #include "GameWorld.h"

@@ -17,27 +18,25 @@ public:
 		: Frame(parent, name)
 	{
 		m_World = std::make_shared<GameWorld>(EventBroker, ResourceManager);
-		m_World->Initialize();
-
 		auto worldFrame = new WorldFrame(this, "GameWorldFrame", m_World);
 		{
-			new Viewport(worldFrame, "Viewport1", m_World);
-			new Viewport(worldFrame, "Viewport2", m_World);
+			vp1 = new Viewport(worldFrame, "Viewport1", m_World);
+			vp1->X = 0;
+			vp1->Width = 640;
+			vp2 = new Viewport(worldFrame, "Viewport2", m_World);
+			vp2->X = vp1->Right();
+			vp2->Width = 640;
+
+			auto tex = new TextureFrame(vp1, "TextureFrameThingy");
+			tex->SetTexture("Textures/GUI/hurt.png");
 		}
-	}
-
-	void Update(double dt) override
-	{
-		
-	}
-
-	void Draw(std::shared_ptr<Renderer> renderer) override
-	{
-		
+		m_World->Initialize();
 	}

 private:
 	std::shared_ptr<GameWorld> m_World;
+	Viewport* vp1;
+	Viewport* vp2;
 };

 }