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

lotsa fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-05-04 21:18:15 -04:00
parent db047275f1
commit 6f7fdca87d
178 changed files with 230 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui
View file

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

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui
View file

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

2
Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui
View file

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

2
Templates/BaseGame/game/tools/gui/assimpImport.ed.gui
View file

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

6
Templates/BaseGame/game/tools/gui/colladaImport.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
$guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";
@ -1754,8 +1754,8 @@ function convertColladaModels(%pattern)
function showImportDialog(%shapePath, %cmd)
{
%this.path = %shapePath;
%this.cmd = %cmd;
ColladaImportDlg.path = %shapePath;
ColladaImportDlg.cmd = %cmd;
if ( fileExt(%shapePath) $= ".dts" || fileExt(%shapePath) $= ".dsq"
|| fileExt(%shapePath) $= ".dae" || fileExt(%shapePath) $= ".kmz" )

2
Templates/BaseGame/game/tools/gui/colorPicker.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
$guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
displayMode = "Dropper"; // this makes the background visible
actionOnMove = "1";
position = "0 0";

2
Templates/BaseGame/game/tools/gui/cubemapEditor.gui
View file

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

3
Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript
View file

@ -255,8 +255,7 @@ function FileDialogOkButton::onClick( %this )
// Callback
eval( %this.parent.SuccessCallback @ "(\"" @ %fullPath @"\");" );
%parent.SuccessCallback = 0;
%this.parent.SuccessCallback = 0;
//error("Ok");

2
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl() {
$guiContent = new GuiWindowCollapseCtrl() {
collapseGroup = "-1";
collapseGroupNum = "-1";
resizeWidth = "1";

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

@ -37,7 +37,7 @@ function inspectObject( %object )
// Create a new object inspector window.
exec( "./guiObjectInspector.ed.gui" );
if( !isObject( %guiContent) )
if( !isObject( $guiContent) )
{
error( "InspectObject: failed to create GUI from 'guiObjectInspector.ed.gui'" );
return;
@ -45,9 +45,9 @@ function inspectObject( %object )
// Initialize the inspector.
%guiContent.init( %object );
$guiContent.init( %object );
Canvas.getContent().add( %guiContent );
Canvas.getContent().add( $guiContent );
}
//=============================================================================================

4
Templates/BaseGame/game/tools/gui/materialSelector.ed.gui
View file

@ -778,6 +778,8 @@ function MaterialSelector::buildStaticFilters( %this )
// if you want to add any more containers to staticFilterObjects, here's
// where to do it
%filterArray = MaterialSelector-->filterArray;
%staticFilterContainer = new GuiControl (){
new GuiContainer(){
profile = "ToolsGuiDefaultProfile";
@ -1366,7 +1368,7 @@ function MaterialSelector::loadMaterialFilters( %this )
// create category and update current material if there is one
function MaterialSelector::createFilter( %this, %filter )
{
if( %filter $= %existingFilters )
if( %filter $= "" )
{
toolsMessageBoxOK( "Error", "Can not create blank filter.");
return;

2
Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(IODropdownDlg) {
$guiContent = new GuiControl(IODropdownDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessagePopupDlg) {
$guiContent = new GuiControl(MessagePopupDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/postFxEditor.gui
View file

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

2
Templates/BaseGame/game/tools/gui/profilerGraph.gui
View file

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

2
Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui
View file

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

2
Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui
View file

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

2
Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
View file

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

2
Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui
View file

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