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

Merge pull request #1388 from Azaezel/alpha41/erosionBrushes

Browse source 
additional terrain brushes
This commit is contained in:
Brian Roberts 2025-02-20 12:08:22 -06:00 • committed by GitHub
commit 7bb8587db5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 349 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 890 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_d_image"
imageFile="@assetFile=Copy_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 741 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_h_image"
imageFile="@assetFile=Copy_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_n_image"
imageFile="@assetFile=Copy_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 729 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_d_image"
imageFile="@assetFile=erodeH_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 640 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_h_image"
imageFile="@assetFile=erodeH_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 509 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_n_image"
imageFile="@assetFile=erodeH_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 477 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_d_image"
imageFile="@assetFile=erodeT_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 468 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_h_image"
imageFile="@assetFile=erodeT_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 427 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_n_image"
imageFile="@assetFile=erodeT_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 898 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_d_image"
imageFile="@assetFile=pasteDown_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 739 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_h_image"
imageFile="@assetFile=pasteDown_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 633 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_n_image"
imageFile="@assetFile=pasteDown_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 958 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_d_image"
imageFile="@assetFile=pasteUp_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 776 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_h_image"
imageFile="@assetFile=pasteUp_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 619 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_n_image"
imageFile="@assetFile=pasteUp_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 745 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_d_image"
imageFile="@assetFile=paste_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 661 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_h_image"
imageFile="@assetFile=paste_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 556 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_n_image"
imageFile="@assetFile=paste_terr_n.png"/>

26
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -1205,10 +1205,12 @@ function TerrainEditorPlugin::onWorldEditorStartup( %this )
%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, "6", "ToolsPaletteArray->thermalErode.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->hydraulicErode.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "0", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "shift 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
@ -1248,11 +1250,17 @@ function EditorGui::SetTerrainPalletBar()
EWToolsPaletteWindow.addButton("LowerHeight", "ToolsModule:lowerHeight_n_image", "ETerrainEditor.switchAction( lowerHeight );", "", "Lower Height", "3");
EWToolsPaletteWindow.addButton("SmoothHeight", "ToolsModule:smoothHeight_n_image", "ETerrainEditor.switchAction( smoothHeight );", "", "Smooth Height", "4");
EWToolsPaletteWindow.addButton("SmoothSlope", "ToolsModule:softCurve_n_image", "ETerrainEditor.switchAction( smoothSlope );", "", "Smooth Slope", "5");
EWToolsPaletteWindow.addButton("PaintNoise", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( paintNoise );", "", "Paint Noise", "6");
EWToolsPaletteWindow.addButton("FlattenHeight", "ToolsModule:flattenHeight_n_image", "ETerrainEditor.switchAction( flattenHeight );", "", "Flatten Height", "7");
EWToolsPaletteWindow.addButton("SetHeight", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( setHeight );", "", "Set Height", "8");
EWToolsPaletteWindow.addButton("SetEmpty", "ToolsModule:setEmpty_n_image", "ETerrainEditor.switchAction( setEmpty );", "", "Set Empty", "9");
EWToolsPaletteWindow.addButton("ClearEmpty", "ToolsModule:clearEmpty_n_image", "ETerrainEditor.switchAction( clearEmpty );", "", "Clear Empty", "0");
EWToolsPaletteWindow.addButton("PaintNoise", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( paintNoise );", "", "Paint Noise", "6");
EWToolsPaletteWindow.addButton("thermalErode", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( thermalErode );", "", "thermal Erode", "7");
EWToolsPaletteWindow.addButton("hydraulicErode", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( hydraulicErode );", "", "hydraulic Erode", "8");
EWToolsPaletteWindow.addButton("FlattenHeight", "ToolsModule:flattenHeight_n_image", "ETerrainEditor.switchAction( flattenHeight );", "", "Flatten Height", "9");
EWToolsPaletteWindow.addButton("SetHeight", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( setHeight );", "", "Set Height", "0");
EWToolsPaletteWindow.addButton("SetEmpty", "ToolsModule:setEmpty_n_image", "ETerrainEditor.switchAction( setEmpty );", "", "Set Empty", "0");
EWToolsPaletteWindow.addButton("ClearEmpty", "ToolsModule:clearEmpty_n_image", "ETerrainEditor.switchAction( clearEmpty );", "", "Clear Empty", "shift 0");
EWToolsPaletteWindow.addButton("Copy", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( copy );", "", "copy", "ctrl C");
EWToolsPaletteWindow.addButton("Paste", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( paste );", "", "paste", "ctrl v");
EWToolsPaletteWindow.addButton("pasteUp", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( pasteUp );", "", "pasteUp", "ctrl b");
EWToolsPaletteWindow.addButton("PasteDown", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( pasteDown );", "", "pasteDown", "ctrl n");
EWToolsPaletteWindow.refresh();
}