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

Fixes some conversion mistakes in the scripts

Browse source
This commit is contained in:
Areloch 2021-01-13 01:51:05 -06:00 • committed by Lukas Aldershaab
parent 9ccaa6d3ea
commit c051a0357c
8 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript
View file

@ -3,7 +3,7 @@
// Copyright (C) - Violent Tulip // Copyright (C) - Violent Tulip
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
function VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s() function VerveEditor::InitEventScripts()
{ {
// Core. // Core.
exec( "./VEvent." @ $TorqueScriptFileExtension ); exec( "./VEvent." @ $TorqueScriptFileExtension );
@ -27,4 +27,4 @@ function VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s()
// Custom. // Custom.
// Exec Custom Event Scripts. // Exec Custom Event Scripts.
} }
VerveEditor::InitEven" @ $TorqueScriptFileExtension @ "s(); VerveEditor::InitEventScripts();

4
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript
View file

@ -14,10 +14,10 @@ function AssetBrowser::createGameObjectAsset(%this)
function AssetBrowser::editGameObjectAsset(%this, %assetDef) function AssetBrowser::editGameObjectAsset(%this, %assetDef)
{ {
//We have no dedicated GO editor for now, so just defer to the script editing aspect //We have no dedicated GO editor for now, so just defer to the script editing aspect
%this.editGameObjectAsse" @ $TorqueScriptFileExtension @ "(%assetDef); %this.editGameObjectAssetScript(%assetDef);
} }
function AssetBrowser::editGameObjectAsse" @ $TorqueScriptFileExtension @ "(%this, %assetDef) function AssetBrowser::editGameObjectAssetScript(%this, %assetDef)
{ {
%scriptFile = %assetDef.scriptFile; %scriptFile = %assetDef.scriptFile;

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

@ -32,7 +32,7 @@ function AssetBrowser::createScriptAsset(%this)
return %tamlpath; return %tamlpath;
} }
function AssetBrowser::edi" @ $TorqueScriptFileExtension @ "Asset(%this, %assetDef) function AssetBrowser::editScriptAsset(%this, %assetDef)
{ {
%scriptFile = %assetDef.scriptFile; %scriptFile = %assetDef.scriptFile;
@ -43,7 +43,7 @@ function AssetBrowser::duplicateScriptAsset(%this, %assetDef, %targetModule)
{ {
} }
function AssetBrowser::impor" @ $TorqueScriptFileExtension @ "Asset(%this, %assetId) function AssetBrowser::importScriptAsset(%this, %assetId)
{ {
} }

4
Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript
View file

@ -23,7 +23,7 @@ function LooseFileAuditWindow::buildPopupMenus(%this)
superClass = "MenuBuilder"; superClass = "MenuBuilder";
class = "EditorWorldMenu"; class = "EditorWorldMenu";
item[0] = "Make a Script Asset" TAB "" TAB "LooseFileAuditWindow.impor" @ $TorqueScriptFileExtension @ "();"; item[0] = "Make a Script Asset" TAB "" TAB "LooseFileAuditWindow.importScript();";
item[1] = "Make a PostFX Asset" TAB "" TAB "LooseFileAuditWindow.importPostFX();"; item[1] = "Make a PostFX Asset" TAB "" TAB "LooseFileAuditWindow.importPostFX();";
item[2] = "Make a Material Asset" TAB "" TAB "LooseFileAuditWindow.importMaterial();"; item[2] = "Make a Material Asset" TAB "" TAB "LooseFileAuditWindow.importMaterial();";
item[3] = "Make a Terrain Material Asset" TAB "" TAB "LooseFileAuditWindow.importTerrMat();"; item[3] = "Make a Terrain Material Asset" TAB "" TAB "LooseFileAuditWindow.importTerrMat();";
@ -199,7 +199,7 @@ function LooseFileAuditWindow::importImage(%this)
LooseFileList.expandItem(0); LooseFileList.expandItem(0);
} }
function LooseFileAuditWindow::impor" @ $TorqueScriptFileExtension @ "(%this) function LooseFileAuditWindow::importScript(%this)
{ {
if(!ImportAssetWindow.isAwake()) if(!ImportAssetWindow.isAwake())
ImportAssetWindow.showDialog(); ImportAssetWindow.showDialog();

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

@ -329,7 +329,7 @@ function AssetBrowser::buildPopupMenus(%this)
//isPopup = true; //isPopup = true;
item[ 0 ] = "Open GameObject Editor" TAB "" TAB "echo(\"Not yet implemented.\");"; item[ 0 ] = "Open GameObject Editor" TAB "" TAB "echo(\"Not yet implemented.\");";
item[ 1 ] = "Edit GameObject Script" TAB "" TAB "AssetBrowser.editGameObjectAsse" @ $TorqueScriptFileExtension @ "(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));"; item[ 1 ] = "Edit GameObject Script" TAB "" TAB "AssetBrowser.editGameObjectAssetScript(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));";
item[ 2 ] = "-"; item[ 2 ] = "-";
item[ 3 ] = "Apply Instance to GameObject" TAB "" TAB "AssetBrowser.applyInstanceToGameObject(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));"; item[ 3 ] = "Apply Instance to GameObject" TAB "" TAB "AssetBrowser.applyInstanceToGameObject(AssetDatabase.acquireAsset(EditGameObjectAssetPopup.assetId));";
item[ 4 ] = "Reset Instance to GameObject" TAB "" TAB "echo(\"Not yet implemented.\");"; item[ 4 ] = "Reset Instance to GameObject" TAB "" TAB "echo(\"Not yet implemented.\");";

8
Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript
View file

@ -26,11 +26,11 @@ function setupBaseExpandos()
// FIXME TGEA doesnt currently have these due to the way it's built // FIXME TGEA doesnt currently have these due to the way it's built
return; return;
se" @ $TorqueScriptFileExtension @ "PathExpando("tools", getExecutablePath() @ "/tools", true); setScriptPathExpando("tools", getExecutablePath() @ "/tools", true);
se" @ $TorqueScriptFileExtension @ "PathExpando("tool", getExecutablePath() , true); setScriptPathExpando("tool", getExecutablePath() , true);
se" @ $TorqueScriptFileExtension @ "PathExpando("toolResources", getExecutablePath() @ "/resources", true); setScriptPathExpando("toolResources", getExecutablePath() @ "/resources", true);
se" @ $TorqueScriptFileExtension @ "PathExpando("core", getExecutablePath() @ "/core", true); setScriptPathExpando("core", getExecutablePath() @ "/core", true);
// Remove the game expando so we can use this to reset expandos // Remove the game expando so we can use this to reset expandos
removeScriptPathExpando("game"); removeScriptPathExpando("game");

4
Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript
View file

@ -112,8 +112,8 @@ function ProjectBase::_onProjectOpen( %this, %data )
setCurrentDirectory( %this.gamePath ); setCurrentDirectory( %this.gamePath );
// Set ^game expando // Set ^game expando
se" @ $TorqueScriptFileExtension @ "PathExpando("project", %this.gamePath ); setScriptPathExpando("project", %this.gamePath );
se" @ $TorqueScriptFileExtension @ "PathExpando("game", %this.gamePath @ "/game" ); setScriptPathExpando("game", %this.gamePath @ "/game" );
%this.onProjectOpen( %data ); %this.onProjectOpen( %data );
%this.setActive(); %this.setActive();

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

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