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

Rectangle definition conflicted with a definition included by <boost/asio.hpp>.

Browse Source
This commit is contained in:
stiffly
2015-12-07 16:52:42 +01:00
parent d8d63f804a
commit de5bdef58c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/IRenderer.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual void Draw(RenderQueueCollection& rq) = 0; virtual void Draw(RenderQueueCollection& rq) = 0;
protected: protected:
Rectangle m_Resolution = Rectangle(1280, 720); Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
bool m_Fullscreen = false; bool m_Fullscreen = false;
bool m_VSYNC = false; bool m_VSYNC = false;
int m_GLVersion[2]; int m_GLVersion[2];
src/Game/Game.cpp
+12 -2
View File
@@ -1,5 +1,6 @@
#include "Game.h" #include "Game.h"
#include "HardcodedTestWorld.h" #include "HardcodedTestWorld.h"
#include "Network/Client.h"
Game::Game(int argc, char* argv[]) Game::Game(int argc, char* argv[])
{ {
@@ -17,12 +18,12 @@ Game::Game(int argc, char* argv[])
m_Renderer = new Renderer(); m_Renderer = new Renderer();
m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false)); m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false)); m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
m_Renderer->SetResolution(Rectangle( m_Renderer->SetResolution(Rectangle::Rectangle(
0, 0,
0, 0,
m_Config->Get<int>("Video.Width", 1280), m_Config->Get<int>("Video.Width", 1280),
m_Config->Get<int>("Video.Height", 720) m_Config->Get<int>("Video.Height", 720)
)); ));
m_Renderer->Initialize(); m_Renderer->Initialize();
// Create input manager // Create input manager
@@ -36,6 +37,15 @@ Game::Game(int argc, char* argv[])
// Create a TEST WORLD // Create a TEST WORLD
m_World = new HardcodedTestWorld(); m_World = new HardcodedTestWorld();
// TEMP: Invoke network
std::string inputMessage;
std::cout << "Start client or server? (c/s)" << std::endl;
std::cin >> inputMessage;
if (inputMessage == "c" || inputMessage == "C") {
Client client;
client.Start();
}
m_LastTime = glfwGetTime(); m_LastTime = glfwGetTime();
} }