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

# 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

View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(cameradts)
{
baseShape = "./camera.dts";
baseShapeAsset = "Core_GameObjects:Camera";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -63,7 +63,7 @@ new GuiControlProfile (GuiDefaultProfile)
fontColorSEL= "255 255 255";
// bitmap information
bitmap = "";
bitmapAsset = "";
bitmapBase = "";
textOffset = "0 0";

View file

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

View file

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

View file

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

View file

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

View file

@ -1,7 +1,7 @@
singleton TSShapeConstructor(Fog_CubeDAE)
{
baseShape = "./Fog_Cube.DAE";
baseShapeAsset = "Core_Rendering:Fog_Cube";
singleDetailSize = "0";
flipUVCoords = "0";
JoinIdenticalVerts = "0";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(ConePrimitive_fbx) {
baseShape = "./ConePrimitive.fbx";
baseShapeAsset = "Prototyping:ConePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(CubePrimitive_fbx) {
baseShape = "./CubePrimitive.fbx";
baseShapeAsset = "Prototyping:CubePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(CylinderPrimitive_fbx) {
baseShape = "./CylinderPrimitive.fbx";
baseShapeAsset = "Prototyping:CylinderPrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(SpherePrimitive_fbx) {
baseShape = "./SpherePrimitive.fbx";
baseShapeAsset = "Prototyping:SpherePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(TorusPrimitive_fbx) {
baseShape = "./TorusPrimitive.fbx";
baseShapeAsset = "Prototyping:TorusPrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(TubePrimitive_fbx) {
baseShape = "./TubePrimitive.fbx";
baseShapeAsset = "Prototyping:TubePrimitive";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -1,6 +1,6 @@
//--- OBJECT WRITE BEGIN ---
new TSShapeConstructor(kork_chanShape_fbx) {
baseShape = "./kork_chanShape.fbx";
baseShapeAsset = "Prototyping:kork_chanShape";
upAxis = "DEFAULT";
unit = "-1";
LODType = "TrailingNumber";

View file

@ -13,7 +13,7 @@
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
hovertime = "1000";
bitmap = "";
bitmapAsset = "";
wrap = "0";
fadeinTime = "1000";
waitTime = "4000";
@ -70,7 +70,7 @@ new GuiFadeinBitmapCtrl(BlankGui) {
minExtent = "8 8";
visible = "1";
helpTag = "0";
bitmap = "";
bitmapAsset = "";
wrap = "0";
fadeinTime = "100";
waitTime = "2000";

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" />

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" />

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" />

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

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";
}
}

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

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 )

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" />

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";
};
};
};

View file

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

View file

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

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

View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

View file

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

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

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" />

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" />

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" />

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" />

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" />

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" />

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" />

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" />

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" />

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

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

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

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

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

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

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

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

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

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" />

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";
};

View file

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

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

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

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

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

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

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

View file

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

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

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" />

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" />

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" />

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" />

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 = "";
};

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

View file

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

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

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" />

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" />

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

View file

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

View file

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

View file

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

View file

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

View file

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

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

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" />

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

View file

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

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