TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 03:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more torquescript template fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-05-04 22:49:19 -04:00
parent 6f7fdca87d
commit b2bbd771f6
54 changed files with 122 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui
View file

@ -3,7 +3,7 @@
// Copyright (C) - Violent Tulip
//-----------------------------------------------------------------------------
%paletteId = new GuiControl(VPathEditorPalette) {
$paletteId = new GuiControl(VPathEditorPalette) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

1
Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript
View file

@ -59,6 +59,7 @@ function VControllerPropertyList::InspectObject( %this, %object )
}
%dataFieldCount = %object.getDataFieldCount();
%dataFieldList = "";
for ( %i = 0; %i < %dataFieldCount; %i++ )
{
// Add To List.

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript
View file

@ -22,7 +22,7 @@ function VDirectorGroup::PopulateBuildStack( %this, %stack )
function VDirectorGroup::ResolveBuildStack( %this, %stack )
{
Parent::ResolveBuildStack( %this, %stack, %groupObject );
Parent::ResolveBuildStack( %this, %stack );
// Find the Track Toggle.
%directorTrackCheckBox = %stack.findObjectByInternalName( "DirectorTrackToggle", true );

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript
View file

@ -62,7 +62,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack )
function VSceneObjectGroup::ResolveBuildStack( %this, %stack )
{
Parent::ResolveBuildStack( %this, %stack, %groupObject );
Parent::ResolveBuildStack( %this, %stack );
// Fetch the Controller.
%controller = %this.getRoot();

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript
View file

@ -31,7 +31,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack )
function VSceneObjectGroup::ResolveBuildStack( %this, %stack )
{
VGroup::ResolveBuildStack( %this, %stack, %groupObject );
VGroup::ResolveBuildStack( %this, %stack );
// Fetch the Controller.
%controller = %this.getRoot();

18
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -242,6 +242,8 @@ function AssetBrowser::selectAsset( %this, %asset )
//eval("materialEd_previewMaterial." @ %propertyField @ " = " @ %value @ ";");
if( AssetBrowser.returnType $= "name" )
{
// TODO!
%name = "";
eval( "" @ AssetBrowser.selectCallback @ "(" @ %name @ ");");
}
else
@ -663,6 +665,7 @@ function AssetBrowser::loadDirectories( %this )
//Remove any modules that have no assets if we have that filter on
if(%this.onlyShowModulesWithAssets)
{
%modulesList = ModuleDatabase.findModules();
for(%i=0; %i < getWordCount(%modulesList); %i++)
{
%moduleName = getWord(%modulesList, %i).ModuleId;
@ -905,6 +908,8 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
if ( %name $= "" )
%name = %class;
// TODO
%group = "";
if ( %this.currentCreatorGroup !$= "" && %group $= "" )
%group = %this.currentCreatorGroup;
@ -1048,6 +1053,13 @@ function AssetBrowser::toggleTagFilterPopup(%this)
//now, add the asset's category
%assetType = AssetDatabase.getAssetCategory(%assetId);
// TODO?
%text = "";
%var = "";
%cmd = "";
%textLength = strlen(%text);
// end todo
%checkBox = new GuiCheckBoxCtrl()
{
canSaveDynamicFields = "0";
@ -1108,6 +1120,9 @@ function AssetBrowser::reImportAsset(%this)
//if(%assetType $= "ImageAsset")
// %filters = "";
//TODO
%currentFile = "";
%dlg = new OpenFileDialog()
{
Filters = "(All Files (*.*)|*.*|";
@ -1412,10 +1427,13 @@ function AssetBrowser::doRebuildAssetArray(%this)
AssetBrowser-->assetList.deleteAllObjects();
AssetPreviewArray.empty();
// uhh?? I just added global schenanagins here to make this work
%assetArray = $AssetBrowser::AssetArray;
if(isObject(%assetArray))
%assetArray.delete();
%assetArray = new ArrayObject();
$AssetBrowser::AssetArray = %assetArray;
//First, Query for our assets
%assetQuery = new AssetQuery();

3
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript
View file

@ -277,6 +277,9 @@ function AssetBrowser::onDropFolder(%this, %filePath)
//First, we wanna scan to see if we have modules to contend with. If we do, we'll just plunk them in wholesale
//and not process their contents.
// TODO
%fileExt = "";
//If not modules, it's likely an art pack or other mixed files, so we'll import them as normal
if( (%fileExt $= ".png") || (%fileExt $= ".jpg") || (%fileExt $= ".bmp") || (%fileExt $= ".dds") )
%this.importAssetListArray.add("ImageAsset", %filePath);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript
View file

@ -142,6 +142,7 @@ function ImportAssetOptionsWindow::editImportSettings(%this, %assetItem)
%filePath = %assetItem.filePath;
%assetName = %assetItem.assetName;
%assetConfigObj = %assetItem.importConfig;
%optionsObj = %assetItem.optionsObj; // TODO IS THIS RIGHT
ImportOptionsList.startGroup("Asset");
ImportOptionsList.addField("AssetName", "Asset Name", "string", "", "NewAsset", "", %assetItem);
@ -405,6 +406,7 @@ function ImportAssetConfigEditorWindow::editConfig(%this)
function ImportAssetConfigEditorWindow::deleteConfig(%this)
{
%configList = ImportAssetConfigSettingsList;
for(%i=0; %i < %configList.count(); %i++)
{

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript
View file

@ -110,7 +110,7 @@ function AssetBrowser::renameComponentAsset(%this, %assetDef, %newAssetId, %orig
%line = %file.readLine();
%line = trim( %line );
%editedFileContents = %editedFileContents @ strreplace(%line, %originalAssetName, %newName) @ "\n";
%editedFileContents = %editedFileContents @ strreplace(%line, %originalName, %newName) @ "\n";
}
%file.close();

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript
View file

@ -37,6 +37,8 @@ function AssetBrowser::createCpp(%this)
TamlWrite(%asset, %tamlpath);*/
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%moduleDef = ModuleDatabase.findModule(%moduleName, 1);
AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath);

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript
View file

@ -137,7 +137,7 @@ function AssetBrowser::buildLevelAssetPreview(%this, %assetDef, %previewData)
%previewData.assetPath = %assetDef.getLevelPath();
%previewData.doubleClickCommand = "schedule( 1, 0, \"EditorOpenMission\", "@%assetDef@");";
%levelPreviewImage = %assetDesc.PreviewImage;
%levelPreviewImage = %assetDef.PreviewImage;
if(isFile(%levelPreviewImage))
%previewData.previewImage = %levelPreviewImage;

3
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript
View file

@ -49,8 +49,7 @@ function AssetBrowser::importScriptAsset(%this, %assetId)
function AssetBrowser::onScriptAssetEditorDropped(%this, %assetDef, %position)
{
if(!isObject(%dropTarget))
return;
}
//Renames the asset

3
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript
View file

@ -86,6 +86,9 @@ function AssetBrowser::editStateMachineAsset(%this, %assetDef)
function AssetBrowser::duplicateStateMachineAsset(%this, %assetDef)
{
// TODO:
%targetModule = "";
//Check if we have a target module, if not we need to select one
if(%targetModule $= "")
{

2
Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript
View file

@ -325,7 +325,7 @@ function directoryHandler::copyFolder(%this, %fromFolder, %toFolder)
if(!%success)
error("copyProjectFolder() - failed to copy file: " @ %file);
%file = findNextFileMultiExpr( %fullPath @ "/*.*" );
%file = findNextFileMultiExpr( %fromFolder @ "/*.*" );
}
//do sub directories

8
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
View file

@ -143,6 +143,10 @@ function AssetBrowser::performRenameAsset(%this, %originalAssetName, %newName)
//Update the selection to immediately jump to the new asset
AssetBrowser-->filterTree.clearSelection();
%ModuleItem = AssetBrowser-->filterTree.findItemByName(%moduleName);
// TODO is this correct?
%assetType = %ModuleItem.getClassName();
%assetTypeId = AssetBrowser-->filterTree.findChildItemByName(%ModuleItem, %assetType);
AssetBrowser-->filterTree.selectItem(%assetTypeId);
@ -236,9 +240,9 @@ function moveAssetFile(%assetDef, %destinationPath)
%assetPath = makeFullPath(AssetDatabase.getAssetFilePath(%assetDef.getAssetId()));
%assetFilename = fileName(%assetPath);
%newAssetPath = %destination @ "/" @ %assetFilename;
%newAssetPath = %destinationPath @ "/" @ %assetFilename;
%copiedSuccess = pathCopy(%assetPath, %destination @ "/" @ %assetFilename);
%copiedSuccess = pathCopy(%assetPath, %destinationPath @ "/" @ %assetFilename);
if(!%copiedSuccess)
return "";

17
Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript
View file

@ -9,6 +9,13 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
if(%currentMaterial $= "" || %currentMaterial == 0)
%currentMaterial = %fieldDefaultVal;
// TODO?
%matName = "";
%component = "";
%material = "";
%accessor = "";
%precision = "";
%container = new GuiControl() {
canSaveDynamicFields = "0";
Profile = "EditorContainerProfile";
@ -20,7 +27,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = "";// %tooltip;
tooltipProfile = "EditorToolTipProfile";
};
@ -35,7 +42,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = ""; //%tooltip;
tooltipProfile = "EditorToolTipProfile";
text = %fieldName;
maxLength = "1024";
@ -57,7 +64,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
text = %currentMaterial;
};
};
%previewButton = new GuiBitmapButtonCtrl(){
internalName = %matName;
HorizSizing = "right";
@ -121,7 +128,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = ""; //%tooltip;
tooltipProfile = "EditorToolTipProfile";
text = "Mapped to:" SPC %material.mapTo;
maxLength = "1024";
@ -140,7 +147,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = "";// %tooltip;
tooltipProfile = "EditorToolTipProfile";
maxLength = "1024";
historySize = "0";

2
Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript
View file

@ -201,7 +201,7 @@ function stateMachineFieldList::onSelect(%this)
%index = %this.getParent().fieldID;
%oldValue = %this.behavior.stateMachine.getValue(%index);
%this.behavior.stateMachine.setValue(%fieldType SPC %oldValue.y);
%this.behavior.stateMachine.setValue(%this.fieldType SPC %oldValue.y);
%this.getParent().add(%fieldCtrl);
}

4
Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript
View file

@ -13,7 +13,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = "";//%tooltip;
tooltipProfile = "EditorToolTipProfile";
};
@ -28,7 +28,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = "";//%tooltip;
tooltipProfile = "EditorToolTipProfile";
text = %fieldName;
maxLength = "1024";

3
Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript
View file

@ -159,6 +159,9 @@ function QuickEditComponentList::onHotTrackItem( %this, %itemID )
{
%name = getField(%componentObj.getComponentField(%i), 0);
// TODO:
%description = "";
SuperTooltipDlg.addParam(%name, %description @ "\n");
}
%position = %this.getGlobalPosition();

2
Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContnt = new GuiControl(ConvexEditorOptions)
$guiContnt = new GuiControl(ConvexEditorOptions)
{
position = "0 0";
extent = "800 600";

6
Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript
View file

@ -79,7 +79,7 @@ function ActionCreateDatablock::redo( %this )
%this.editor.selectDatablock( %db );
%this.editor.flagInspectorAsDirty( true );
UnlistedDatablocks.remove( %id );
UnlistedDatablocks.remove( %db );
}
//---------------------------------------------------------------------------------------------
@ -99,7 +99,7 @@ function ActionCreateDatablock::undo( %this )
%this.dbName = %db.name;
%db.name = "";
UnlistedDatablocks.add( %this.db );
UnlistedDatablocks.add( %db );
}
//=============================================================================================
@ -155,5 +155,5 @@ function ActionDeleteDatablock::undo( %this )
// Remove from unlisted.
UnlistedDatablocks.remove( %id );
UnlistedDatablocks.remove( %db );
}

2
Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript
View file

@ -430,7 +430,7 @@ function DbgRemoveBreakPoint(%file, %line)
function DbgDeleteSelectedBreak()
{
%selectedBreak = DebuggerBreakPoints.getSelectedId();
%rowNum = DebuggerBreakPoints.getRowNumById(%selectedWatch);
%rowNum = DebuggerBreakPoints.getRowNumById(%selectedBreak);
if (%rowNum >= 0) {
%breakText = DebuggerBreakPoints.getRowText(%rowNum);
%breakLine = getField(%breakText, 0);

8
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui
View file

@ -472,8 +472,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
Margin = "0 0 0 -3";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -552,8 +550,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
Margin = "0 0 0 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -716,8 +712,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
Margin = "0 0 0 -3";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -796,8 +790,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
Margin = "0 0 0 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiInspector(DecalInspector) {
StackingType = "Vertical";

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

@ -20,6 +20,6 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
%forestBrushesGroup = new SimGroup( ForestBrushGroup )
$forestBrushesGroup = new SimGroup( ForestBrushGroup )
{
};

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

@ -233,7 +233,7 @@ function GuiInspectorVariableGroup::buildOptionsSettingField(%this, %fieldName,
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = %tooltip;
tooltip = "";//%tooltip;
text = %fieldDefaultVal;
hovertime = "1000";
ownerObject = %ownerObj;
@ -492,7 +492,8 @@ function ESettingsWindow::getAssetManagementSettings(%this)
function ESettingsWindow::getAssetEditingSettings(%this)
{
ImportAssetWindow::reloadImportOptionConfigs();
%formattedConfigList = "";
for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++)
{
%configName = ImportAssetWindow.importConfigsList.getKey(%i);

2
Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript
View file

@ -34,7 +34,7 @@ function GuiInspectorVariableGroup::buildAssetDependenciesField(%this, %fieldNam
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = %tooltip;
tooltip = "";// %tooltip;
text = %fieldDefaultVal;
hovertime = "1000";
ownerObject = %ownerObj;

2
Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript
View file

@ -33,7 +33,7 @@ function GuiInspectorVariableGroup::buildButtonField(%this, %fieldName, %fieldLa
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = %tooltip;
tooltip = "";// %tooltip;
text = %fieldName;
hovertime = "1000";
command = %fieldDataVals;

6
Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript
View file

@ -22,7 +22,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = ""; ///%tooltip;
tooltipProfile = "EditorToolTipProfile";
};
@ -37,7 +37,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
canSave = "0";
Visible = "1";
hovertime = "100";
tooltip = %tooltip;
tooltip = ""; //%tooltip;
tooltipProfile = "EditorToolTipProfile";
text = %fieldLabel;
maxLength = "1024";
@ -66,7 +66,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = %tooltip;
tooltip = ""; //%tooltip;
text = %fieldDefaultVal;
hovertime = "1000";
ownerObject = %ownerObj;

2
Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript
View file

@ -76,7 +76,7 @@ function GuiInspectorVariableGroup::buildRangeField(%this, %fieldName, %fieldLab
Visible = "1";
Command = "$thisControl.onDragComplete();";
tooltipprofile = "GuiToolTipProfile";
tooltip = %tooltip;
tooltip = ""; //%tooltip;
hovertime = "1000";
canSaveDynamicFields = "0";
ownerObject = %ownerObj;

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript
View file

@ -69,6 +69,8 @@ function GuiEditor::createNewProfile( %this, %name, %copySource )
function GuiEditor::getProfileCategory( %this, %profile )
{
// TODO
%name = "";
if( %this.isDefaultProfile( %name ) )
return "Default";
else if( %profile.category !$= "" )

4
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript
View file

@ -364,6 +364,10 @@ function GenericUndoAction::learn(%this, %object)
%oldFieldNames = %this.fieldNames[%object];
%numNewFields = getWordCount(%newFieldNames);
%numOldFields = getWordCount(%oldFieldNames);
%newNullFields = "";
%oldNullFields = "";
// compare the old field list to the new field list.
// if a field is on the old list that isn't on the new list,
// add it to the newNullFields list.

15
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -233,8 +233,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -543,9 +541,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -1923,8 +1918,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -2623,8 +2616,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "-1 0 0 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -3100,8 +3091,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "-1 0 0 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -3373,8 +3362,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "-1 0 0 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -4191,8 +4178,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";

3
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -1496,7 +1496,8 @@ function MaterialEditorGui::updateAnimationFlags(%this)
{
MaterialEditorGui.setMaterialDirty();
%single = true;
%flags = "";
if(MaterialEditorPropertiesWindow-->RotationAnimation.getValue() == true)
{
if(%single == true)

2
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript
View file

@ -136,7 +136,7 @@ function MeshRoadEditorGui::editNodeDetails( %this )
function MeshRoadEditorGui::onBrowseClicked( %this )
{
//%filename = RETextureFileCtrl.getText();
%filename = RETextureFileCtrl.getText();
%dlg = new OpenFileDialog()
{

28
Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -271,8 +271,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -584,8 +582,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -826,9 +822,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
HorizStacking = "Left to Right";
@ -1272,8 +1266,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -1359,7 +1351,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "%particleId = PEE_EmitterParticle2-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle2-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();";
Command = "$_particleId = PEE_EmitterParticle2-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle2-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();";
hovertime = "1000";
tooltip = "Clear Particle 2 from Emitter";
text = "";
@ -1407,7 +1399,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "%particleId = PEE_EmitterParticle3-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle3-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();";
Command = "$_particleId = PEE_EmitterParticle3-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle3-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();";
hovertime = "1000";
tooltip = "Clear Particle 3 from Emitter";
text = "";
@ -1455,7 +1447,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "%particleId = PEE_EmitterParticle4-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle4-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();";
Command = "$_particleId = PEE_EmitterParticle4-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle4-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();";
hovertime = "1000";
tooltip = "Clear Particle 4 from Emitter";
text = "";
@ -1479,8 +1471,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -1933,8 +1923,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -2233,8 +2221,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -2518,8 +2504,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -2720,8 +2704,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";
@ -2865,8 +2847,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
Margin = "4 4 4 0";
DragSizable = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
new GuiStackControl() {
StackingType = "Vertical";

2
Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript
View file

@ -138,7 +138,7 @@ function RoadEditorGui::editNodeDetails( %this )
function RoadEditorGui::onBrowseClicked( %this )
{
//%filename = RETextureFileCtrl.getText();
%filename = RETextureFileCtrl.getText();
%dlg = new OpenFileDialog()
{

4
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -1439,6 +1439,8 @@ function ShapeEdPropWindow::update_onSequenceBlendChanged( %this, %seqName, %ble
%proxyName = ShapeEditor.getProxyName( %seqName );
if ( ShapeEditor.shape.getSequenceIndex( %proxyName ) != -1 )
{
//TODO
%oldBlend = false;
if ( %blend && %oldBlend )
ShapeEditor.shape.setSequenceBlend( %proxyName, false, %oldBlendSeq, %oldBlendFrame );
ShapeEditor.shape.setSequenceBlend( %proxyName, %blend, %blendSeq, %blendFrame );
@ -2217,7 +2219,7 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s
if ( %frame != %oldFrame )
{
%pos = ShapeEdAnimWindow.getTimelineBitmapPos( ShapeEdAnimWindow-->seqIn.getText() + %frame, 2 );
eval( "%ctrl = ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl = eval( "return ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl.position = %pos SPC "0";
}
}

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ConvexEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(ConvexEditorPalette, EditorGuiGroup) {
$paletteId = new GuiControl(ConvexEditorPalette, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/DecalEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(DecalEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(DecalEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(ForestEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(ForestEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/MeshRoadEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(MeshRoadEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(MeshRoadEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/NavEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(NavEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(NavEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RiverEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(RiverEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(RiverEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RoadEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(RoadEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(RoadEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ShapeEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(ShapeEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(ShapeEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(TerrainEditorPalette,EditorGuiGroup) {
$paletteId = new GuiControl(TerrainEditorPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainPainterPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(TerrainPainterPalette,EditorGuiGroup) {
$paletteId = new GuiControl(TerrainPainterPalette,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/WorldEditorPalette.ed.gui
View file

@ -1,4 +1,4 @@
%paletteId = new GuiControl(WorldEditorInspectorPalette, EditorGuiGroup) {
$paletteId = new GuiControl(WorldEditorInspectorPalette, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

6
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript
View file

@ -30,6 +30,9 @@ function EWToolsPaletteWindow::loadToolsPalettes()
exec( %file );
%paletteGroup = 0;
// TODO
%paletteId = 0;
%i = %paletteId.getCount();
for( ; %i != 0; %i--)
{
@ -49,6 +52,9 @@ function EWToolsPaletteWindow::loadToolsPalettes()
exec( %file );
%paletteGroup = 0;
// TODO
%paletteId = 0;
%i = %paletteId.getCount();
for( ; %i != 0; %i--)
{

3
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui
View file

@ -288,6 +288,9 @@ function TerrainExportGui::selectFolder( %this )
function TerrainExportGui::doOpenDialog( %this, %filter, %callback )
{
// TODO
%currentFile = "";
%dlg = new OpenFolderDialog()
{
Title = "Select Export Folder";

5
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui
View file

@ -508,6 +508,8 @@ function TerrainImportGui::acceptSettings( %this )
AssetBrowser.newAssetSettings.opacityList = %this-->OpacityLayerTextList;
%opacityList = %this-->OpacityLayerTextList;
for( %i = 0; %i < %opacityList.rowCount(); %i++ )
{
%itemText = %opacityList.getRowTextById( %i );
@ -535,6 +537,9 @@ function TerrainImportGui::cancel( %this )
function TerrainImportGui::doOpenDialog( %this, %filter, %callback )
{
// TODO
%currentFile = "";
%dlg = new OpenFileDialog()
{
Filters = %filter;

2
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -399,7 +399,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %bitma
Visible = "1";
Command = "EditorGui.setEditor(" @ %pluginName @ ");";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = %tooltip;
ToolTip = "";// %tooltip;
hovertime = "750";
bitmap = %bitmap;
buttonType = "RadioButton";

5
Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript
View file

@ -137,8 +137,7 @@ function EManageSFXParameters::onVisible( %this, %value )
if( %value )
{
// Schedule an update.
%this.schedule( %SFX_PARAMETERS_UPDATE_INTERVAL, "update" );
%this.schedule( $SFX_PARAMETERS_UPDATE_INTERVAL, "update" );
}
}
@ -770,7 +769,7 @@ function EManageSFXParameters::addParameter( %this, %parameter )
// Set the fields to reflect the parameter's current settings.
%ctrl-->valueField.setValue( %paramter.value );
%ctrl-->valueField.setValue( %parameter.value );
%ctrl-->rangeMinField.setText( %parameter.range.x );
%ctrl-->rangeMaxField.setText( %parameter.range.y );
%ctrl-->defaultField.setValue( %parameter.defaultValue );

1
Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript
View file

@ -871,6 +871,7 @@ function EditorToolsMenu::onSelectItem(%this, %id)
{
%toolName = getField( %this.item[%id], 2 );
%paletteName = "";
EditorGui.setEditor(%toolName, %paletteName );
%this.checkRadioItem(0, %this.getItemCount(), %id);