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

Merge pull request #436 from Areloch/AssetificationPass01

Browse source 
Assetifies MeshRoad, Decal Road, and the material slot of GroundCover
This commit is contained in:
Brian Roberts 2021-01-05 02:23:24 -06:00 • committed by GitHub
commit 2ba8ccd333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 423 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs
View file

@ -1058,7 +1058,10 @@ function AssetBrowser::toggleTagFilterPopup(%this)
function AssetBrowser::changeAsset(%this)
{
//alright, we've selectd an asset for a field, so time to set it!
%cmd = %this.fieldTargetObject @ "." @ %this.fieldTargetName @ "=\"" @ %this.selectedAsset @ "\";";
if(%this.fieldTargetName $= "")
%cmd = %this.fieldTargetObject @ ".apply(\""@ %this.selectedAsset @ "\");";
else
%cmd = %this.fieldTargetObject @ "." @ %this.fieldTargetName @ "=\"" @ %this.selectedAsset @ "\";";
echo("Changing asset via the " @ %cmd @ " command");
eval(%cmd);

4
Templates/BaseGame/game/tools/meshRoadEditor/main.cs
View file

@ -23,6 +23,10 @@
function initializeMeshRoadEditor()
{
echo(" % - Initializing Mesh Road Editor");
$MeshRoadEditor::defaultTopMaterialAsset = "Prototyping:FloorGray";
$MeshRoadEditor::defaultBottomMaterialAsset = "Prototyping:FloorGray";
$MeshRoadEditor::defaultSideMaterialAsset = "Prototyping:WallOrange";
exec( "./meshRoadEditor.cs" );
exec( "./meshRoadEditorGui.gui" );

8
Templates/BaseGame/game/tools/roadEditor/main.cs
View file

@ -24,6 +24,8 @@ function initializeRoadEditor()
{
echo( " - Initializing Road and Path Editor" );
$DecalRoadEditor::defaultMaterialAsset = "Prototyping:FloorGray";
exec( "./roadEditor.cs" );
exec( "./RoadEditorGui.gui" );
exec( "./RoadEditorToolbar.gui");
@ -183,7 +185,7 @@ function RoadEditorPlugin::initSettings( %this )
EditorSettings.setDefaultValue( "HoverSplineColor", "255 0 0 255" );
EditorSettings.setDefaultValue( "SelectedSplineColor", "0 255 0 255" );
EditorSettings.setDefaultValue( "HoverNodeColor", "255 255 255 255" ); //<-- Not currently used
EditorSettings.setDefaultValue( "MaterialName", "DefaultDecalRoadMaterial" );
EditorSettings.setDefaultValue( "materialAsset", "Prototyping:FloorGray" );
EditorSettings.endGroup();
}
@ -196,7 +198,7 @@ function RoadEditorPlugin::readSettings( %this )
RoadEditorGui.HoverSplineColor = EditorSettings.value("HoverSplineColor");
RoadEditorGui.SelectedSplineColor = EditorSettings.value("SelectedSplineColor");
RoadEditorGui.HoverNodeColor = EditorSettings.value("HoverNodeColor");
RoadEditorGui.materialName = EditorSettings.value("MaterialName");
RoadEditorGui.materialAsset = EditorSettings.value("materialAsset");
EditorSettings.endGroup();
}
@ -209,7 +211,7 @@ function RoadEditorPlugin::writeSettings( %this )
EditorSettings.setValue( "HoverSplineColor", RoadEditorGui.HoverSplineColor );
EditorSettings.setValue( "SelectedSplineColor", RoadEditorGui.SelectedSplineColor );
EditorSettings.setValue( "HoverNodeColor", RoadEditorGui.HoverNodeColor );
EditorSettings.setValue( "MaterialName", RoadEditorGui.materialName );
EditorSettings.setValue( "materialAsset", RoadEditorGui.materialAsset );
EditorSettings.endGroup();
}