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

Added changes missed via merge failures.

Browse source 
Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.asset.taml
View file

@ -1,7 +0,0 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AssetImportConfigEditor"
scriptFile="@assetFile=AssetImportConfigEditor.gui"
GUIFile="@assetFile=AssetImportConfigEditor.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/assetBrowser/guis/AssetPreviewButtonsTemplate.asset.taml
View file

@ -1,7 +0,0 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="AssetPreviewButtonsTemplate"
scriptFile="@assetFile=assetPreviewButtonsTemplate.gui"
GUIFile="@assetFile=assetPreviewButtonsTemplate.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.asset.taml
View file

@ -1,7 +0,0 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GameObjectCreator"
scriptFile="@assetFile=GameObjectCreator.gui"
GUIFile="@assetFile=GameObjectCreator.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/assetBrowser/guis/assetImportConfigEditor.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="assetImportConfigEditor"
scriptFile="@assetFile=assetImportConfigEditor.gui"
GUIFile="@assetFile=assetImportConfigEditor.gui"
VersionId="1" />

0
Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui → Templates/BaseGame/game/tools/assetBrowser/guis/assetImportConfigEditor.gui
View file

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

@ -1,270 +0,0 @@
//--- 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/CreateNewCollectionSetCtrl.asset.taml → Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSetCtrl.asset.taml
View file

@ -1,7 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="CreateNewCollectionSetCtrl"
AssetName="createNewCollectionSetCtrl"
scriptFile="@assetFile=createNewCollectionSet.gui"
GUIFile="@assetFile=createNewCollectionSet.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/assetBrowser/guis/gameObjectCreator.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="gameObjectCreator"
scriptFile="@assetFile=gameObjectCreator.gui"
GUIFile="@assetFile=gameObjectCreator.gui"
VersionId="1" />

0
Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui → Templates/BaseGame/game/tools/assetBrowser/guis/gameObjectCreator.gui
View file