TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

terrain brush dragging cleanups

Browse source
This commit is contained in:
AzaezelX 2021-01-27 23:36:23 -06:00
parent 762a84550f
commit 66db6ac376
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/gui/worldEditor/terrainEditor.cpp
View file

@ -1841,6 +1841,7 @@ void TerrainEditor::on3DMouseMove(const Gui3DMouseEvent & event)
if(!hitTerrain) if(!hitTerrain)
{ {
mMouseBrush->reset(); mMouseBrush->reset();
return;
} }
else else
{ {
@ -1875,17 +1876,19 @@ void TerrainEditor::on3DMouseDragged(const Gui3DMouseEvent & event)
return; return;
Point3F pos; Point3F pos;
if ( !mSelectionLocked )
{
if ( !collide( event, pos) )
mMouseBrush->reset();
}
// check if the mouse has actually moved in grid space
bool selChanged = false; bool selChanged = false;
if ( !mSelectionLocked ) if ( !mSelectionLocked )
{ {
TerrainBlock* hitTerrain = collide(event, pos);
if (!hitTerrain)
{
mMouseBrush->reset();
return;
}
// check if the mouse has actually moved in grid space
Point2I gMouse; Point2I gMouse;
Point2I gLastMouse; Point2I gLastMouse;
worldToGrid( pos, gMouse ); worldToGrid( pos, gMouse );
@ -1896,8 +1899,8 @@ void TerrainEditor::on3DMouseDragged(const Gui3DMouseEvent & event)
selChanged = gMouse != gLastMouse; selChanged = gMouse != gLastMouse;
} }
if (selChanged)
mCurrentAction->process( mMouseBrush, event, true, TerrainAction::Update ); mCurrentAction->process( mMouseBrush, event, true, TerrainAction::Update );
} }
void TerrainEditor::on3DMouseUp(const Gui3DMouseEvent & event) void TerrainEditor::on3DMouseUp(const Gui3DMouseEvent & event)