Merge pull request #447 from Bloodknight/BKS_BigBrush

Increase terrain editing and painting brush max sizes
This commit is contained in:
SilentMike 2013-08-07 12:03:27 -07:00
commit 51204ee826
8 changed files with 8 additions and 8 deletions

View file

@ -670,7 +670,7 @@ TerrainEditor::TerrainEditor() :
mUndoSel(0), mUndoSel(0),
mGridUpdateMin( S32_MAX, S32_MAX ), mGridUpdateMin( S32_MAX, S32_MAX ),
mGridUpdateMax( 0, 0 ), mGridUpdateMax( 0, 0 ),
mMaxBrushSize(48,48), mMaxBrushSize(256,256),
mNeedsGridUpdate( false ), mNeedsGridUpdate( false ),
mNeedsMaterialUpdate( false ), mNeedsMaterialUpdate( false ),
mMouseDown( false ) mMouseDown( false )

View file

@ -112,7 +112,7 @@ protected:
public: public:
enum { MaxBrushDim = 40 }; enum { MaxBrushDim = 256 };
Brush(TerrainEditor * editor); Brush(TerrainEditor * editor);
virtual ~Brush(){}; virtual ~Brush(){};

View file

@ -531,7 +531,7 @@
selectionHidden = "1"; selectionHidden = "1";
renderVertexSelection = "1"; renderVertexSelection = "1";
processUsesBrush = "0"; processUsesBrush = "0";
maxBrushSize = "40 40"; maxBrushSize = "256 256";
adjustHeightVal = "10"; adjustHeightVal = "10";
setHeightVal = "100"; setHeightVal = "100";
scaleVal = "1"; scaleVal = "1";

View file

@ -517,7 +517,7 @@ new GuiMouseEventCtrl(TerrainBrushSizeSliderCtrlContainer,EditorGuiGroup) {
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );"; AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );";
range = "1 40"; range = "1 256";
ticks = "0"; ticks = "0";
value = "0"; value = "0";
}; };

View file

@ -494,7 +494,7 @@ new GuiMouseEventCtrl(PaintBrushSizeSliderCtrlContainer,EditorGuiGroup) {
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );"; AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );";
range = "1 40"; range = "1 256";
ticks = "0"; ticks = "0";
value = "0"; value = "0";
}; };

View file

@ -531,7 +531,7 @@
selectionHidden = "1"; selectionHidden = "1";
renderVertexSelection = "1"; renderVertexSelection = "1";
processUsesBrush = "0"; processUsesBrush = "0";
maxBrushSize = "40 40"; maxBrushSize = "256 256";
adjustHeightVal = "10"; adjustHeightVal = "10";
setHeightVal = "100"; setHeightVal = "100";
scaleVal = "1"; scaleVal = "1";

View file

@ -517,7 +517,7 @@ new GuiMouseEventCtrl(TerrainBrushSizeSliderCtrlContainer,EditorGuiGroup) {
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );"; AltCommand = "TerrainBrushSizeTextEditContainer-->textEdit.setValue(mCeil($ThisControl.getValue())); ETerrainEditor.setBrushSize( $ThisControl.value );";
range = "1 40"; range = "1 256";
ticks = "0"; ticks = "0";
value = "0"; value = "0";
}; };

View file

@ -494,7 +494,7 @@ new GuiMouseEventCtrl(PaintBrushSizeSliderCtrlContainer,EditorGuiGroup) {
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );"; AltCommand = "PaintBrushSizeTextEditContainer-->textEdit.setValue(mFloatLength( ($ThisControl.getValue()), 2 )); ETerrainEditor.setBrushSize( $ThisControl.value );";
range = "1 40"; range = "1 256";
ticks = "0"; ticks = "0";
value = "0"; value = "0";
}; };