diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-25 16:53:48 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-25 16:53:48 (GMT) |
| commit | 25d872ec48b6af1e6bc682bdaadca173926b07d1 (patch) | |
| tree | 3c66cd4cf69ed2d8608e4bc702f6e6fed8a31528 /src/game/GameModel.cpp | |
| parent | 8d9b351568250cbd59c6cc4d390f790d6699332c (diff) | |
| download | powder-25d872ec48b6af1e6bc682bdaadca173926b07d1.zip powder-25d872ec48b6af1e6bc682bdaadca173926b07d1.tar.gz | |
MacOS X targets for Scons, Fix some inlines for clang
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index eca34a2..b601403 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -34,8 +34,20 @@ GameModel::GameModel(): sim = new Simulation(); ren = new Renderer(ui::Engine::Ref().g, sim); - std::fill(activeTools, activeTools+3, (Tool*)NULL); - + std::fill(activeTools, activeTools+3, (Tool*)NULL); + + //Default render prefs + std::vector<unsigned int> tempArray; + tempArray.push_back(RENDER_FIRE); + tempArray.push_back(RENDER_EFFE); + tempArray.push_back(RENDER_BASC); + ren->SetRenderMode(tempArray); + tempArray.clear(); + + ren->SetDisplayMode(tempArray); + + ren->SetColourMode(0); + //Load config into renderer try { @@ -60,7 +72,6 @@ GameModel::GameModel(): } catch(json::Exception & e) { - } //Load config into simulation |