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

Merge pull request #495 from JeffProgrammer/tsneo

Browse source 
TorqueScript Interpreter 2.0
This commit is contained in:
Areloch 2021-09-09 19:22:15 -05:00 • committed by GitHub
commit 6487e2eede
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
309 changed files with 9842 additions and 10062 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_AddModule) {
$guiContent = new GuiControl(AssetBrowser_AddModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_AddPackage) {
$guiContent = new GuiControl(AssetBrowser_AddPackage) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser) {
$guiContent = new GuiControl(AssetBrowser) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportCtrl) {
$guiContent = new GuiControl(AssetImportCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImportConfigEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportConfigEditor) {
$guiContent = new GuiControl(AssetImportConfigEditor) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowserImportLog) {
$guiContent = new GuiControl(AssetBrowserImportLog) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
$guiContent = new GuiControl(AssetBrowser_assetNameEdit) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

270
Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui Normal file
View file

@ -0,0 +1,270 @@
//--- OBJECT WRITE BEGIN ---
$guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "1";
new GuiControl() {
position = "0 0";
extent = "100 124";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "ShapeAssetPreviewButton";
canSave = "1";
canSaveDynamicFields = "0";
new GuiObjectView() {
shapeFile = "data/Blockout_Basics/Walls/DoorWall2x2.fbx";
mountedNode = "mount0";
lightColor = "1 1 1 1";
lightAmbient = "0.5 0.5 0.5 1";
lightDirection = "0 0.707 -0.707";
orbitDiststance = "5";
minOrbitDiststance = "141.715";
maxOrbitDiststance = "5";
cameraSpeed = "0.01";
cameraRotation = "0 0 0";
cameraZRot = "0";
forceFOV = "0";
reflectPriority = "0";
renderStyle = "standard";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "7 4";
extent = "80 80";
minExtent = "8 8";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "ToolsGuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "shapeAssetView";
class = "AssetPreviewControl";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "0";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "0 0";
extent = "80 80";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
internalName="AssetPreviewBorderButton";
};
};
new GuiButtonCtrl() {
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "1";
position = "0 0";
extent = "100 104";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiThumbHighlightButtonProfile";
visible = "1";
active = "1";
command = "AssetBrowser.updateSelection( $ThisControl.getParent().assetName, $ThisControl.getParent().moduleName );";
tooltipProfile = "GuiToolTipProfile";
tooltip = "\n20540";
hovertime = "1000";
isContainer = "0";
internalName = "Button";
class = "AssetPreviewButton";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextEditCtrl() {
historySize = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
text = "DoorWall2x2";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 84";
extent = "100 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfile";
visible = "1";
active = "0";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "AssetNameLabel";
class = "AssetNameField";
canSave = "1";
canSaveDynamicFields = "0";
};
};
new GuiControl() {
position = "102 0";
extent = "100 124";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "GeneralAssetPreviewButton";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "Data/Blockout_Basics/Walls/WallGrid2x2_Albedo.png";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "0";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "10 4";
extent = "80 80";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
internalName = "assetPreviewImage";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "0";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "0 0";
extent = "80 80";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
internalName="AssetPreviewBorderButton";
};
};
new GuiButtonCtrl() {
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "1";
position = "0 0";
extent = "100 104";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiThumbHighlightButtonProfile";
visible = "1";
active = "1";
command = "AssetBrowser.updateSelection( $ThisControl.getParent().assetName, $ThisControl.getParent().moduleName );";
tooltipProfile = "GuiToolTipProfile";
tooltip = "\n20550";
hovertime = "1000";
isContainer = "0";
internalName = "Button";
class = "AssetPreviewButton";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiTextEditCtrl() {
historySize = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
password = "0";
passwordMask = "*";
text = "WallGrid2x2";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 84";
extent = "100 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfile";
visible = "1";
active = "0";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "AssetNameLabel";
class = "AssetNameField";
canSave = "1";
canSaveDynamicFields = "0";
};
};
};
//--- OBJECT WRITE END ---

2
Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
$guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_editAsset) {
$guiContent = new GuiControl(AssetBrowser_editAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_editModule) {
$guiContent = new GuiControl(AssetBrowser_editModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/gameObjectCreator.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GameObjectCreator) {
$guiContent = new GuiControl(GameObjectCreator) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(LooseFileAudit) {
$guiContent = new GuiControl(LooseFileAudit) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newAsset) {
$guiContent = new GuiControl(AssetBrowser_newAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
$guiContent = new GuiControl(AssetBrowser_newComponentAsset) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_newFolder) {
$guiContent = new GuiControl(AssetBrowser_newFolder) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_SelectModule) {
$guiContent = new GuiControl(AssetBrowser_SelectModule) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser_SelectPackage) {
$guiContent = new GuiControl(AssetBrowser_SelectPackage) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(SelectAssetPath) {
$guiContent = new GuiControl(SelectAssetPath) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

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

@ -263,6 +263,8 @@ function AssetBrowser::selectAsset( %this, %asset )
//eval("materialEd_previewMaterial." @ %propertyField @ " = " @ %value @ ";");
if( AssetBrowser.returnType $= "name" )
{
// TODO!
%name = "";
eval( "" @ AssetBrowser.selectCallback @ "(" @ %name @ ");");
}
else
@ -689,6 +691,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;
@ -931,6 +934,8 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc)
if ( %name $= "" )
%name = %class;
// TODO
%group = "";
if ( %this.currentCreatorGroup !$= "" && %group $= "" )
%group = %this.currentCreatorGroup;
@ -1074,6 +1079,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";
@ -1134,6 +1146,9 @@ function AssetBrowser::reImportAsset(%this)
//if(%assetType $= "ImageAsset")
// %filters = "";
//TODO
%currentFile = "";
%dlg = new OpenFileDialog()
{
Filters = "(All Files (*.*)|*.*|";

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

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

@ -344,7 +344,7 @@ function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position)
%newStatic = new TSStatic()
{
position = %pos;
position = %position;
shapeAsset = %assetId;
};

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

@ -161,6 +161,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);
@ -254,9 +258,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 "";

2
Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(@@)
$guiContent = new GuiControl(@@)
{
position = "0 0";
extent = "100 100";