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

Tool - Correct box drawing. Finishing touches to tool strength (Fixes #87)

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-10 14:12:56 +01:00
parent 810ea42f99
commit a45ca0363e
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/game/GameView.cpp
View File

@ -1142,25 +1142,31 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
enableAltBehaviour(); enableAltBehaviour();
break; break;
case KEY_CTRL: case KEY_CTRL:
if(drawModeReset) if(!isMouseDown)
drawModeReset = false; {
else if(drawModeReset)
drawPoint1 = currentMouse; drawModeReset = false;
if(shift) else
drawMode = DrawFill; drawPoint1 = currentMouse;
else if(shift)
drawMode = DrawRect; drawMode = DrawFill;
else
drawMode = DrawRect;
}
enableCtrlBehaviour(); enableCtrlBehaviour();
break; break;
case KEY_SHIFT: case KEY_SHIFT:
if(drawModeReset) if(!isMouseDown)
drawModeReset = false; {
else if(drawModeReset)
drawPoint1 = currentMouse; drawModeReset = false;
if(ctrl) else
drawMode = DrawFill; drawPoint1 = currentMouse;
else if(ctrl)
drawMode = DrawLine; drawMode = DrawFill;
else
drawMode = DrawLine;
}
enableShiftBehaviour(); enableShiftBehaviour();
break; break;
case ' ': //Space case ' ': //Space
@ -1538,10 +1544,13 @@ void GameView::enableShiftBehaviour()
if(!shiftBehaviour) if(!shiftBehaviour)
{ {
shiftBehaviour = true; shiftBehaviour = true;
if(!ctrlBehaviour) if(isMouseDown)
c->SetToolStrength(10.0f); {
else if(!ctrlBehaviour)
c->SetToolStrength(1.0f); c->SetToolStrength(10.0f);
else
c->SetToolStrength(1.0f);
}
} }
} }
@ -1584,10 +1593,13 @@ void GameView::enableCtrlBehaviour()
saveSimulationButton->Appearance.TextInactive = ui::Colour(0, 0, 0); saveSimulationButton->Appearance.TextInactive = ui::Colour(0, 0, 0);
searchButton->Appearance.BackgroundInactive = ui::Colour(255, 255, 255); searchButton->Appearance.BackgroundInactive = ui::Colour(255, 255, 255);
searchButton->Appearance.TextInactive = ui::Colour(0, 0, 0); searchButton->Appearance.TextInactive = ui::Colour(0, 0, 0);
if(!shiftBehaviour) if(isMouseDown)
c->SetToolStrength(.1f); {
else if(!shiftBehaviour)
c->SetToolStrength(1.0f); c->SetToolStrength(.1f);
else
c->SetToolStrength(1.0f);
}
} }
} }

2
src/simulation/Simulation.cpp
View File

@ -1107,7 +1107,7 @@ void Simulation::ToolBox(int x1, int y1, int x2, int y2, int tool, Brush * cBrus
} }
for (j=y1; j<=y2; j++) for (j=y1; j<=y2; j++)
for (i=x1; i<=x2; i++) for (i=x1; i<=x2; i++)
ToolBrush(i, j, tool, cBrush, strength); Tool(i, j, tool, strength);
} }
int Simulation::CreateParts(int positionX, int positionY, int c, Brush * cBrush) int Simulation::CreateParts(int positionX, int positionY, int c, Brush * cBrush)