diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-05 16:02:03 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-05 16:02:03 (GMT) |
| commit | d379390d066add46513da73a690ef20414b6627b (patch) | |
| tree | 26ccfc41191a5a9a8624fa716880f9e3a6ba4475 /src | |
| parent | 3f437636950f599a664d0644402d7d08d9243890 (diff) | |
| download | powder-d379390d066add46513da73a690ef20414b6627b.zip powder-d379390d066add46513da73a690ef20414b6627b.tar.gz | |
Newtonian gravity field info in HUD (Maybe we could have an arrow to show direction in future). Fixed #152
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GameModel.cpp | 6 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index e083251..8c4954f 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -290,9 +290,9 @@ void GameModel::BuildMenus() brushList.push_back(new TriangleBrush(ui::Point(4, 4))); //Set default tools - activeTools[0] = GetToolFromIdentifier("DEFAULT_PT_DUST");//menuList[SC_POWDERS]->GetToolList()[0]; - activeTools[1] = GetToolFromIdentifier("DEFAULT_UI_SAMPLE");//menuList[SC_SPECIAL]->GetToolList()[0]; - activeTools[2] = GetToolFromIdentifier("DEFAULT_PT_NONE");//menuList[SC_TOOL]->GetToolList()[0]; + activeTools[0] = GetToolFromIdentifier("DEFAULT_PT_DUST"); + activeTools[2] = GetToolFromIdentifier("DEFAULT_PT_NONE"); + activeTools[1] = GetToolFromIdentifier("DEFAULT_UI_SAMPLE"); if(activeToolIdentifiers[0].length()) activeTools[0] = GetToolFromIdentifier(activeToolIdentifiers[0]); diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 8b7ee2e..3955c67 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -2004,6 +2004,8 @@ void GameView::OnDraw() sampleInfo << "#" << sample.ParticleID << ", "; } sampleInfo << "X:" << sample.PositionX << " Y:" << sample.PositionY; + if (std::abs(sample.Gravity) > 0.1f) + sampleInfo << " GX: " << sample.GravityVelocityX << " GY: " << sample.GravityVelocityY; textWidth = Graphics::textwidth((char*)sampleInfo.str().c_str()); g->fillrect(XRES-20-textWidth, 26, textWidth+8, 15, 0, 0, 0, 255*0.5); |