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 remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
This commit is contained in:
Jeff Hutchinson 2021-09-01 22:26:23 -04:00
commit 17231ca9fb
51 changed files with 736 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,6 +180,12 @@ function ForestEditorGui::pickedNewMeshTargetModule(%this, %module)
%moduleDef = ModuleDatabase.findModule(%module);
ForestEditorGui.forestItemDataPath = %moduleDef.ModulePath @ "/scripts/managedData/managedForestItemData." @ $TorqueScriptFileExtension;
if(!isDirectory(filePath(ForestEditorGui.forestItemDataPath)))
{
AssetBrowser.dirHandler.createFolder(filePath(ForestEditorGui.forestItemDataPath));
}
AssetBrowser.showDialog("ShapeAsset", "selectNewForestMesh", "", "", "");
}

10
Templates/BaseGame/game/tools/forestEditor/main.tscript
View file

@ -34,12 +34,10 @@ function initializeForestEditor()
ForestEditorGui.setVisible( false );
ForestEditorPalleteWindow.setVisible( false );
ForestEditorPropertiesWindow.setVisible( false );
ForestEditToolbar.setVisible( false );
EditorGui.add( ForestEditorGui );
EditorGui.add( ForestEditorPalleteWindow );
EditorGui.add( ForestEditorPropertiesWindow );
EditorGui.add( ForestEditToolbar );
new ScriptObject( ForestEditorPlugin )
{
@ -141,7 +139,9 @@ function ForestEditorPlugin::onActivated( %this )
ForestEditorPalleteWindow.setVisible( true );
ForestEditorPropertiesWindow.setVisible( true );
ForestEditorGui.makeFirstResponder( true );
//ForestEditToolbar.setVisible( true );
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
EditorGuiToolbarStack.add( ForestEditToolbar );
//Get our existing forest object in our current mission if we have one
%forestObject = trim(parseMissionGroupForIds("Forest", ""));
@ -210,7 +210,11 @@ function ForestEditorPlugin::onActivated( %this )
function ForestEditorPlugin::onDeactivated( %this )
{
EditorGuiToolbarStack.add( EWorldEditorToolbar );
EditorGuiToolbarStack.remove( ForestEditToolbar );
ForestEditorGui.setVisible( false );
ForestEditorPalleteWindow.setVisible( false );
ForestEditorPropertiesWindow.setVisible( false );