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

Added changes missed via merge failures.

Browse source 
Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,8 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//--- OBJECT WRITE BEGIN ---
%forestBrushesGroup = new SimGroup( ForestBrushGroup )
{
};
};
//--- OBJECT WRITE END ---

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

@ -171,13 +171,15 @@ function ForestEditorGui::deleteBrushOrElement( %this )
function ForestEditorGui::newMesh( %this )
{
SelectAssetPath.showDialog(AssetBrowser.dirHandler.currentAddress, "createNewForestMesh", "Select Forest Mesh Datablock Path");
SelectAssetPathWindow.selectWindow();
AssetBrowser_SelectModule.showDialog("ForestEditorGui.pickedNewMeshTargetModule");
AssetBrowser_SelectModuleWindow.selectWindow();
}
function createNewForestMesh(%newPath)
function ForestEditorGui::pickedNewMeshTargetModule(%this, %module)
{
ForestEditorGui.newMeshPath = %newPath;
%moduleDef = ModuleDatabase.findModule(%module);
ForestEditorGui.forestItemDataPath = %moduleDef.ModulePath @ "/scripts/managedData/managedForestItemData." @ $TorqueScriptFileExtension;
AssetBrowser.showDialog("ShapeAsset", "selectNewForestMesh", "", "", "");
}
@ -212,10 +214,10 @@ function selectNewForestMesh(%selectedShapeAssetId)
//%str = "datablock TSForestItemData( " @ %name @ " ) { shapeFile = \"" @ %fullPath @ "\"; };";
//eval( %str );
%fullPath = AssetDatabase.acquireAsset(%selectedShapeAssetId).getShapeFile();
//%fullPath = AssetDatabase.acquireAsset(%selectedShapeAssetId).getShapeFile();
new TSForestItemData(%name) {
shapeFile = %fullPath;
shapeAsset = %selectedShapeAssetId;
};
%isrl = isObject( %name );
@ -228,7 +230,7 @@ function selectNewForestMesh(%selectedShapeAssetId)
ForestEditMeshTree.scrollVisible( %item );
ForestEditMeshTree.addSelection( %item );
ForestDataManager.setDirty( %name, ForestEditorGui.newMeshPath @ "/managedForestItemData." @ $TorqueScriptFileExtension );
ForestDataManager.setDirty( %name, ForestEditorGui.forestItemDataPath );
%element = new ForestBrushElement()
{