Merge pull request #495 from JeffProgrammer/tsneo

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AddFMODProjectDlg,EditorGuiGroup) {
$guiContent = new GuiControl(AddFMODProjectDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiOverlayProfile";
HorizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AxisGizmoSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(AxisGizmoSettingsTab,EditorGuiGroup) {
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CameraSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(CameraSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiContainer(EditorChooseLevelGui, EditorGuiGroup) {
$guiContent = new GuiContainer(EditorChooseLevelGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
@ -34,7 +34,7 @@
};
};
%guiContent = new GuiContainer(EditorChooseLevelContainer, EditorGuiGroup) {
$guiContent = new GuiContainer(EditorChooseLevelContainer, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
$guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
$guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

View file

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GenericPromptDialog) {
$guiContent = new GuiControl(GenericPromptDialog) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) {
$guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiModelessDialogProfile";
HorizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) {
$guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
@ -843,7 +843,7 @@
password = "0";
tabComplete = "0";
sinkAllKeyEvents = "0";
passwordMask = "";
passwordMask = "<EFBFBD>";
text = "2.0";
maxLength = "6";
margin = "0 0 0 0";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ProceduralTerrainPainterGui) {
$guiContent = new GuiControl(ProceduralTerrainPainterGui) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";

View file

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TerrainBrushSoftnessCurveDlg, EditorGuiGroup) {
$guiContent = new GuiControl(TerrainBrushSoftnessCurveDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "TerrainEditToolbar";
Enabled = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TerrainEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(TerrainEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "TerrainPainterToolbar";
Enabled = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) {
$guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TimeAdjustGui, EditorGuiGroup) {
$guiContent = new GuiControl(TimeAdjustGui, EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiModelessDialogProfile";
HorizSizing = "right";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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--)
{

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiContainer(EWToolsToolbar) {
$guiContent = new GuiContainer(EWToolsToolbar) {
canSaveDynamicFields = "0";
Enabled = "0";
internalName = "ToolsToolbar";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TransformSelectionContainer, EditorGuiGroup) {
$guiContent = new GuiControl(TransformSelectionContainer, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) {
$guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "WorldEditorToolbar";
Enabled = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CreateNewTerrainGui, EditorGuiGroup) {
$guiContent = new GuiControl(CreateNewTerrainGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TerrainExportGui, EditorGuiGroup) {
$guiContent = new GuiControl(TerrainExportGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiOverlayProfile";
Enabled = "1";
@ -288,6 +288,9 @@ function TerrainExportGui::selectFolder( %this )
function TerrainExportGui::doOpenDialog( %this, %filter, %callback )
{
// TODO
%currentFile = "";
%dlg = new OpenFolderDialog()
{
Title = "Select Export Folder";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) {
$guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
@ -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;

View file

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

View file

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(WorldEditorMissionInspector,EditorGuiGroup) {
$guiContent = new GuiControl(WorldEditorMissionInspector,EditorGuiGroup) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ObjectBuilderGui, EditorGuiGroup) {
$guiContent = new GuiControl(ObjectBuilderGui, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

View file

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

View file

@ -4,7 +4,7 @@
//---------------------------------------------------------------------------------------------
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) {
$guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiModelessDialogProfile";

View file

@ -113,9 +113,9 @@ function EditorGui::init(%this)
{
// Load Terrain Painter GUI
exec("~/worldEditor/gui/TerrainPainterWindow.ed.gui");
if( isObject( %guiContent ) ){
%this.add( %guiContent->TerrainPainter );
%this.add( %guiContent->TerrainPainterPreview );
if( isObject( $guiContent ) ){
%this.add( $guiContent->TerrainPainter );
%this.add( $guiContent->TerrainPainterPreview );
}
exec("~/worldEditor/gui/guiTerrainMaterialDlg.ed.gui");
@ -399,7 +399,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %image
Visible = "1";
Command = "EditorGui.setEditor(" @ %pluginName @ ");";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = %tooltip;
ToolTip = "";// %tooltip;
hovertime = "750";
bitmapAsset = %imageAsset;
buttonType = "RadioButton";

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 );

View file

@ -298,7 +298,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this)
%targetMap.setBitmap( %image );
%targetMapName = %mapName @ "AssetId";
%targetMapName = %targetMap @ "AssetId";
%targetMapName.setText(%imgAsset);
TerrainMaterialDlg.matDirty = true;

View file

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