From 3d38dc60eb5fcda0ba99a7183e268157d2ff7067 Mon Sep 17 00:00:00 2001 From: Bloodknight Date: Sun, 28 Jul 2013 02:26:29 +0100 Subject: [PATCH] Increase terrain editor and painter max brush size to 256 x 256 --- Engine/source/gui/worldEditor/terrainEditor.cpp | 2 +- Engine/source/gui/worldEditor/terrainEditor.h | 2 +- Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui | 2 +- .../Empty/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui | 2 +- .../game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui | 2 +- Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui | 2 +- .../Full/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui | 2 +- .../game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Engine/source/gui/worldEditor/terrainEditor.cpp b/Engine/source/gui/worldEditor/terrainEditor.cpp index 70c012b39..3aa17e1be 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.cpp +++ b/Engine/source/gui/worldEditor/terrainEditor.cpp @@ -670,7 +670,7 @@ TerrainEditor::TerrainEditor() : mUndoSel(0), mGridUpdateMin( S32_MAX, S32_MAX ), mGridUpdateMax( 0, 0 ), - mMaxBrushSize(48,48), + mMaxBrushSize(256,256), mNeedsGridUpdate( false ), mNeedsMaterialUpdate( false ), mMouseDown( false ) diff --git a/Engine/source/gui/worldEditor/terrainEditor.h b/Engine/source/gui/worldEditor/terrainEditor.h index 1a361f591..f0d03daf3 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.h +++ b/Engine/source/gui/worldEditor/terrainEditor.h @@ -112,7 +112,7 @@ protected: public: - enum { MaxBrushDim = 40 }; + enum { MaxBrushDim = 256 }; Brush(TerrainEditor * editor); virtual ~Brush(){}; diff --git a/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui index 484d65fe9..445bacf63 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -531,7 +531,7 @@ selectionHidden = "1"; renderVertexSelection = "1"; processUsesBrush = "0"; - maxBrushSize = "40 40"; + maxBrushSize = "256 256"; adjustHeightVal = "10"; setHeightVal = "100"; scaleVal = "1"; diff --git a/Templates/Empty/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui index 34e880497..cc9d6983b 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui @@ -517,7 +517,7 @@ new GuiMouseEventCtrl(TerrainBrushSizeSliderCtrlContainer,EditorGuiGroup) { canSave = "1"; Visible = "1"; AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );"; - range = "1 40"; + range = "1 256"; ticks = "0"; value = "0"; }; diff --git a/Templates/Empty/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui index 3f98f8b60..8cdba481d 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui @@ -494,7 +494,7 @@ new GuiMouseEventCtrl(PaintBrushSizeSliderCtrlContainer,EditorGuiGroup) { canSave = "1"; Visible = "1"; AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );"; - range = "1 40"; + range = "1 256"; ticks = "0"; value = "0"; }; diff --git a/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui index 484d65fe9..445bacf63 100644 --- a/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -531,7 +531,7 @@ selectionHidden = "1"; renderVertexSelection = "1"; processUsesBrush = "0"; - maxBrushSize = "40 40"; + maxBrushSize = "256 256"; adjustHeightVal = "10"; setHeightVal = "100"; scaleVal = "1"; diff --git a/Templates/Full/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/Full/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui index 34e880497..cc9d6983b 100644 --- a/Templates/Full/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui @@ -517,7 +517,7 @@ new GuiMouseEventCtrl(TerrainBrushSizeSliderCtrlContainer,EditorGuiGroup) { canSave = "1"; Visible = "1"; AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );"; - range = "1 40"; + range = "1 256"; ticks = "0"; value = "0"; }; diff --git a/Templates/Full/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui b/Templates/Full/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui index 3f98f8b60..8cdba481d 100644 --- a/Templates/Full/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui @@ -494,7 +494,7 @@ new GuiMouseEventCtrl(PaintBrushSizeSliderCtrlContainer,EditorGuiGroup) { canSave = "1"; Visible = "1"; AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );"; - range = "1 40"; + range = "1 256"; ticks = "0"; value = "0"; };