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

Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check

Browse source 
# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp
This commit is contained in:
AzaezelX 2021-08-02 13:54:51 -05:00
commit c5d0310bc3
180 changed files with 2337 additions and 1572 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_d_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Images_btn_Palette_d_image"
imageFile="@assetFile=btn_Palette_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Images_btn_Palette_h_image"
imageFile="@assetFile=btn_Palette_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Images_btn_Palette_n_image"
imageFile="@assetFile=btn_Palette_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

4
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui
View file

@ -141,7 +141,7 @@ new VPathEditor(EVPathEditor) {
};
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -431,4 +431,4 @@ function OnOrientationChanged()
%mode = EPathEditorNodeOrientationMode.getText();
%data = EPathEditorNodeOrientationData.getText();
EVPathEditor.setNodeOrientationMode( %mode, %data );
}
}

14
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui
View file

@ -33,7 +33,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Select Path / Node (1)";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/arrow";
bitmapAsset = "ToolsModule:arrow_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -53,7 +53,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Move Point (2)";
hovertime = "1000";
bitmap = "tools/worldEditor/images/road-river/move-point";
bitmapAsset = "ToolsModule:move_point_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -73,7 +73,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Rotate Point (3)";
hovertime = "1000";
bitmap = "tools/worldEditor/images/road-river/rotate-point";
bitmapAsset = "ToolsModule:rotate_point_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -93,7 +93,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Scale Point (4)";
hovertime = "1000";
bitmap = "tools/worldEditor/images/road-river/scale-point";
bitmapAsset = "ToolsModule:scale_point_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -113,7 +113,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Add Node (5)";
hovertime = "1000";
bitmap = "tools/worldEditor/images/road-river/add-point";
bitmapAsset = "ToolsModule:add_point_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -133,7 +133,7 @@
tooltipprofile = "GuiToolTipProfile";
ToolTip = "Delete Node (6)";
hovertime = "1000";
bitmap = "tools/worldEditor/images/road-river/subtract-point";
bitmapAsset = "ToolsModule:subtract_point_n_image";
buttonType = "RadioButton";
useMouseEvents = "0";
};
@ -173,4 +173,4 @@ function EVPathEditorAddNodeButton::onClick( %this )
function EVPathEditorDeleteNodeButton::onClick( %this )
{
EVPathEditor.EditMode = "DeleteNode";
}
}

4
Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript
View file

@ -40,7 +40,7 @@ function VPathEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Path Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", expandFilename( "tools/VPathEditor/GUI/Images/btn_Palette" ), %tooltip );
EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", "ToolsModule:btn_Palette_n_image", %tooltip );
// Find and Store the Button.
%this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VPathEditorPalette", false );
@ -175,4 +175,4 @@ function VPathEditorPlugin::syncGizmo( %this )
case "Rotate" : EVPathEditorRotateButton.performClick();
case "Scale" : EVPathEditorScaleButton.performClick();
}
}
}

2
Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript
View file

@ -170,7 +170,7 @@ singleton GuiControlProfile ( VEditorScrollProfile : VEditorDefaultProfile )
border = false;
hasBitmapArray = true;
bitmap = "./Images/ScrollBar";
bitmapAsset = "ToolsModule:Images_ScrollBar_image";
};
singleton GuiControlProfile ( VEditorCheckBoxProfile : GuiCheckBoxProfile )

8
Templates/BaseGame/game/tools/VerveEditor/GUI/Images/Images_ScrollBar_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Images_ScrollBar_image"
imageFile="@assetFile=scrollBar.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

22
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui
View file

@ -307,7 +307,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddGroup";
bitmapAsset = "ToolsModule:btn_AddGroup_image";
};
new GuiBitmapButtonCtrl(VerveEditorAddTrackButton) {
canSaveDynamicFields = "0";
@ -330,7 +330,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddTrack";
bitmapAsset = "ToolsModule:btn_AddTrack_image";
};
new GuiBitmapButtonCtrl(VerveEditorAddEventButton) {
canSaveDynamicFields = "0";
@ -352,7 +352,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddEvent";
bitmapAsset = "ToolsModule:btn_AddEvent_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -374,7 +374,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Delete";
bitmapAsset = "ToolsModule:btn_Delete_image";
};
};
};
@ -623,7 +623,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Rewind";
bitmapAsset = "ToolsModule:btn_Rewind_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -645,7 +645,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_StepB";
bitmapAsset = "ToolsModule:btn_StepB_image";
};
new GuiBitmapButtonCtrl(VerveEditorPlayButton) {
canSaveDynamicFields = "0";
@ -667,7 +667,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Play";
bitmapAsset = "ToolsModule:btn_Play_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -689,7 +689,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_StepF";
bitmapAsset = "ToolsModule:btn_StepF_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -711,7 +711,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Forward";
bitmapAsset = "ToolsModule:btn_Forward_image";
};
};
new GuiBitmapButtonCtrl() {
@ -734,7 +734,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddL";
bitmapAsset = "ToolsModule:btn_AddL_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -756,7 +756,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddR";
bitmapAsset = "ToolsModule:btn_AddR_image";
};
};
};

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.tscript
View file

@ -22,4 +22,4 @@ function VerveEditor::InitInspectorFieldScripts()
exec( "./TypeVShapeAnimationEnum." @ $TorqueScriptFileExtension );
exec( "./TypeToggleEnum." @ $TorqueScriptFileExtension );
}
VerveEditor::InitInspectorFieldScripts();
VerveEditor::InitInspectorFieldScripts();

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.tscript
View file

@ -17,4 +17,4 @@ function VerveEditor::InitInspectorScripts()
exec( "./Fields/main." @ $TorqueScriptFileExtension );
}
VerveEditor::InitInspectorScripts();
VerveEditor::InitInspectorScripts();

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript
View file

@ -26,7 +26,7 @@ function VerveEditorPlugin::onWorldEditorStartup( %this )
%tooltip = "Verve Editor (" @ %accel @ ")";
// Add ourselves to the ToolsToolbar
EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", expandFilename( "tools/VerveEditor/GUI/Images/btn_Palette" ), %tooltip );
EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", "ToolsModule:btn_Palette_n_image", %tooltip );
// Find and Store the Button.
%this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VerveEditorPluginPalette", false );

2
Templates/BaseGame/game/tools/VerveEditor/main.tscript
View file

@ -231,4 +231,4 @@ function VerveEditor::Reset()
// Stop.
$VerveEditor::Controller.Stop();
}
}
}

2
Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml
View file

@ -187,7 +187,7 @@
<Setting
name="AutomaticallyPromptMissingFiles">0</Setting>
<Setting
name="DuplicatAutoResolution">AutoPrune</Setting>
name="DuplicateAutoResolution">FolderPrefix</Setting>
<Setting
name="PreventImportWithErrors">1</Setting>
<Setting

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

@ -469,7 +469,7 @@
command="AssetBrowserFolderSearchFilter.onEdited();";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/stencilIcons/zoom.png";
bitmapAsset = "ToolsModule:zoom_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -631,7 +631,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(AssetBrowser_NavigateBackBtn) {
bitmap = "tools/gui/images/folderUp.png";
bitmapAsset = "ToolsModule:folderUp_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -657,7 +657,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowser_NavigateForwardBtn) {
bitmap = "tools/gui/images/folderDown.png";
bitmapAsset = "ToolsModule:folderDown_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -758,7 +758,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(AssetBrowser_VisibilityOptions) {
bitmap = "tools/gui/images/visible";
bitmapAsset = "ToolsModule:visible_n_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -814,7 +814,7 @@
command="AssetBrowserSearchFilter.onEdited();";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/stencilIcons/zoom.png";
bitmapAsset = "ToolsModule:zoom_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -840,7 +840,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1034,7 +1034,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(AssetBrowser_ToggleFolderPanel) {
bitmap = "tools/gui/images/stencilIcons/previous.png";
bitmapAsset = "ToolsModule:previous_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";

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

@ -95,7 +95,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconOpen.png";
bitmapAsset = "ToolsModule:iconOpen_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -221,7 +221,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-as";
bitmapAsset = "ToolsModule:save_as_n_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -504,7 +504,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(ImportLogButton) {
bitmap = "tools/gui/images/iconInformation.png";
bitmapAsset = "ToolsModule:iconInformation_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -198,7 +198,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -225,7 +225,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconDelete.png";
bitmapAsset = "ToolsModule:iconDelete_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -132,7 +132,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GameObjectCreatorPkgBtn) {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -119,7 +119,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconOpen.png";
bitmapAsset = "ToolsModule:iconOpen_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -98,7 +98,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -75,7 +75,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -75,7 +75,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

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

@ -96,7 +96,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

2
Templates/BaseGame/game/tools/assetBrowser/main.tscript
View file

@ -200,4 +200,4 @@ function TSStatic::onConstructField(%this, %fieldName, %fieldLabel, %fieldTypeNa
%makeCommand = %this @ ".build" @ %fieldTypeName @ "Field(\""@ %fieldName @ "\",\"" @ %fieldLabel @ "\",\"" @ %fieldDesc @ "\",\"" @
%fieldDefaultVal @ "\",\"" @ %fieldDataVals @ "\",\"" @ %inspector @ "." @ %callbackName @ "\",\"" @ %ownerObj @"\");";
eval(%makeCommand);
}
}

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

@ -3,7 +3,6 @@ new SimGroup(AssetBrowserPreviewCache);
//AssetBrowser.addToolbarButton
function AssetBrowser::addToolbarButton(%this)
{
%filename = expandFilename("tools/gui/images/stencilIcons/menuGrid");
%button = new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = AssetBrowserBtn;
@ -21,7 +20,7 @@ function AssetBrowser::addToolbarButton(%this)
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Asset Browser";
hovertime = "750";
bitmap = %filename;
bitmapAsset = "ToolsModule:menuGrid_n_image";
bitmapMode = "Stretched";
buttonType = "PushButton";
groupNum = "0";
@ -2142,7 +2141,7 @@ function AssetBrowser::updateNavigationBreadcrumb(%this, %address)
%folderSpacerButton = new GuiBitmapButtonCtrl()
{
profile = ToolsGuiButtonProfile;
bitmap = "tools/gui/images/rightArrowWhite";
bitmapAsset = "ToolsModule:rightArrowWhite_image";
bitmapMode = "Centered";
extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y;
//command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";
@ -2575,4 +2574,4 @@ function AssetBrowser::importLooseFiles(%this)
{
echo("Adding loose files at directory " @ %this.dirHandler.currentAddress);
LooseFileAuditWindow.showDialog(%this.dirHandler.currentAddress);
}
}

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

@ -31,7 +31,7 @@ function setupImportConfigSettingsList()
{
new ArrayObject(ImportAssetConfigSettingsList);
ImportAssetConfigSettingsList.addNewConfigSetting("General/DuplicatAutoResolution", "Duplicate Asset Auto-Resolution Action", "list", "", "AutoPrune", "None,AutoPrune,AutoRename");
ImportAssetConfigSettingsList.addNewConfigSetting("General/DuplicateAutoResolution", "Duplicate Asset Auto-Resolution Action", "list", "", "AutoRename", "None,AutoPrune,AutoRename,FolderPrefix");
ImportAssetConfigSettingsList.addNewConfigSetting("General/WarningsAsErrors", "Warnings As Errors", "bool", "", "0", "", "");
ImportAssetConfigSettingsList.addNewConfigSetting("General/PreventImportWithErrors", "Prevent Import With Errors", "bool", "", "1", "", "");
ImportAssetConfigSettingsList.addNewConfigSetting("General/AutomaticallyPromptMissingFiles", "Automatically Prompt Missing Files", "bool", "", "0", "", "");

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

@ -145,4 +145,4 @@ function AssetBrowser::buildComponentAssetPreview(%this, %assetDef, %previewData
%previewData.assetFriendlyName = %assetDef.friendlyName;
%previewData.assetDesc = %assetDef.description;
%previewData.tooltip = %assetDef.friendlyName @ "\n" @ %assetDef;
}
}

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

@ -293,4 +293,4 @@ function GuiInspectorTypeGameObjectAssetPtr::onClick( %this, %fieldName )
//We've gotta be trying to create a GameObject, so kick that off
AssetBrowser.createGameObjectAsset();
}
}
}

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

@ -176,4 +176,4 @@ function AssetBrowser::buildGUIAssetPreview(%this, %assetDef, %previewData)
%previewData.assetFriendlyName = %assetDef.assetName;
%previewData.assetDesc = %assetDef.description;
%previewData.tooltip = %assetDef.assetName;
}
}

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

@ -114,7 +114,7 @@ function directoryHandler::navigateTo(%this, %address, %historyNav, %selectionNa
%folderSpacerButton = new GuiBitmapButtonCtrl()
{
profile = ToolsGuiButtonProfile;
bitmap = "tools/gui/images/rightArrowWhite";
bitmapAsset = "ToolsModule:rightArrowWhite_image";
bitmapMode = "Centered";
extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y;
//command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";
@ -338,4 +338,4 @@ function directoryHandler::copyFolder(%this, %fromFolder, %toFolder)
}
return true;
}
}

7
Templates/BaseGame/game/tools/base/images/Grid_512_Black.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Black"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Black"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_ForestGreen.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_ForestGreen"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_ForestGreen"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_ForestGreen_Lines.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_ForestGreen_Lines"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_ForestGreen_Lines"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Green.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Green"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Green"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Grey.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Grey"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Grey"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Grey_Base.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Grey_Base"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Grey_Base"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Orange.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Orange"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Orange"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Orange_Lines.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Orange_Lines"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Orange_Lines"
VersionId="1" />

7
Templates/BaseGame/game/tools/base/images/Grid_512_Red.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Grid_512_Red"
scriptFile="@assetFile=materials.tscript"
materialDefinitionName="Grid_512_Red"
VersionId="1" />

6
Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript
View file

@ -66,7 +66,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
position = "7 4";
extent = "64 64";
buttonType = "PushButton";
bitmap = "";
bitmapAsset = "";
Command = "";
text = "Loading...";
useStates = false;
@ -80,7 +80,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, %
extent = "64 64";
Variable = "";
buttonType = "toggleButton";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
groupNum = "0";
text = "";
tooltip = "Change material";
@ -274,4 +274,4 @@ function materialFieldBtn::onClick(%this)
function materialFieldBtn::setMaterial(%this, %matAssetName)
{
}
}

2
Templates/BaseGame/game/tools/componentEditor/main.tscript
View file

@ -32,4 +32,4 @@ exec("./gui/superToolTipDlg.ed.gui");
//field types
exec("./interface/materialFieldType." @ $TorqueScriptFileExtension);
exec("./interface/typeMaskFieldType." @ $TorqueScriptFileExtension);
exec("./interface/stateMachineField." @ $TorqueScriptFileExtension);
exec("./interface/stateMachineField." @ $TorqueScriptFileExtension);

8
Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui
View file

@ -55,7 +55,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Create ConvexShape Box" NL "Use Alt + Click-Drag instead of this for more control of starting placement.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/convex-editor-btn";
bitmapAsset = "ToolsModule:convex_editor_btn_n_image";
text = "";
groupNum = "-1";
buttonType = "pushButton";
@ -76,7 +76,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Split selected face" NL "Use Ctrl + Rotate instead for more control.";
hovertime = "1000";
bitmap = "tools/convexEditor/images/split-face-btn";
bitmapAsset = "ToolsModule:split_face_btn_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";
@ -97,7 +97,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Delete selected face" NL "(Delete)";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/delete-btn";
bitmapAsset = "ToolsModule:delete_btn_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";
@ -145,7 +145,7 @@
buttonType = "toggleButton";
useMouseEvents = "0";
groupNum = "-1";
bitmap = "tools/gui/images/menubar/snap-grid";
bitmapAsset = "ToolsModule:menubar_snap_grid_n_image";
textMargin = "4";
};
new GuiTextCtrl() {

4
Templates/BaseGame/game/tools/convexEditor/main.tscript
View file

@ -68,7 +68,7 @@ function ConvexEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Sketch Tool (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "ConvexEditorPlugin", "ConvexEditorPalette", expandFilename("tools/convexEditor/images/convex-editor-btn"), %tooltip );
EditorGui.addToToolsToolbar( "ConvexEditorPlugin", "ConvexEditorPalette", "ToolsModule:convex_editor_btn_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( ConvexEditorOptionsWindow, ConvexEditorTreeWindow);
@ -232,4 +232,4 @@ function ConvexEditorPlugin::writeSettings( %this )
EditorSettings.beginGroup( "ConvexEditor", true );
EditorSettings.setValue( "MaterialName", ConvexEditorGui.materialName );
EditorSettings.endGroup();
}
}

4
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui
View file

@ -166,7 +166,7 @@
active = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -186,7 +186,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-as";
bitmapAsset = "ToolsModule:save_as_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

6
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui
View file

@ -103,7 +103,7 @@
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -265,7 +265,7 @@
};
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -286,7 +286,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

2
Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript
View file

@ -46,7 +46,7 @@ function DatablockEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Datablock Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "DatablockEditorPlugin", "DatablockEditorPalette", expandFilename("tools/worldEditor/images/toolbar/datablock-editor"), %tooltip );
EditorGui.addToToolsToolbar( "DatablockEditorPlugin", "DatablockEditorPalette", "ToolsModule:datablock_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::Attach( DatablockEditorInspectorWindow, DatablockEditorTreeWindow);

8
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui
View file

@ -310,7 +310,7 @@
tooltip = "Save All";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
};
new GuiBitmapButtonCtrl(RetargetDecalButton) {
@ -329,7 +329,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
tooltip = "Retarget missing decals to an existing decal datablock";
bitmap = "tools/gui/images/retarget-btn";
bitmapAsset = "ToolsModule:retarget_btn_n_image";
buttonType = "PushButton";
useMouseEvents = "0";
};
@ -350,7 +350,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
tooltip = "Create New Decal Template";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
buttonType = "PushButton";
useMouseEvents = "0";
};
@ -372,7 +372,7 @@
hovertime = "1000";
text = "";
tooltip = "Delete Selected Decal Template";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

2
Templates/BaseGame/game/tools/decalEditor/main.tscript
View file

@ -78,7 +78,7 @@ function DecalEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Decal Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "DecalEditorPlugin", "DecalEditorPalette", expandFilename("tools/decalEditor/decal-editor"), %tooltip );
EditorGui.addToToolsToolbar( "DecalEditorPlugin", "DecalEditorPalette", "ToolsModule:decal_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( DecalPreviewWindow, DecalEditorWindow );

8
Templates/BaseGame/game/tools/editorClasses/gui/images/images_window_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="images_window_image"
imageFile="@assetFile=window.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

12
Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.tscript
View file

@ -30,36 +30,36 @@ singleton GuiControlProfile (NavPanelProfile)
singleton GuiControlProfile (NavPanel : NavPanelProfile)
{
bitmap = "./navPanel";
bitmapAsset = "ToolsModule:navPanel_image";
category = "Editor";
};
singleton GuiControlProfile (NavPanelBlue : NavPanelProfile)
{
bitmap = "./navPanel_blue";
bitmapAsset = "ToolsModule:navPanel_blue_image";
category = "Editor";
};
singleton GuiControlProfile (NavPanelGreen : NavPanelProfile)
{
bitmap = "./navPanel_green";
bitmapAsset = "ToolsModule:navPanel_green_image";
category = "Editor";
};
singleton GuiControlProfile (NavPanelRed : NavPanelProfile)
{
bitmap = "./navPanel_red";
bitmapAsset = "ToolsModule:navPanel_red_image";
category = "Editor";
};
singleton GuiControlProfile (NavPanelWhite : NavPanelProfile)
{
bitmap = "./navPanel_white";
bitmapAsset = "ToolsModule:navPanel_white_image";
category = "Editor";
};
singleton GuiControlProfile (NavPanelYellow : NavPanelProfile)
{
bitmap = "./navPanel_yellow";
bitmapAsset = "ToolsModule:navPanel_yellow_image";
category = "Editor";
};

2
Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.tscript
View file

@ -391,4 +391,4 @@ function GuiFormManager::ClearLayoutContent( %layoutObj )
else
GuiFormManager::ClearLayoutContent( %object );
}
}
}

6
Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui
View file

@ -118,7 +118,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -220,7 +220,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -322,7 +322,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

10
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui
View file

@ -295,7 +295,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/forestEditor/images/new-mesh";
bitmapAsset = "ToolsModule:new_mesh_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -315,7 +315,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -358,7 +358,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/forestEditor/images/new-brush";
bitmapAsset = "ToolsModule:new_brush_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -378,7 +378,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/forestEditor/images/new-element";
bitmapAsset = "ToolsModule:new_element_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -398,7 +398,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

4
Templates/BaseGame/game/tools/forestEditor/main.tscript
View file

@ -119,7 +119,7 @@ function ForestEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the tools menu.
%tooltip = "Forest Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "ForestEditorPlugin", "ForestEditorPalette", expandFilename("tools/forestEditor/images/forest-editor-btn"), %tooltip );
EditorGui.addToToolsToolbar( "ForestEditorPlugin", "ForestEditorPalette", "ToolsModule:forest_editor_btn_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( ForestEditorPropertiesWindow, ForestEditorPalleteWindow );
@ -308,4 +308,4 @@ function ForestEditorPlugin::handleCopy( %this )
function ForestEditorPlugin::handlePaste( %this )
{
ForestTools->SelectionTool.pasteSelection();
}
}

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

@ -284,7 +284,7 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd)
if (isFile(%csPath))
exec(%csPath);
%this.constructor = ShapeEditor.findConstructor(%this.path);
%this.constructor = findShapeConstructorByFilename(%this.path);
// Only show the import dialog if required. Note that 'GetShapeInfo' will
// fail if the source file is missing, or a cached.dts is available.
@ -537,4 +537,4 @@ function AssimpImportDlg::saveSettingsTo(%this, %filename)
%fileObj.close();
%fileObj.delete();
}
}

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

@ -1259,7 +1259,7 @@ function ColladaImportDlg::showDialog(%this, %shapePath, %cmd)
if (isFile(%csPath))
exec(%csPath);
%this.constructor = ShapeEditor.findConstructor(%this.path);
%this.constructor = findShapeConstructorByFilename(%this.path);
// Only show the import dialog if required. Note that 'enumColladaScene' will
// fail if the COLLADA file is missing, or a cached.dts is available.
@ -1768,4 +1768,4 @@ function showImportDialog(%shapePath, %cmd)
if ( isObject(AssimpImportDlg) )
AssimpImportDlg.showDialog(%shapePath, %cmd);
}
}
}

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

@ -170,7 +170,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// ------------------------------ X Negitive ------------------------------------
new GuiBitmapCtrl(matEd_cubemapEd_XNeg) {
@ -213,7 +213,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// ------------------------------ Y Positive ------------------------------------
new GuiBitmapCtrl(matEd_cubemapEd_YPos) {
@ -256,7 +256,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// ------------------------------ Y Negitive ------------------------------------
new GuiBitmapCtrl(matEd_cubemapEd_YNeG) {
@ -299,7 +299,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// ------------------------------ Z Positive ------------------------------------
new GuiBitmapCtrl(matEd_cubemapEd_ZPos) {
@ -342,7 +342,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// ------------------------------ Z Negitive ------------------------------------
new GuiBitmapCtrl(matEd_cubemapEd_ZNeg) {
@ -385,7 +385,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
// Create New Cubemap
@ -404,7 +404,7 @@
Command = "matEd_addCubemapWindow.setVisible(1);"; // -------------- Needs Hookup Create New Cubemap
hovertime = "1000";
tooltip = "Create New Cubemap";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -424,7 +424,7 @@
Command = "MaterialEditorGui.showDeleteCubemapDialog();"; // -------------- Needs Hookup Delete Cubemap
hovertime = "1000";
tooltip = "Delete Cubemap";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -445,7 +445,7 @@
Command = "MaterialEditorGui.showSaveCubemapDialog();"; // -------------- Needs Hookup Save Cubemap
hovertime = "1000";
tooltip = "Save Cubemap";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

2
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
View file

@ -531,4 +531,4 @@ function ESettingsWindow::getGameOptionsSettings(%this)
SettingsInspector.startGroup("Options Settings");
SettingsInspector.addSettingsField("Options/optionsList", "OptionsList", "OptionsSetting", "");
SettingsInspector.endGroup();
}
}

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

@ -94,7 +94,7 @@
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

8
Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_d_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="menubar_snap_grid_d_image"
imageFile="@assetFile=snap-grid_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_h_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="menubar_snap_grid_h_image"
imageFile="@assetFile=snap-grid_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/gui/images/menubar/menubar_snap_grid_n_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="menubar_snap_grid_n_image"
imageFile="@assetFile=snap-grid_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/gui/images/treeview/treeview_default_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="treeview_default_image"
imageFile="@assetFile=default.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

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

@ -157,7 +157,7 @@ new GuiControl(MaterialSelectorOverlay, EditorGuiGroup) {
Command = "MaterialSelector.showDeleteDialog();";
hovertime = "1000";
tooltip = "Delete Material";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -894,7 +894,7 @@ function MaterialSelector::buildStaticFilters( %this )
Command = "MaterialSelector_addFilterWindow.setVisible(1); MaterialSelectorOverlay.pushToBack(MaterialSelector_addFilterWindow);";
hovertime = "1000";
tooltip = "Create New Tag";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -914,7 +914,7 @@ function MaterialSelector::buildStaticFilters( %this )
Command = "MaterialSelector.clearMaterialFilters();";
hovertime = "1000";
tooltip = "Clear Selected Tag";
bitmap = "tools/gui/images/clear-btn";
bitmapAsset = "ToolsModule:clear_btn_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1226,7 +1226,7 @@ function MaterialSelector::buildPreviewArray( %this, %material )
position = "7 4";
extent = "64 64";
buttonType = "PushButton";
bitmap = "";
bitmapAsset = "";
Command = "";
text = "Loading...";
useStates = false;
@ -1239,7 +1239,7 @@ function MaterialSelector::buildPreviewArray( %this, %material )
extent = "64 64";
Variable = "";
buttonType = "toggleButton";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
groupNum = "0";
text = "";
};
@ -1662,7 +1662,7 @@ function MaterialSelector::createNewMaterial( %this )
extent = "64 64";
Variable = "";
buttonType = "toggleButton";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
groupNum = "0";
text = "";
};

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

@ -96,7 +96,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconAdd.png";
bitmapAsset = "ToolsModule:iconAdd_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";
@ -122,7 +122,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconDelete.png";
bitmapAsset = "ToolsModule:iconDelete_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

2
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -60,7 +60,7 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
// bitmap information
bitmap = "";
bitmapAsset = "";
bitmapBase = "";
textOffset = "0 0";

50
Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui
View file

@ -71,7 +71,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(GHWorldEditor) {
bitmap = "tools/worldEditor/images/toolbar/world";
bitmapAsset = "ToolsModule:world_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -93,7 +93,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GHGuiEditor) {
bitmap = "tools/worldEditor/images/toolbar/gui";
bitmapAsset = "ToolsModule:gui_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -114,7 +114,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/worldEditor/images/toolbar/playbutton";
bitmapAsset = "ToolsModule:playbutton_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -152,7 +152,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Asset Browser";
hovertime = "750";
bitmap = "tools/gui/images/stencilIcons/menuGrid";
bitmapAsset = "ToolsModule:menuGrid_image";
bitmapMode = "Stretched";
buttonType = "PushButton";
groupNum = "0";
@ -272,7 +272,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(GuiEditorSnapCheckBox) {
bitmap = "tools/gui/images/GUI-editor/snap-grid";
bitmapAsset = "ToolsModule:snap_grid_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -293,7 +293,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GuiEditorEdgeSnapping_btn) {
bitmap = "tools/gui/images/GUI-editor/edgesnap";
bitmapAsset = "ToolsModule:edgesnap_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -315,7 +315,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GuiEditorCenterSnapping_btn) {
bitmap = "tools/gui/images/GUI-editor/centersnap";
bitmapAsset = "ToolsModule:centersnap_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -368,7 +368,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-left";
bitmapAsset = "ToolsModule:align_left_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -390,7 +390,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/vertical-center";
bitmapAsset = "ToolsModule:vertical_center_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -412,7 +412,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-right";
bitmapAsset = "ToolsModule:align_right_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -449,7 +449,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-top";
bitmapAsset = "ToolsModule:align_top_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -471,7 +471,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/horizontal-center";
bitmapAsset = "ToolsModule:horizontal_center_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -493,7 +493,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-bottom";
bitmapAsset = "ToolsModule:align_bottom_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -562,7 +562,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/send-to-back";
bitmapAsset = "ToolsModule:send_to_back_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -584,7 +584,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/bring-to-front";
bitmapAsset = "ToolsModule:bring_to_front_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -621,7 +621,7 @@
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/distribute-horizontal";
bitmapAsset = "ToolsModule:distribute_horizontal_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -643,7 +643,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/distribute-vertical";
bitmapAsset = "ToolsModule:distribute_vertical_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -886,7 +886,7 @@
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1199,7 +1199,7 @@
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1322,7 +1322,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1342,7 +1342,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-as";
bitmapAsset = "ToolsModule:save_as_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1439,7 +1439,7 @@
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1458,7 +1458,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1477,7 +1477,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1496,7 +1496,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

10
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml
View file

@ -6,5 +6,13 @@
LevelName="DefaultEditorLevel"
isSubScene="false"
description="An empty room"
staticObjectAssetDependency0="@Asset=Prototyping:FloorGray"
previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset2="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset3="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset4="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
staticObjectAssetDependency0="@asset=Prototyping:FloorGray"
staticObjectAssetDependency1="@asset=FPSGameplay:soldier_rigged"
VersionId="1" />

7
Templates/BaseGame/game/tools/levels/EditorTemplateLevel.asset.taml
View file

@ -5,4 +5,11 @@
LevelFile="@assetFile=EditorTemplateLevel.mis"
LevelName="EditorTemplateLevel"
isSubScene="false"
previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset2="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset3="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset4="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
VersionId="1" />

2
Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui
View file

@ -59,7 +59,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Select and Edit an Existing Material";
hovertime = "1000";
bitmap = "tools/materialEditor/gui/materialSelectorIcon";
bitmapAsset = "ToolsModule:materialSelectorIcon_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cubepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_cubepreviewdts)
{
baseShape = "./cubemaped_cubepreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_cubepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_cylinderpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_cylinderpreviewdts)
{
baseShape = "./cubemaped_cylinderpreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_cylinderpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubemaped_spherepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubemaped_spherepreviewdts)
{
baseShape = "./cubemaped_spherepreview.dts";
baseShapeAsset = "ToolsModule:cubemaped_spherepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cubepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cubepreviewdts)
{
baseShape = "./cubepreview.dts";
baseShapeAsset = "ToolsModule:cubepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/cylinderpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cylinderpreviewdts)
{
baseShape = "./cylinderpreview.dts";
baseShapeAsset = "ToolsModule:cylinderpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

72
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -112,7 +112,7 @@
Extent = "17 17";
HorizSizing = "left";
tooltip = "Swap material on the object with existing";
bitmap = "tools/materialEditor/gui/change-material-btn";
bitmapAsset = "ToolsModule:change_material_btn_n_image";
command = "materialSelector.showDialog(\"MaterialEditorGui.showMaterialChangeSaveDialog\");";
};
@ -299,7 +299,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -399,7 +399,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -473,7 +473,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -525,7 +525,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
};
@ -828,7 +828,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -880,7 +880,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl() {
@ -929,7 +929,7 @@
maxLength = "1024";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1033,7 +1033,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1102,7 +1102,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1269,7 +1269,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1338,7 +1338,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1505,7 +1505,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1574,7 +1574,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1757,7 +1757,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1826,7 +1826,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
@ -1989,7 +1989,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() { // Detailmap Scale text
@ -2081,7 +2081,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2134,7 +2134,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() { // Detail Normal Map Strength text
@ -2226,7 +2226,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2279,7 +2279,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2353,7 +2353,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2427,7 +2427,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2479,7 +2479,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
new GuiBitmapCtrl(){
@ -2553,7 +2553,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
@ -2605,7 +2605,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
};
@ -3892,7 +3892,7 @@
buttonType = "RadioButton";
position = "1 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-sine";
bitmapAsset = "ToolsModule:wav_sine_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Sine Wave";
hovertime = "1000";
@ -3904,7 +3904,7 @@
buttonType = "RadioButton";
position = "17 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-triangle";
bitmapAsset = "ToolsModule:wav_triangle_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Triangle Wave";
hovertime = "1000";
@ -3916,7 +3916,7 @@
buttonType = "RadioButton";
position = "33 0";
Extent = "13 13";
bitmap = "tools/materialEditor/gui/wav-square";
bitmapAsset = "ToolsModule:wav_square_n_image";
command = "MaterialEditorGui.updateWaveType();";
tooltip="Square Wave";
hovertime = "1000";
@ -4703,7 +4703,7 @@
Visible = "0";
//Command = "materialSelector.showDialog(\"MaterialEditorGui.switchMaterial\");";
hovertime = "1000";
bitmap = "tools/gui/images/folderUp";
bitmapAsset = "ToolsModule:folderUp_image";
tooltip = "Go back to previous editor";
groupNum = "-1";
buttonType = "PushButton";
@ -4722,7 +4722,7 @@
Visible = "1";
Command = "AssetBrowser.showDialog(\"MaterialAsset\", \"MaterialEditorGui.selectMaterialAsset\");";
hovertime = "1000";
bitmap = "tools/gui/images/open-file";
bitmapAsset = "ToolsModule:open_file_n_image";
tooltip = "Open Existing Material";
groupNum = "-1";
buttonType = "PushButton";
@ -4770,7 +4770,7 @@
tooltip = "Save Material (ALT S)";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -4791,7 +4791,7 @@
tooltip = "Lookup Material Instances";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/visible";
bitmapAsset = "ToolsModule:visible_n_image";
};
new GuiBitmapCtrl(){
position = "147 1";
@ -4818,7 +4818,7 @@
hovertime = "1000";
tooltip = "Revert Material to Saved";
text = "";
bitmap = "tools/gui/images/reset-icon";
bitmapAsset = "ToolsModule:reset_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -4840,7 +4840,7 @@
hovertime = "1000";
tooltip = "Clear All Material Properties";
text = "";
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -4862,7 +4862,7 @@
hovertime = "1000";
tooltip = "Delete Material from File";
text = "";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

8
Templates/BaseGame/game/tools/materialEditor/gui/gui_gridTiny2_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="gui_gridTiny2_image"
imageFile="@assetFile=gridTiny2.PNG"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

2
Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui
View file

@ -75,7 +75,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(MaterialInstanceFilterBtn) {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/pyramidpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(pyramidpreviewdts)
{
baseShape = "./pyramidpreview.dts";
baseShapeAsset = "ToolsModule:pyramidpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/spherepreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(spherepreviewdts)
{
baseShape = "./spherepreview.dts";
baseShapeAsset = "ToolsModule:spherepreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/torusknotpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(torusknotpreviewdts)
{
baseShape = "./torusknotpreview.dts";
baseShapeAsset = "ToolsModule:torusknotpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/torusknowpreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(torusknowpreviewdts)
{
baseShape = "./torusknowpreview.dts";
baseShapeAsset = "ToolsModule:torusknowpreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

2
Templates/BaseGame/game/tools/materialEditor/gui/toruspreview.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(toruspreviewdts)
{
baseShape = "./toruspreview.dts";
baseShapeAsset = "ToolsModule:toruspreview";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

4
Templates/BaseGame/game/tools/materialEditor/main.tscript
View file

@ -64,7 +64,7 @@ function MaterialEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Material Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MaterialEditorPlugin", "MaterialEditorPalette", expandFilename("tools/worldEditor/images/toolbar/material-editor"), %tooltip );
EditorGui.addToToolsToolbar( "MaterialEditorPlugin", "MaterialEditorPalette", "ToolsModule:material_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MaterialEditorPropertiesWindow, MaterialEditorPreviewWindow);
@ -163,4 +163,4 @@ function MaterialEditorPlugin::onDeactivated( %this )
%this.map.pop();
Parent::onDeactivated(%this);
}
}

7
Templates/BaseGame/game/tools/materialEditor/scripts/materialEd_justAlphaMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="materialEd_justAlphaMaterial"
scriptFile="@assetFile=materialEditor.ed.tscript"
materialDefinitionName="materialEd_justAlphaMaterial"
VersionId="1" />

7
Templates/BaseGame/game/tools/materialEditor/scripts/materialEd_previewMaterial.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<MaterialAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="materialEd_previewMaterial"
scriptFile="@assetFile=materialEditor.ed.tscript"
materialDefinitionName="materialEd_previewMaterial"
VersionId="1" />

24
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -28,12 +28,12 @@ function MaterialEditorGui::establishMaterials(%this)
//Cubemap used to preview other cubemaps in the editor.
singleton CubemapData( matEdCubeMapPreviewMat )
{
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
cubeMapFaceAsset[0] = "ToolsModule:cube_xNeg_image";
cubeMapFaceAsset[1] = "ToolsModule:cube_xPos_image";
cubeMapFaceAsset[2] = "ToolsModule:cube_zNeg_image";
cubeMapFaceAsset[3] = "ToolsModule:cube_zPos_image";
cubeMapFaceAsset[4] = "ToolsModule:cube_yNeg_image";
cubeMapFaceAsset[5] = "ToolsModule:cube_yPos_image";
parentGroup = "RootGroup";
};
@ -1690,12 +1690,12 @@ function MaterialEditorGui::createNewCubemap( %this, %cubemap )
new CubemapData(%cubemap)
{
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
cubeMapFaceAsset[0] = "ToolsModule:cube_xNeg_image";
cubeMapFaceAsset[1] = "ToolsModule:cube_xPos_image";
cubeMapFaceAsset[2] = "ToolsModule:cube_zNeg_image";
cubeMapFaceAsset[3] = "ToolsModule:cube_zPos_image";
cubeMapFaceAsset[4] = "ToolsModule:cube_yNeg_image";
cubeMapFaceAsset[5] = "ToolsModule:cube_yPos_image";
parentGroup = RootGroup;
};

4
Templates/BaseGame/game/tools/meshRoadEditor/main.tscript
View file

@ -76,7 +76,7 @@ function MeshRoadEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Mesh Road Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MeshRoadEditorPlugin", "MeshRoadEditorPalette", expandFilename("tools/worldEditor/images/toolbar/mesh-road-editor"), %tooltip );
EditorGui.addToToolsToolbar( "MeshRoadEditorPlugin", "MeshRoadEditorPalette", "ToolsModule:mesh_road_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MeshRoadEditorOptionsWindow, MeshRoadEditorTreeWindow);
@ -223,4 +223,4 @@ function MeshRoadEditorPlugin::writeSettings( %this )
EditorSettings.setValue( "SideMaterialName", MeshRoadEditorGui.sideMaterialName );
EditorSettings.endGroup();
}
}

14
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui
View file

@ -52,7 +52,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Spline (Z)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-spline";
bitmapAsset = "ToolsModule:show_spline_n_image";
groupNum = "7";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -75,7 +75,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Wireframe (X)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-wireframe";
bitmapAsset = "ToolsModule:menubar_show_wireframe_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -98,7 +98,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Road Texture (V)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-texture";
bitmapAsset = "ToolsModule:show_texture_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -121,7 +121,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Road Profile (P)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-profile";
bitmapAsset = "ToolsModule:show_profile_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -203,7 +203,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
new GuiControl(MeshRoadDefaultDepthTextEditContainer) {
@ -281,7 +281,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
};
@ -342,4 +342,4 @@ new GuiMouseEventCtrl(MeshRoadDefaultDepthSliderCtrlContainer, EditorGuiGroup) {
ticks = "0";
value = "10";
};
};
};

2
Templates/BaseGame/game/tools/missionAreaEditor/main.tscript
View file

@ -57,7 +57,7 @@ function MissionAreaEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Mission Area Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MissionAreaEditorPlugin", "MissionAreaEditorPalette", expandFilename("tools/missionAreaEditor/images/mission-area"), %tooltip );
EditorGui.addToToolsToolbar( "MissionAreaEditorPlugin", "MissionAreaEditorPalette", "ToolsModule:mission_area_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MissionAreaEditorPropertiesWindow, MissionAreaEditorTerrainWindow);

2
Templates/BaseGame/game/tools/navEditor/main.tscript
View file

@ -83,7 +83,7 @@ function NavEditorPlugin::onWorldEditorStartup(%this)
// Add ourselves to the ToolsToolbar.
%tooltip = "Navigation Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar("NavEditorPlugin", "NavEditorPalette", expandFilename("tools/navEditor/images/nav-editor"), %tooltip);
EditorGui.addToToolsToolbar("NavEditorPlugin", "NavEditorPalette", "ToolsModule:nav_editor_n_image", %tooltip);
GuiWindowCtrl::attach(NavEditorOptionsWindow, NavEditorTreeWindow);

24
Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -234,7 +234,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
command = "PE_EmitterEditor.saveEmitter( " @ PE_EmitterEditor.currEmitter @ " ); PE_ParticleEditor.saveParticle( PE_ParticleEditor.currParticle );";
tooltip = "Save Current Emitter";
};
@ -255,7 +255,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
tooltip = "Delete Current Emitter";
};
};
@ -1363,7 +1363,7 @@ $PE_guielement_ext_colorpicker = "18 18";
hovertime = "1000";
tooltip = "Clear Particle 2 from Emitter";
text = "";
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1411,7 +1411,7 @@ $PE_guielement_ext_colorpicker = "18 18";
hovertime = "1000";
tooltip = "Clear Particle 3 from Emitter";
text = "";
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1459,7 +1459,7 @@ $PE_guielement_ext_colorpicker = "18 18";
hovertime = "1000";
tooltip = "Clear Particle 4 from Emitter";
text = "";
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1876,7 +1876,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
tooltip = "Add New Particle To Current Emitter";
useModifiers = "1";
};
@ -1896,7 +1896,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
command = "PE_ParticleEditor.saveParticle( PE_ParticleEditor.currParticle );";
tooltip = "Save Current Particle";
};
@ -1917,7 +1917,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
tooltip = "Delete Current Particle";
};
};
@ -2021,7 +2021,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -2042,7 +2042,7 @@ $PE_guielement_ext_colorpicker = "18 18";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
Command = "PE_ParticleEditor.updateParticleTexture(1);";
};
new GuiCheckBoxCtrl() {
@ -3865,7 +3865,7 @@ $PE_guielement_ext_colorpicker = "18 18";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Play Particle Effect from Start";
hovertime = "1000";
bitmap = "tools/particleEditor/images/play_btn";
bitmapAsset = "ToolsModule:play_btn_n_image";
buttonType = "PushButton";
groupNum = "-1";
text = "";
@ -3888,7 +3888,7 @@ $PE_guielement_ext_colorpicker = "18 18";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Drops Particle Effect in front of the Camera";
hovertime = "1000";
bitmap = "tools/classIcons/camera";
bitmapAsset = "ToolsModule:camera_image";
buttonType = "PushButton";
groupNum = "-1";
text = "";

2
Templates/BaseGame/game/tools/particleEditor/main.tscript
View file

@ -80,7 +80,7 @@ function ParticleEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Particle Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "ParticleEditorPlugin", "ParticleEditorPalette", expandFilename("tools/worldEditor/images/toolbar/particleeditor"), %tooltip );
EditorGui.addToToolsToolbar( "ParticleEditorPlugin", "ParticleEditorPalette", "ToolsModule:particleeditor_n_image", %tooltip );
}
//---------------------------------------------------------------------------------------------

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

@ -957,7 +957,7 @@
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/iconInformation.png";
bitmapAsset = "ToolsModule:iconInformation_image";
bitmapMode = "Centered";
autoFitExtents = "0";
useModifiers = "0";

2
Templates/BaseGame/game/tools/projectImporter/main.tscript
View file

@ -55,4 +55,4 @@ function ProjectImporterPlugin::initSettings( %this )
EditorSettings.beginGroup( "ProjectImporter", true );
EditorSettings.endGroup();
}
}

165
Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
View file

@ -543,25 +543,38 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this)
%scriptExtRemovedLine = strReplace(%line, ".cs", "");
%scriptExtRemovedLine = strReplace(%scriptExtRemovedLine, ".tscript", "");
%line = %scriptExtRemovedLine;
%fileWasChanged = true;
}
else if(strIsMatchExpr("*queueexec(*.cs*)*", %line) || strIsMatchExpr("*queueexec(*.tscript*)*", %line))
{
%scriptExtRemovedLine = strReplace(%line, ".cs", "");
%scriptExtRemovedLine = strReplace(%scriptExtRemovedLine, ".tscript", "");
%line = %scriptExtRemovedLine;
%fileWasChanged = true;
}
else if(strIsMatchExpr("*registerDatablock(*.cs*)*", %line) || strIsMatchExpr("*registerDatablock(*.tscript*)*", %line))
{
%scriptExtRemovedLine = strReplace(%line, ".cs", "");
%scriptExtRemovedLine = strReplace(%scriptExtRemovedLine, ".tscript", "");
%line = %scriptExtRemovedLine;
%fileWasChanged = true;
}
else if(strIsMatchExpr("*%this.addSequence(\"*);", %line))
{
%outLine = processLegacyShapeConstructorField(%line);
if(%line !$= %outLine)
{
%fileWasChanged = true;
%line = %outLine;
}
}
else
{
if(%objectClassStack.count() != 0)
{
%currentObjClass = %objectClassStack.getKey(%objectClassStack.count()-1);
%inheritanceList = getClassHierarchy(%currentObjClass);
for (%classDepth =0; %classDepth<getWordCount(%inheritanceList); %classDepth++)
{
@ -716,8 +729,7 @@ T3Dpre4ProjectImporter::genProcessor("MeshRoad", "topMaterial topMaterialAsset b
T3Dpre4ProjectImporter::genProcessor("ScatterSky", "moonMat moonMatAsset");
T3Dpre4ProjectImporter::genProcessor("Sun", "coronaMaterial coronaMaterialAsset");
T3Dpre4ProjectImporter::genProcessor("VolumetricFog", "shape ShapeAsset texture textureAsset");
T3Dpre4ProjectImporter::genProcessor("WaterPlane", "rippleTex rippleTexAsset foamTex foamTexAsset depthGradientTex depthGradientTexAsset");
T3Dpre4ProjectImporter::genProcessor("WaterBlock", "rippleTex rippleTexAsset foamTex foamTexAsset depthGradientTex depthGradientTexAsset");
T3Dpre4ProjectImporter::genProcessor("WaterObject", "rippleTex rippleTexAsset foamTex foamTexAsset depthGradientTex depthGradientTexAsset");
T3Dpre4ProjectImporter::genProcessor("ConvexShape", "material materialAsset");
T3Dpre4ProjectImporter::genProcessor("RenderMesh", "material materialAsset");
T3Dpre4ProjectImporter::genProcessor("RenderShape", "shape shapeAsset");
@ -762,12 +774,21 @@ T3Dpre4ProjectImporter::genProcessor("GuiProgressBitmap", "bitmap bitmapAsset");
T3Dpre4ProjectImporter::genProcessor("GuiMissionArea", "handleBitmap handleBitmapAsset");
T3Dpre4ProjectImporter::genProcessor("WorldEditor", "selectHandle selectHandleAsset defaultHandle defaultHandleAsset lockedHandle lockedHandleAsset");
T3Dpre4ProjectImporter::genProcessor("GuiControlProfile", "bitmap bitmapAsset");
function T3Dpre4ProjectImporter::processGuiBitmapButtonCtrlLine(%this, %line)
{
%outLine = processGuiBitmapButtonCtrlField(%line, "bitmap", "bitmapAsset");
if(%outLine !$= %line) return %outLine;
return %line;
}
//==============================================================================
// Datablocks
//==============================================================================
T3Dpre4ProjectImporter::genProcessor("ForestItemData", "shape shapeAsset");
T3Dpre4ProjectImporter::genProcessor("CubeMapData", "cubemapFace cubeMapFaceAsset cubemap cubemapAsset");
T3Dpre4ProjectImporter::genProcessor("DebrisData", "shape shapeAsset");
T3Dpre4ProjectImporter::genProcessor("DebrisData", "shape shapeAsset shapeFile shapeAsset");
T3Dpre4ProjectImporter::genProcessor("DecalData", "material materialAsset");
T3Dpre4ProjectImporter::genProcessor("ExplosionData", "explosionShape explosionShapeAsset");
T3Dpre4ProjectImporter::genProcessor("ParticleData", "texture textureAsset textureName textureAsset textureExt textureExtAsset textureExtName textureExtAsset");
@ -779,7 +800,7 @@ T3Dpre4ProjectImporter::genProcessor("PhysicsShapeData", "shape shapeAsset");
T3Dpre4ProjectImporter::genProcessor("PlayerData", "shapeFP shapeFPAsset shapeNameFP shapeFPAsset");
T3Dpre4ProjectImporter::genProcessor("ProjectileData", "projectileShape projectileShapeAsset projectileShapeName projectileShapeAsset");
T3Dpre4ProjectImporter::genProcessor("ShapeBaseData", "shapeFile shapeAsset shape shapeAsset debrisShape debrisShapeAsset debrisShapeName debrisShapeAsset");
T3Dpre4ProjectImporter::genProcessor("ShapeBaseImageData", "shape shapeAsset shapeFP shapeAsset");
T3Dpre4ProjectImporter::genProcessor("ShapeBaseImageData", "shape shapeAsset shapeFP shapeFPAsset shapeFile shapeAsset shapeFileFP shapeFPAsset");
T3Dpre4ProjectImporter::genProcessor("WheeledVehicleTire", "shape shapeAsset shapeFile shapeAsset");
//==============================================================================
// Materials
@ -921,4 +942,136 @@ function T3Dpre4ProjectImporter::processTerrainMaterialObject(%this, %file, %obj
//==============================================================================
// PostEffects
//==============================================================================
T3Dpre4ProjectImporter::genProcessor("PostEffect", "texture textureAsset");
T3Dpre4ProjectImporter::genProcessor("PostEffect", "texture textureAsset");
//==============================================================================
// Misc Utility functions
//==============================================================================
//This is functionally identical to processLegacyField, but we have to special-snowflake our asset lookups
//due to it using suffix-based indirections
function processGuiBitmapButtonCtrlField(%line, %originalFieldName, %newFieldName)
{
if(!strIsMatchExpr("*"@%originalFieldName@"=*\"*\";*", %line) &&
!strIsMatchExpr("*"@%originalFieldName@"[*=*\"*\";*", %line) &&
!strIsMatchExpr("*"@%originalFieldName@" *=*\"*\";*", %line))
return %line;
%outLine = strreplace(%line, %originalFieldName, %newFieldName);
//get the value
%value = "";
%pos = strpos(%outLine, "= \"");
if(%pos != -1)
{
%endPos = strpos(%outLine, "\";", %pos);
%value = getSubStr(%outLine, %pos+3, %endPos-%pos-3);
}
else
{
%pos = strpos(%outLine, "=\"");
if(%pos != -1)
{
%endPos = strpos(%outLine, "\";", %pos);
%value = getSubStr(%outLine, %pos+2, %endPos-%pos-2);
}
}
if(%outLine !$= %line && %pos != -1 && %endPos != -1 && %value !$= "")
{
echo("Legacy Project Importer - processing legacy field line: " @ %line);
if(startsWith(%value, "$") || startsWith(%value, "#"))
{
//These are going to be texture/render targets, and we can leave them alone
return %line;
}
//find any assets with that filename
else if(startsWith(%value, "./"))
{
%targetFilename = strReplace(%value, "./", $ProjectImporter::currentFilePath @ "/");
}
else if(startsWith(%value, "../"))
{
%slashPos = strposr($ProjectImporter::currentFilePath, "/");
if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up
{
%slashPos = strposr($ProjectImporter::currentFilePath, "/", 2);
}
%parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos);
%targetFilename = strReplace(%value, "../", %parentPath @ "/");
}
else if(startsWith(%value, "~"))
{
%targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/");
if(!isFile(%targetFilename))
{
%targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/main/");
}
}
else if ((strpos(%value,"/") == -1)&&(strpos(%value,"\\") == -1))
{
%targetFilename = $ProjectImporter::currentFilePath @ %value;
}
else if(!startsWith(%value, $ProjectImporter::modulePath @ "/"))
{
%targetFilename = $ProjectImporter::modulePath @ "/" @ %value;
}
else
{
%targetFilename = %value;
}
%targetFilename = strReplace(%targetFilename, "//", "/");
%targetFilename = testFilenameExtensions(%targetFilename);
if(!isFile(%targetFilename)) //if our presumed file target is bad, just bail out
{
//Now we test for a suffix
%targetPath = filePath(%targetFilename);
%targetName = fileBase(%targetFilename);
%targetExt = fileExt(%targetFilename);
%targetFilename = %targetPath @ "/" @ %targetName @ "_n" @ %targetExt;
%targetFilename = strReplace(%targetFilename, "//", "/");
%targetFilename = testFilenameExtensions(%targetFilename);
}
//If we still have nothing, then we fail it out
if(!isFile(%targetFilename))
{
error("Legacy Project Importer - file described in line could not be found/is not valid");
return %line;
}
$ProjectImporter::assetQuery.clear();
%foundAssets = AssetDatabase.findAssetLooseFile($ProjectImporter::assetQuery, %targetFilename);
if(%foundAssets != 0)
{
%assetId = $ProjectImporter::assetQuery.getAsset(0);
echo("Legacy Project Importer - processing of legacy field line's value: " @ %value @ " has found a matching AssetId: " @ %assetId);
}
if(%assetId !$= "" && AssetDatabase.isDeclaredAsset(%assetId))
{
//if (%assetId.getStatusString() $= "Ok")
%outLine = strReplace(%outLine, %value, %assetId);
//else
// error("Asset assignment failure:", %assetId, getStatusString());
}
}
if(%outLine !$= %line)
{
echo("Legacy Project Importer - processing of legacy line: " @ %line @ " has been updated to: " @ %outLine);
return %outLine;
}
else
{
return %line;
}
}

98
Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
View file

@ -247,7 +247,7 @@ function ProjectImportWizardPage4::openPage(%this)
ProjectImportWindow-->nextButton.setActive(false);
if(!$ProjectImporter::useExistingModule)
$ProjectImporter::moduleName = ProjectImportWizardPage3-->newModuleName.getText();
$ProjectImporter::moduleName = ProjectImportWizardPage3-->newModuleName.getText();
$ProjectImporter::modulePath = "data/" @ $ProjectImporter::moduleName;
@ -374,7 +374,7 @@ function testFilenameExtensions(%filename)
else if(isFile(%filename @ ".dds"))
return %filename @ ".dds";
return "";
return %filename;
}
function processLegacyField(%line, %originalFieldName, %newFieldName)
@ -489,6 +489,95 @@ function processLegacyField(%line, %originalFieldName, %newFieldName)
}
}
function processLegacyShapeConstructorField(%line)
{
if(!strIsMatchExpr("*%this.addSequence(\"*);", %line))
return %line;
%outLine = %line;
%animSourceStart = strPos(%line, "%this.addSequence(\"") + 19;
%animSourceEnd = strPos(%line, "\",", %animSourceStart);
%animationSource = getSubstr(%line, %animSourceStart, %animSourceEnd-%animSourceStart);
%animSourcePath = getWord(%animationSource, 0);
%animSourceName = getWord(%animationSource, 1);
//already uses an asset, so we'll skip
if(strPos(%animSourcePath, ":") != -1)
return %line;
//otherwise, try and see if we've got an animation source file here
if(startsWith(%animSourcePath, "./"))
{
%targetFilename = strReplace(%animSourcePath, "./", $ProjectImporter::currentFilePath @ "/");
}
else if(startsWith(%animSourcePath, "../"))
{
%slashPos = strposr($ProjectImporter::currentFilePath, "/");
if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up
{
%slashPos = strposr($ProjectImporter::currentFilePath, "/", 2);
}
%parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos);
%targetFilename = strReplace(%animSourcePath, "../", %parentPath @ "/");
}
else if(startsWith(%animSourcePath, "~"))
{
%targetFilename = strReplace(%animSourcePath, "~", $ProjectImporter::modulePath @ "/");
if(!isFile(%targetFilename))
{
%targetFilename = strReplace(%animSourcePath, "~", $ProjectImporter::modulePath @ "/main/");
}
}
else if ((strpos(%animSourcePath,"/") == -1)&&(strpos(%animSourcePath,"\\") == -1))
{
%targetFilename = $ProjectImporter::currentFilePath @ %animSourcePath;
}
else if(!startsWith(%animSourcePath, $ProjectImporter::modulePath @ "/"))
{
%targetFilename = $ProjectImporter::modulePath @ "/" @ %animSourcePath;
}
else
{
%targetFilename = %animSourcePath;
}
%targetFilename = strReplace(%targetFilename, "//", "/");
%targetFilename = testFilenameExtensions(%targetFilename);
if(!isFile(%targetFilename))
{
return %line;
}
$ProjectImporter::assetQuery.clear();
%foundAssets = AssetDatabase.findAssetLooseFile($ProjectImporter::assetQuery, %targetFilename);
if(%foundAssets != 0)
{
%assetId = $ProjectImporter::assetQuery.getAsset(0);
echo("Legacy Project Importer - processing of legacy shape constructor addSequence line's value: " @ %value @ " has found a matching AssetId: " @ %assetId);
}
if(%assetId !$= "" && AssetDatabase.isDeclaredAsset(%assetId))
{
//if (%assetId.getStatusString() $= "Ok")
%outLine = strReplace(%line, %animSourcePath, %assetId);
//else
// error("Asset assignment failure:", %assetId, getStatusString());
}
if(%outLine !$= %line)
{
echo("Legacy Project Importer - processing of legacy shape constructor addSequence line: " @ %line @ " has been updated to: " @ %outLine);
return %outLine;
}
else
{
return %line;
}
}
function findObjectClass(%line, %createWord)
{
//we have a new object, add it to the stack
@ -668,6 +757,11 @@ function beginImageImport()
if(isImageFormat(%fileExt))
{
if(%filename $= "skybox_1.png")
{
%aefgadfg = true;
}
$ProjectImporter::assetQuery.clear();
%assetsFound = AssetDatabase.findAssetLooseFile($ProjectImporter::assetQuery, %file);
if(%assetsFound == 0)

2
Templates/BaseGame/game/tools/resources/ReflectProbeSphere.tscript
View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(ReflectProbeSpheredae)
{
baseShape = "./ReflectProbeSphere.dae";
baseShapeAsset = "ToolsModule:ReflectProbeSphere";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

4
Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui
View file

@ -90,7 +90,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "World Editor";
hovertime = "1000";
bitmap = "tools/gui/images/lock";
bitmapAsset = "ToolsModule:lock_n_image";
buttonType = "ToggleButton";
groupNum = "-1";
text = "";
@ -114,7 +114,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "World Editor";
hovertime = "1000";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
buttonType = "PushButton";
groupNum = "-1";
text = "";

12
Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui
View file

@ -52,7 +52,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Spline";
bitmap = "tools/worldEditor/images/road-river/menubar/show-spline";
bitmapAsset = "ToolsModule:show_spline_n_image";
groupNum = "7";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -76,7 +76,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Wireframe";
bitmap = "tools/worldEditor/images/road-river/menubar/show-wireframe";
bitmapAsset = "ToolsModule:menubar_show_wireframe_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -99,7 +99,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show River Texture";
bitmap = "tools/worldEditor/images/road-river/menubar/show-texture";
bitmapAsset = "ToolsModule:show_texture_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -181,7 +181,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
new GuiControl(RiverDefaultDepthTextEditContainer) {
@ -259,7 +259,7 @@
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
};
@ -320,4 +320,4 @@ new GuiMouseEventCtrl(RiverDefaultDepthSliderCtrlContainer, EditorGuiGroup) {
ticks = "0";
value = "10";
};
};
};

Some files were not shown because too many files have changed in this diff Show more