TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 20:35:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #327 from thecelloman/smoothslope

Browse source 
Add a new Terrain brush action:  Smooth Slope.
This commit is contained in:
SilentMike 2013-04-10 14:47:09 -07:00
commit a9643a448d
8 changed files with 125 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Templates/Empty/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui
View file

@ -100,6 +100,28 @@
useMouseEvents = "0";
bitmap = "tools/worldEditor/images/smoothHeight";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "smoothSlope";
Enabled = "1";
isContainer = "0";
Profile = "GuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "144 0";
Extent = "25 19";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "ETerrainEditor.switchAction( smoothSlope );";
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Smooth Slope (5)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
useMouseEvents = "0";
bitmap = "tools/worldEditor/images/softCurve";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "paintNoise";
@ -115,7 +137,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( paintNoise );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Paint Noise (5)";
ToolTip = "Paint Noise (6)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -137,7 +159,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( flattenHeight );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Flatten (6)";
ToolTip = "Flatten (7)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -159,7 +181,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( setHeight );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Set Height (7)";
ToolTip = "Set Height (8)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -181,7 +203,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( setEmpty );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Clear Terrain (8)";
ToolTip = "Clear Terrain (9)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -203,7 +225,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( clearEmpty );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Restore Terrain (9)";
ToolTip = "Restore Terrain (0)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";

13
Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs
View file

@ -997,12 +997,13 @@ function TerrainEditorPlugin::onWorldEditorStartup( %this )
%map.bindCmd( keyboard, "1", "ToolsPaletteArray->brushAdjustHeight.performClick();", "" ); //Grab Terrain
%map.bindCmd( keyboard, "2", "ToolsPaletteArray->raiseHeight.performClick();", "" ); // Raise Height
%map.bindCmd( keyboard, "3", "ToolsPaletteArray->lowerHeight.performClick();", "" ); // Lower Height
%map.bindCmd( keyboard, "4", "ToolsPaletteArray->smoothHeight.performClick();", "" ); // Smooth
%map.bindCmd( keyboard, "5", "ToolsPaletteArray->paintNoise.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "4", "ToolsPaletteArray->smoothHeight.performClick();", "" ); // Average Height
%map.bindCmd( keyboard, "5", "ToolsPaletteArray->smoothSlope.performClick();", "" ); // Smooth Slope
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->paintNoise.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "0", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "v", "EWTerrainEditToolbarBrushType->ellipse.performClick();", "" );// Circle Brush
%map.bindCmd( keyboard, "b", "EWTerrainEditToolbarBrushType->box.performClick();", "" );// Box Brush
%map.bindCmd( keyboard, "=", "TerrainEditorPlugin.keyboardModifyBrushSize(1);", "" );// +1 Brush Size

32
Templates/Full/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui
View file

@ -100,6 +100,28 @@
useMouseEvents = "0";
bitmap = "tools/worldEditor/images/smoothHeight";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "smoothSlope";
Enabled = "1";
isContainer = "0";
Profile = "GuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "144 0";
Extent = "25 19";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "ETerrainEditor.switchAction( smoothSlope );";
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Smooth Slope (5)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
useMouseEvents = "0";
bitmap = "tools/worldEditor/images/softCurve";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "paintNoise";
@ -115,7 +137,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( paintNoise );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Paint Noise (5)";
ToolTip = "Paint Noise (6)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -137,7 +159,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( flattenHeight );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Flatten (6)";
ToolTip = "Flatten (7)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -159,7 +181,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( setHeight );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Set Height (7)";
ToolTip = "Set Height (8)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -181,7 +203,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( setEmpty );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Clear Terrain (8)";
ToolTip = "Clear Terrain (9)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";
@ -203,7 +225,7 @@
Visible = "1";
Command = "ETerrainEditor.switchAction( clearEmpty );";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Restore Terrain (9)";
ToolTip = "Restore Terrain (0)";
hovertime = "750";
text = "Button";
buttonType = "RadioButton";

13
Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs
View file

@ -997,12 +997,13 @@ function TerrainEditorPlugin::onWorldEditorStartup( %this )
%map.bindCmd( keyboard, "1", "ToolsPaletteArray->brushAdjustHeight.performClick();", "" ); //Grab Terrain
%map.bindCmd( keyboard, "2", "ToolsPaletteArray->raiseHeight.performClick();", "" ); // Raise Height
%map.bindCmd( keyboard, "3", "ToolsPaletteArray->lowerHeight.performClick();", "" ); // Lower Height
%map.bindCmd( keyboard, "4", "ToolsPaletteArray->smoothHeight.performClick();", "" ); // Smooth
%map.bindCmd( keyboard, "5", "ToolsPaletteArray->paintNoise.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "4", "ToolsPaletteArray->smoothHeight.performClick();", "" ); // Average Height
%map.bindCmd( keyboard, "5", "ToolsPaletteArray->smoothSlope.performClick();", "" ); // Smooth Slope
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->paintNoise.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "0", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "v", "EWTerrainEditToolbarBrushType->ellipse.performClick();", "" );// Circle Brush
%map.bindCmd( keyboard, "b", "EWTerrainEditToolbarBrushType->box.performClick();", "" );// Box Brush
%map.bindCmd( keyboard, "=", "TerrainEditorPlugin.keyboardModifyBrushSize(1);", "" );// +1 Brush Size