diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-20 18:21:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-20 18:21:10 (GMT) |
| commit | 75a9460c835f4ebea501a89d23e0c5f46da985cc (patch) | |
| tree | 4a7d52842b508e8f4097c6becfe117639fcc6947 /src/game | |
| parent | 0bab640fe48a3b13eb01101977d0c5cb8fef199a (diff) | |
| download | powder-75a9460c835f4ebea501a89d23e0c5f46da985cc.zip powder-75a9460c835f4ebea501a89d23e0c5f46da985cc.tar.gz | |
OpenGL rendering
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/GameModel.cpp | 4 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 5a29d09..f832422 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -164,8 +164,8 @@ GameModel::~GameModel() delete clipboard; if(stamp) delete stamp; - if(activeTools) - delete activeTools; + //if(activeTools) + // delete[] activeTools; } void GameModel::SetVote(int direction) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index ae93f90..219c6ee 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -853,11 +853,13 @@ void GameView::OnDraw() Graphics * g = ui::Engine::Ref().g; if(ren) { + ren->clearScreen(1.0f); ren->draw_air(); ren->render_parts(); ren->render_fire(); - ren->draw_grav(); + //ren->draw_grav(); ren->DrawWalls(); + ren->FinaliseParts(); if(activeBrush && currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES) { if(drawMode==DrawRect && isMouseDown) |