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

Improve handling of non-default script filenames

Browse source
This commit is contained in:
Lukas Aldershaab 2021-01-07 12:01:09 +01:00
parent 099dd4f1f3
commit 9ccaa6d3ea
118 changed files with 534 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/gui/assimpImport.ed.gui
View file

@ -1049,7 +1049,7 @@
};
new GuiCheckBoxCtrl() {
useInactiveState = "0";
text = " Force update materials.tscript";
text = " Force update materials." @ $TorqueScriptFileExtension;
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -1063,7 +1063,7 @@
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Forces update of materials.tscript (even if Materials already exist)";
ToolTip = "Forces update of materials." @ $TorqueScriptFileExtension @ " (even if Materials already exist)";
hovertime = "1000";
internalName = "forceUpdateMaterials";
canSaveDynamicFields = "0";
@ -1510,4 +1510,4 @@
};
};
//--- OBJECT WRITE END ---
exec("./assimpImport.ed.tscript");
exec("./assimpImport.ed." @ $TorqueScriptFileExtension);

2
Templates/BaseGame/game/tools/gui/assimpImport.ed.tscript
View file

@ -280,7 +280,7 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd)
// Check for an existing TSShapeConstructor object. Need to exec the script
// manually as the resource may not have been loaded yet
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".tscript";
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ "." @ $TorqueScriptFileExtension;
if (isFile(%csPath))
exec(%csPath);

6
Templates/BaseGame/game/tools/gui/colladaImport.ed.gui
View file

@ -991,7 +991,7 @@
};
new GuiCheckBoxCtrl() {
useInactiveState = "0";
text = " Force update materials.tscript";
text = " Force update materials." @ $TorqueScriptFileExtension;
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -1005,7 +1005,7 @@
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Forces update of materials.tscript (even if Materials already exist)";
ToolTip = "Forces update of materials." @ $TorqueScriptFileExtension @ " (even if Materials already exist)";
hovertime = "1000";
internalName = "forceUpdateMaterials";
canSaveDynamicFields = "0";
@ -1255,7 +1255,7 @@ function ColladaImportDlg::showDialog(%this, %shapePath, %cmd)
// Check for an existing TSShapeConstructor object. Need to exec the script
// manually as the DAE resource may not have been loaded yet
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".tscript";
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ "." @ $TorqueScriptFileExtension;
if (isFile(%csPath))
exec(%csPath);

2
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
View file

@ -187,7 +187,7 @@ function SettingsInspector::changeEditorSetting(%this, %varName, %value)
//Bit of a hack, but if we were editing the theme, reexec the profiles for GUI
if(ESettingsWindow.selectedPageText $= "Theme")
exec("tools/gui/profiles.ed.tscript");
exec("tools/gui/profiles.ed." @ $TorqueScriptFileExtension);
}
else
%success = ProjectSettings.write();

24
Templates/BaseGame/game/tools/gui/guiDialogs.ed.tscript
View file

@ -20,9 +20,9 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
exec("./fileDialogBase.ed.tscript");
exec("./openFileDialog.ed.tscript");
exec("./saveFileDialog.ed.tscript");
exec("./fileDialogBase.ed." @ $TorqueScriptFileExtension);
exec("./openFileDialog.ed." @ $TorqueScriptFileExtension);
exec("./saveFileDialog.ed." @ $TorqueScriptFileExtension);
exec("./saveChangesMBDlg.ed.gui");
exec("./simViewDlg.ed.gui");
exec("./colorPicker.ed.gui");
@ -30,16 +30,16 @@ exec("./materialSelector.ed.gui");
exec("./scriptEditorDlg.ed.gui");
exec("./colladaImport.ed.gui");
exec("./GuiEaseEditDlg.ed.gui");
exec("./GuiEaseEditDlg.ed.tscript");
exec("./guiObjectInspector.ed.tscript");
exec("./GuiEaseEditDlg.ed." @ $TorqueScriptFileExtension);
exec("./guiObjectInspector.ed." @ $TorqueScriptFileExtension);
exec("./uvEditor.ed.gui");
exec("./objectSelection.ed.tscript");
exec("./objectSelection.ed." @ $TorqueScriptFileExtension);
exec("./postFxManager.gui");
exec("./assimpImport.ed.gui");
exec("./fieldTypes/assetDependencies.tscript");
exec("./fieldTypes/fieldTypes.tscript");
exec("./fieldTypes/listField.tscript");
exec("./fieldTypes/range.tscript");
exec("./fieldTypes/moduleDependencies.tscript");
exec("./fieldTypes/buttonField.tscript");
exec("./fieldTypes/assetDependencies." @ $TorqueScriptFileExtension);
exec("./fieldTypes/fieldTypes." @ $TorqueScriptFileExtension);
exec("./fieldTypes/listField." @ $TorqueScriptFileExtension);
exec("./fieldTypes/range." @ $TorqueScriptFileExtension);
exec("./fieldTypes/moduleDependencies." @ $TorqueScriptFileExtension);
exec("./fieldTypes/buttonField." @ $TorqueScriptFileExtension);

4
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript
View file

@ -143,7 +143,7 @@ function GuiObjectInspectorMethodList::init( %this, %object )
%methods = %object.dumpMethods();
%count = %methods.count();
%methodsGroup = %this.insertItem( 0, "Methods" );
%parentScripted = %this.insertItem( %methodsGroup, "Scripted" );
%paren" @ $TorqueScriptFileExtension @ "ed = %this.insertItem( %methodsGroup, "Scripted" );
%parentNative = %this.insertItem( %methodsGroup, "Native" );
for( %i = 0; %i < %count; %i ++ )
@ -158,7 +158,7 @@ function GuiObjectInspectorMethodList::init( %this, %object )
%tooltip = %prototype;
if( isFile( %fileName ) )
{
%parent = %parentScripted;
%parent = %paren" @ $TorqueScriptFileExtension @ "ed;
%tooltip = %tooltip NL "Declared in: " @ %fileName @ ":" @ %lineNumber;
}
else

4
Templates/BaseGame/game/tools/gui/materialSelector.ed.gui
View file

@ -1573,7 +1573,7 @@ function MaterialSelector::updateMaterialTags( %this, %material, %tag, %tagValue
// their auto-generated or new material
if( %material.getFilename() !$= "" &&
%material.getFilename() !$= "tools/gui/MaterialSelector.ed.gui" &&
%material.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.tscript" )
%material.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension )
{
MaterialSelectorPerMan.setDirty( %material );
MaterialSelectorPerMan.saveDirty();
@ -1761,7 +1761,7 @@ function MaterialSelector::deleteMaterial( %this, %materialName, %secondFilter,
if( %materialName.getFilename() !$= "" &&
%materialName.getFilename() !$= "tools/gui/MaterialSelector.ed.gui" &&
%materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.tscript" )
%materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension )
{
MaterialSelectorPerMan.removeObjectFromFile(%materialName);
MaterialSelectorPerMan.saveDirty();

2
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -22,7 +22,7 @@
function execEditorProfilesCS()
{
exec("./profiles.ed.tscript");
exec("./profiles.ed." @ $TorqueScriptFileExtension);
}
$Gui::clipboardFile = expandFilename("./clipboard.gui");