From 218caea9e8004523876e2dc7a98da0129a78b2bb Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 28 Oct 2024 09:39:02 -0500 Subject: [PATCH] remove filtes on misbehaving brushes. correct range defaults --- Engine/source/gui/worldEditor/terrainActions.cpp | 9 --------- .../game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui | 2 +- .../tools/worldEditor/gui/TerrainPainterToolbar.ed.gui | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Engine/source/gui/worldEditor/terrainActions.cpp b/Engine/source/gui/worldEditor/terrainActions.cpp index bc4cfba7a..2552a4d78 100644 --- a/Engine/source/gui/worldEditor/terrainActions.cpp +++ b/Engine/source/gui/worldEditor/terrainActions.cpp @@ -525,9 +525,6 @@ void BrushAdjustHeightAction::process(Selection * sel, const Gui3DMouseEvent & e // and record the starting heights for(U32 i = 0; i < sel->size(); i++) { - if (!isValid((*sel)[i])) - continue; - mTerrainEditor->getUndoSel()->add((*sel)[i]); (*sel)[i].mStartHeight = (*sel)[i].mHeight; } @@ -654,9 +651,6 @@ void SmoothHeightAction::process(Selection * sel, const Gui3DMouseEvent &, bool // linear for(U32 i = 0; i < sel->size(); i++) { - if (!isValid((*sel)[i])) - continue; - (*sel)[i].mHeight += (avgHeight - (*sel)[i].mHeight) * mTerrainEditor->mSmoothFactor * (*sel)[i].mWeight; mTerrainEditor->setGridInfo((*sel)[i]); } @@ -701,9 +695,6 @@ void SmoothSlopeAction::process(Selection * sel, const Gui3DMouseEvent &, bool s F32 goalHeight; for(U32 i = 0; i < sel->size(); i++) { - if (!isValid((*sel)[i])) - continue; - goalHeight = avgHeight + ((*sel)[i].mGridPoint.gridPos.x - avgPos.x)*avgSlope.x + ((*sel)[i].mGridPoint.gridPos.y - avgPos.y)*avgSlope.y; (*sel)[i].mHeight += (goalHeight - (*sel)[i].mHeight) * (*sel)[i].mWeight; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui index e19e198e6..95e023be4 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui @@ -667,7 +667,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "90.0"; + text = "2047"; maxLength = "4"; historySize = "0"; password = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui index 265a9d2fd..1b3edf239 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui @@ -461,7 +461,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "90.0"; + text = "2047"; maxLength = "4"; historySize = "0"; password = "0";