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

Merge pull request #795 from Azaezel/alpha40/forrestfunteims

Browse source 
lower min brushsize for forest to sub-meter levels
This commit is contained in:
Brian Roberts 2022-05-30 16:35:35 -05:00 • committed by GitHub
commit 9486587014
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui
View file

@ -110,7 +110,7 @@ $guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
MinExtent = "8 16"; MinExtent = "8 16";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "ForestTools->BrushTool.size = mClamp($ThisControl.getValue(), 1, getWord(ETerrainEditor.maxBrushSize, 0));"; AltCommand = "ForestTools->BrushTool.size = mClamp($ThisControl.getValue(), 0.1, getWord(ETerrainEditor.maxBrushSize, 0));";
validate = "ForestEditorGui.validateBrushSize();"; validate = "ForestEditorGui.validateBrushSize();";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
@ -369,7 +369,7 @@ new GuiMouseEventCtrl(ForestBrushSizeSliderCtrlContainer,EditorGuiGroup) {
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "ForestTools->BrushTool.size = $ThisControl.value;"; AltCommand = "ForestTools->BrushTool.size = $ThisControl.value;";
range = "1" SPC getWord(ETerrainEditor.maxBrushSize, 0); range = "0.1" SPC getWord(ETerrainEditor.maxBrushSize, 0);
ticks = "0"; ticks = "0";
value = "0"; value = "0";
}; };

4
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript
View file

@ -303,7 +303,7 @@ function ForestEditorGui::okDeleteMesh( %this, %mesh )
function ForestEditorGui::validateBrushSize( %this ) function ForestEditorGui::validateBrushSize( %this )
{ {
%minBrushSize = 1; %minBrushSize = 0.1;
%maxBrushSize = getWord(ETerrainEditor.maxBrushSize, 0); %maxBrushSize = getWord(ETerrainEditor.maxBrushSize, 0);
%val = $ThisControl.getText(); %val = $ThisControl.getText();
@ -531,6 +531,6 @@ function ForestEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeSt
function ForestBrushSizeSliderCtrlContainer::onWake(%this) function ForestBrushSizeSliderCtrlContainer::onWake(%this)
{ {
%this-->slider.range = "1" SPC getWord(ETerrainEditor.maxBrushSize, 0); %this-->slider.range = "0.1" SPC getWord(ETerrainEditor.maxBrushSize, 0);
%this-->slider.setValue(ForestBrushSizeTextEditContainer-->textEdit.getValue()); %this-->slider.setValue(ForestBrushSizeTextEditContainer-->textEdit.getValue());
} }