matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep GameModel brush radius consistent

Browse Source
This commit is contained in:
Tamás Bálint Misius 2019-09-30 14:55:17 +02:00
parent 024c3c1b45
commit ec2576d37f
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/game/GameController.cpp
View File

@ -446,11 +446,11 @@ void GameController::AdjustBrushSize(int delta, bool logarithmic, bool xAxis, bo
newSize.Y = 200; newSize.Y = 200;
if(xAxis) if(xAxis)
gameModel->GetBrush()->SetRadius(ui::Point(newSize.X, oldSize.Y)); SetBrushSize(ui::Point(newSize.X, oldSize.Y));
else if(yAxis) else if(yAxis)
gameModel->GetBrush()->SetRadius(ui::Point(oldSize.X, newSize.Y)); SetBrushSize(ui::Point(oldSize.X, newSize.Y));
else else
gameModel->GetBrush()->SetRadius(newSize); SetBrushSize(newSize);
} }
void GameController::SetBrushSize(ui::Point newSize) void GameController::SetBrushSize(ui::Point newSize)
@ -1582,7 +1582,9 @@ void GameController::Vote(int direction)
void GameController::ChangeBrush() void GameController::ChangeBrush()
{ {
auto prev_size = gameModel->GetBrush()->GetRadius();
gameModel->SetBrushID(gameModel->GetBrushID()+1); gameModel->SetBrushID(gameModel->GetBrushID()+1);
gameModel->GetBrush()->SetRadius(prev_size);
} }
void GameController::ClearSim() void GameController::ClearSim()