TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidates and standardizes terrain creation between the editor, asset browser and creator panel

Browse source 
Also shifts terrain data importing into the new terrain asset window instead of separate in the File menu
Also removes redundant loadMaterials call that caused duplicates in the Terrain Painter material list
This commit is contained in:
Areloch 2020-12-28 23:43:56 -06:00
parent e9dba74891
commit f7ce1efd62
8 changed files with 104 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

135
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui
View file

@ -328,10 +328,10 @@
canSave = "1";
isDecoy = "0";
Visible = "1";
Command = "TerrainImportGui.import();";
Command = "TerrainImportGui.acceptSettings();";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = "Import";
text = "Accept";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -414,60 +414,6 @@
text = "Channels";
maxLength = "1024";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "11 26";
Extent = "64 18";
MinExtent = "8 2";
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "Name:";
maxLength = "1024";
};
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
internalName = "TerrainName";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "10 44";
Extent = "206 18";
MinExtent = "8 2";
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "theTerrain";
maxLength = "1024";
historySize = "0";
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
passwordMask = "*";
};
new GuiButtonCtrl() {
canSaveDynamicFields = "0";
Enabled = "1";
@ -502,7 +448,7 @@
canSave = "1";
isDecoy = "0";
Visible = "1";
Command = "Canvas.popDialog( TerrainImportGui );";
Command = "TerrainImportGui.cancel();";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = "Cancel";
@ -544,28 +490,23 @@ function TerrainImportGui::onWake( %this )
%this.channelsArray = new ArrayObject();
}
function TerrainImportGui::import( %this )
function TerrainImportGui::acceptSettings( %this )
{
// Gather all the import settings.
%heightMapPng = %this-->HeightfieldFilename.getText();
AssetBrowser.newAssetSettings.importingTerrain = true;
AssetBrowser.newAssetSettings.heightMapPng = %this-->HeightfieldFilename.getText();
%metersPerPixel = %this-->MetersPerPixel.getText();
%heightScale = %this-->HeightScale.getText();
AssetBrowser.newAssetSettings.metersPerPixel = %this-->MetersPerPixel.getText();
AssetBrowser.newAssetSettings.heightScale = %this-->HeightScale.getText();
%flipYAxis = %this-->FlipYAxis.isStateOn();
AssetBrowser.newAssetSettings.flipYAxis = %this-->FlipYAxis.isStateOn();
// Grab and validate terrain object name.
%terrainName = %this-->TerrainName.getText();
if( !( isObject( %terrainName ) && %terrainName.isMemberOfClass( "TerrainBlock" ) ) &&
!Editor::validateObjectName( %terrainName ) )
return;
AssetBrowser.newAssetSettings.opacityNames = "";
AssetBrowser.newAssetSettings.materialNames = "";
%opacityNames = "";
%materialNames = "";
%opacityList = %this-->OpacityLayerTextList;
AssetBrowser.newAssetSettings.opacityList = %this-->OpacityLayerTextList;
for( %i = 0; %i < %opacityList.rowCount(); %i++ )
{
@ -577,53 +518,19 @@ function TerrainImportGui::import( %this )
%materialName = getField( %itemText, 2 );
%opacityNames = %opacityNames @ %opacityName TAB %channel @ "\n";
%materialNames = %materialNames @ %materialName @ "\n";
AssetBrowser.newAssetSettings.opacityNames = AssetBrowser.newAssetSettings.opacityNames @ %opacityName TAB %channel @ "\n";
AssetBrowser.newAssetSettings.materialNames = AssetBrowser.newAssetSettings.materialNames @ %materialName @ "\n";
}
%updated = nameToID( %terrainName );
// This will update an existing terrain with the name %terrainName,
// or create a new one if %terrainName isn't a TerrainBlock
%obj = TerrainBlock::import( %terrainName,
%heightMapPng,
%metersPerPixel,
%heightScale,
%opacityNames,
%materialNames,
%flipYAxis );
//AssetBrowser.newAssetSettings.updated = nameToID( %terrainName );
Canvas.popDialog( %this );
}
if ( isObject( %obj ) )
{
if( %obj != %updated )
{
// created a new TerrainBlock
// Submit an undo action.
MECreateUndoAction::submit(%obj);
}
assert( isObject( EWorldEditor ),
"ObjectBuilderGui::processNewObject - EWorldEditor is missing!" );
// Select it in the editor.
EWorldEditor.clearSelection();
EWorldEditor.selectObject(%obj);
// When we drop the selection don't store undo
// state for it... the creation deals with it.
EWorldEditor.dropSelection( true );
ETerrainEditor.isDirty = true;
EPainter.updateLayers();
}
else
{
toolsMessageBox( "Import Terrain",
"Terrain import failed! Check console for error messages.",
"Ok", "Error" );
}
function TerrainImportGui::cancel( %this )
{
AssetBrowser.newAssetSettings.importingTerrain = false;
Canvas.popDialog( TerrainImportGui );
}
function TerrainImportGui::doOpenDialog( %this, %filter, %callback )

6
Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
View file

@ -900,14 +900,16 @@ function ObjectBuilderGui::buildWaterPlane(%this)
function ObjectBuilderGui::buildTerrainBlock(%this)
{
%this.objectClassName = "TerrainBlock";
/*%this.objectClassName = "TerrainBlock";
%this.createCallback = "ETerrainEditor.attachTerrain();";
%this.addField("terrainFile", "TypeFile", "Terrain file", "", "*.ter");
%this.addField("terrainAsset", "TypeTerrainAsset", "Terrain Asset", "", "");
%this.addField("squareSize", "TypeInt", "Square size", "8");
%this.process();
%this.process();*/
AssetBrowser.setupCreateNewAsset("TerrainAsset", AssetBrowser.selectedModule);
}
function ObjectBuilderGui::buildGroundCover( %this )