mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-25 22:35:37 +00:00
Parametrize script extension, default to 'tscript'
This commit is contained in:
parent
b8b62292bd
commit
099dd4f1f3
542 changed files with 774 additions and 783 deletions
|
|
@ -1049,7 +1049,7 @@
|
|||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
useInactiveState = "0";
|
||||
text = " Force update materials.cs";
|
||||
text = " Force update materials.tscript";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
|
|
@ -1063,7 +1063,7 @@
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Forces update of materials.cs (even if Materials already exist)";
|
||||
ToolTip = "Forces update of materials.tscript (even if Materials already exist)";
|
||||
hovertime = "1000";
|
||||
internalName = "forceUpdateMaterials";
|
||||
canSaveDynamicFields = "0";
|
||||
|
|
@ -1510,4 +1510,4 @@
|
|||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
exec("./assimpImport.ed.cs");
|
||||
exec("./assimpImport.ed.tscript");
|
||||
|
|
|
|||
|
|
@ -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) @ ".cs";
|
||||
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".tscript";
|
||||
if (isFile(%csPath))
|
||||
exec(%csPath);
|
||||
|
||||
|
|
@ -991,7 +991,7 @@
|
|||
};
|
||||
new GuiCheckBoxCtrl() {
|
||||
useInactiveState = "0";
|
||||
text = " Force update materials.cs";
|
||||
text = " Force update materials.tscript";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
|
|
@ -1005,7 +1005,7 @@
|
|||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Forces update of materials.cs (even if Materials already exist)";
|
||||
ToolTip = "Forces update of materials.tscript (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) @ ".cs";
|
||||
%csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".tscript";
|
||||
if (isFile(%csPath))
|
||||
exec(%csPath);
|
||||
|
||||
|
|
|
|||
|
|
@ -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.cs");
|
||||
exec("tools/gui/profiles.ed.tscript");
|
||||
}
|
||||
else
|
||||
%success = ProjectSettings.write();
|
||||
|
|
@ -20,9 +20,9 @@
|
|||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
exec("./fileDialogBase.ed.cs");
|
||||
exec("./openFileDialog.ed.cs");
|
||||
exec("./saveFileDialog.ed.cs");
|
||||
exec("./fileDialogBase.ed.tscript");
|
||||
exec("./openFileDialog.ed.tscript");
|
||||
exec("./saveFileDialog.ed.tscript");
|
||||
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.cs");
|
||||
exec("./guiObjectInspector.ed.cs");
|
||||
exec("./GuiEaseEditDlg.ed.tscript");
|
||||
exec("./guiObjectInspector.ed.tscript");
|
||||
exec("./uvEditor.ed.gui");
|
||||
exec("./objectSelection.ed.cs");
|
||||
exec("./objectSelection.ed.tscript");
|
||||
exec("./postFxManager.gui");
|
||||
exec("./assimpImport.ed.gui");
|
||||
|
||||
exec("./fieldTypes/assetDependencies.cs");
|
||||
exec("./fieldTypes/fieldTypes.cs");
|
||||
exec("./fieldTypes/listField.cs");
|
||||
exec("./fieldTypes/range.cs");
|
||||
exec("./fieldTypes/moduleDependencies.cs");
|
||||
exec("./fieldTypes/buttonField.cs");
|
||||
exec("./fieldTypes/assetDependencies.tscript");
|
||||
exec("./fieldTypes/fieldTypes.tscript");
|
||||
exec("./fieldTypes/listField.tscript");
|
||||
exec("./fieldTypes/range.tscript");
|
||||
exec("./fieldTypes/moduleDependencies.tscript");
|
||||
exec("./fieldTypes/buttonField.tscript");
|
||||
|
|
@ -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.cs" )
|
||||
%material.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.tscript" )
|
||||
{
|
||||
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.cs" )
|
||||
%materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.tscript" )
|
||||
{
|
||||
MaterialSelectorPerMan.removeObjectFromFile(%materialName);
|
||||
MaterialSelectorPerMan.saveDirty();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
function execEditorProfilesCS()
|
||||
{
|
||||
exec("./profiles.ed.cs");
|
||||
exec("./profiles.ed.tscript");
|
||||
}
|
||||
|
||||
$Gui::clipboardFile = expandFilename("./clipboard.gui");
|
||||
|
|
@ -479,7 +479,7 @@ new GuiControlProfile( ToolsGuiScrollProfile )
|
|||
if( !isObject( ToolsGuiOverlayProfile ) )
|
||||
new GuiControlProfile( ToolsGuiOverlayProfile )
|
||||
{
|
||||
opaque = false;
|
||||
opaque = true;
|
||||
fillColor = EditorSettings.value("Theme/windowBackgroundColor");
|
||||
fontColor = EditorSettings.value("Theme/fieldTextColor");
|
||||
fontColorHL = EditorSettings.value("Theme/fieldTextGLColor");
|
||||
Loading…
Add table
Add a link
Reference in a new issue