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

Merge branch 'development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-03-24 20:07:06 +00:00 • committed by GitHub
commit 0da0903599
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4189 changed files with 29881 additions and 635347 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript
View file

@ -4,7 +4,13 @@ function AssetBrowser::setupCreateNewLevelAsset(%this)
NewAssetPropertiesInspector.addField("LevelName", "Level Name", "String", "Human-readable name of new level", "", "", %this.newAssetSettings);
NewAssetPropertiesInspector.addField("levelPreviewImage", "Level Preview Image", "Image", "Preview Image for the level", "", "", %this.newAssetSettings);
NewAssetPropertiesInspector.addField("isSubScene", "Is SubScene", "bool", "Is this levelAsset intended as a subScene", "", "", %this.newAssetSettings);
//If we forcefully set it elsewhere, adhere
if($createLevelAssetIsSubScene == true)
%this.newAssetSettings.isSubScene = true;
else
%this.newAssetSettings.isSubScene = false;
NewAssetPropertiesInspector.addField("isSubScene", "Is SubScene", "bool", "Is this levelAsset intended as a subScene", %this.newAssetSettings.isSubScene, "", %this.newAssetSettings);
NewAssetPropertiesInspector.endGroup();
}
@ -27,6 +33,7 @@ function AssetBrowser::createLevelAsset(%this)
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
%levelPath = %assetPath @ %assetName @ %misExtension;
%asset = new LevelAsset()
{
AssetName = %assetName;
@ -55,7 +62,24 @@ function AssetBrowser::createLevelAsset(%this)
echo("Unable to copy template level file!");
}
replaceInFile(%levelPath, "EditorTemplateLevel", %assetName);
if(%asset.isSubScene)
{
%fileObj = new FileObject();
if (!%fileObj.openForWrite(%levelPath))
{
echo("Unable to write subScene file!");
}
else
{
%fileObj.writeLine("");
%fileObj.close();
%fileObj.delete();
}
}
else
{
replaceInFile(%levelPath, "EditorTemplateLevel", %assetName);
}
//Generate the associated files
DecalManagerSave( %assetPath @ %asset.DecalsFile );
@ -87,6 +111,8 @@ function AssetBrowser::setupCreateNewSubScene(%this)
function AssetBrowser::editLevelAsset(%this, %assetDef)
{
echo("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
echo(%assetDef @ ".isSubScene = " @ %assetDef.isSubScene);
if(!%assetDef.isSubScene)
schedule( 1, 0, "EditorOpenMission", %assetDef);
}
@ -157,7 +183,15 @@ function AssetBrowser::buildLevelAssetPreview(%this, %assetDef, %previewData)
{
%previewData.assetName = %assetDef.assetName;
%previewData.assetPath = %assetDef.getLevelPath();
%previewData.doubleClickCommand = "schedule( 1, 0, \"EditorOpenMission\", "@%assetDef@");";
if(%this.selectMode || %assetDef.isSubScene)
{
%previewData.doubleClickCommand = "AssetBrowser.selectAsset( AssetBrowser.selectedAsset );";
}
else
{
%previewData.doubleClickCommand = "schedule( 1, 0, \"EditorOpenMission\", "@%assetDef@");";
}
%levelPreviewImage = %assetDef.PreviewImage;
@ -176,7 +210,10 @@ function AssetBrowser::buildLevelAssetPreview(%this, %assetDef, %previewData)
function createAndAssignLevelAsset(%moduleName, %assetName)
{
$createAndAssignField.apply(%moduleName @ ":" @ %assetName);
if(AssetDatabase.isDeclaredAsset(%moduleName))
$createAndAssignField.apply(%moduleName);
else
$createAndAssignField.apply(%moduleName @ ":" @ %assetName);
}
function EWorldEditor::createSelectedAsSubScene( %this, %object )

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

@ -124,6 +124,8 @@ function AssetBrowser::setupCreateNewAsset(%this, %assetType, %moduleName, %call
%command = %this @ ".setupCreateNew"@%assetType @"();";
eval(%command);
}
NewAssetPropertiesInspector.refresh();
}
function NewAssetPropertiesInspector::updateNewAssetField(%this)

7
Templates/BaseGame/game/tools/base/utils/inspector.ed.tscript
View file

@ -287,3 +287,10 @@ function EditorInspectorBase::getFullFilePath( %field )
else
return makeFullPath( %fileName, getMainDotCsDir() );
}
function GameBase::onInspect(%this, %inspector)
{
Parent::onInspect(%this, %inspector);
if (%this.getDatablock().isMethod("onInspect"))
%this.getDatablock().onInspect(%this, %inspector);
}

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

@ -1,43 +1,32 @@
//--- OBJECT WRITE BEGIN ---
$guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
displayMode = "Dropper"; // this makes the background visible
actionOnMove = "1";
position = "0 0";
extent = "1024 768";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
Clickable = "1";
AffectChildren = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
displayMode = "Dropper";
extent = "1024 768";
profile = "GuiDefaultProfile";
command = "%selHue = ColorPickerDlg.getSelectedHue();\n%selSat = ColorPickerDlg.getSelectedSaturation();\n%selBright = ColorPickerDlg.getSelectedBrightness();\n%selAlpha = ColorPickerDlg.getSelectedAlpha();\n\nColorHueRange.setSelectedHue(%selHue);\nColorHueRange.executeUpdate();\n\nColorBlendRange.setSelectedBrightness(%selBright);\nColorBlendRange.setSelectedSaturation(%selSat);\nColorBlendRange.executeUpdate();\n\nColorAlphaRange.setSelectedAlpha(%selAlpha);\nColorAlphaRange.executeUpdate();\n\nColorEyeDropperButton.setStateOn(false);";
tooltipProfile = "GuiToolTipProfile";
isContainer = "1";
new GuiWindowCtrl() {
text = " ";
resizeWidth = "0";
resizeHeight = "0";
canMinimize = "0";
canMaximize = "0";
closeCommand = "DoColorPickerCancelCallback(); ColorPickerDlg.getRoot().popDialog(ColorPickerDlg);";
position = "33 33";
extent = "271 574";
horizSizing = "windowRelative";
vertSizing = "windowRelative";
profile = "ToolsGuiWindowProfile";
tooltipProfile = "ToolsGuiToolTipProfile";
text = " ";
resizeWidth = "0";
resizeHeight = "0";
canMinimize = "0";
canMaximize = "0";
closeCommand = "DoColorPickerCancelCallback(); ColorPickerDlg.getRoot().popDialog(ColorPickerDlg);";
position = "33 33";
extent = "271 574";
horizSizing = "windowRelative";
vertSizing = "windowRelative";
profile = "ToolsGuiWindowProfile";
tooltipProfile = "ToolsGuiToolTipProfile";
new GuiStackControl() {
padding = "5";
changeChildSizeToFit = "0";
changeChildPosition = "0";
position = "0 24";
extent = "271 481";
extent = "271 491";
profile = "GuiDefaultProfile";
tooltipProfile = "GuiToolTipProfile";
@ -120,7 +109,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
position = "213 3";
extent = "50 25";
profile = "GuiDefaultProfile";
command = "%selHue = ColorNewSelected.getSelectedHue();\n%selSat = ColorNewSelected.getSelectedSaturation();\n%selBright = ColorNewSelected.getSelectedBrightness();\n\nHueTextEditor.setText(%selHue);\nSatTextEditor.setText(%selSat);\nBrightTextEditor.setText(%selBright);\n\n%color = ColorNewSelected.getSelectedColorI();\nRedTextEdit.setText(getWord(%color, 0));\nGreenTextEdit.setText(getWord(%color, 1));\nBlueTextEdit.setText(getWord(%color, 2));\nAlphaTextEdit.setText(getWord(%color, 3));\n\n%hex = ColorRGBToHEX(%color);\nHexTextEditor.setText(%hex);";
command = "%selHue = ColorNewSelected.getSelectedHue();\n%selSat = ColorNewSelected.getSelectedSaturation();\n%selBright = ColorNewSelected.getSelectedBrightness();\n\nHueTextEditor.setText(%selHue);\nSatTextEditor.setText(%selSat);\nBrightTextEditor.setText(%selBright);\n\n%color = $ColorCallbackType == 1 ? ColorNewSelected.getSelectedColorI() : ColorNewSelected.getSelectedLinearColor();\nRedTextEdit.setText(getWord(%color, 0));\nGreenTextEdit.setText(getWord(%color, 1));\nBlueTextEdit.setText(getWord(%color, 2));\nAlphaTextEdit.setText(getWord(%color, 3));\n\n%hex = ColorRGBToHEX(ColorNewSelected.getSelectedColorI());\nHexTextEditor.setText(%hex);";
tooltipProfile = "GuiToolTipProfile";
};
new GuiColorPickerCtrl(ColorOld) {
@ -268,16 +257,25 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
text = "Apply";
position = "211 1";
extent = "52 20";
command = "DoColorPickerCallback();";
profile = "ToolsGuiButtonProfile";
command = "DoColorPickerCallback();";
tooltipProfile = "GuiToolTipProfile";
};
new GuiButtonCtrl() {
text = "Cancel";
position = "211 24";
extent = "52 20";
command = "DoColorPickerCancelCallback();";
profile = "ToolsGuiButtonProfile";
command = "DoColorPickerCancelCallback();";
tooltipProfile = "GuiToolTipProfile";
};
new GuiBitmapButtonCtrl(ColorEyeDropperButton) {
BitmapAsset = "ToolsModule:eyedropper_n_image";
buttonType = "ToggleButton";
position = "223 56";
extent = "25 25";
profile = "ToolsGuiCheckBoxProfile";
command = "ColorPickerDlg.activateEyeDropper();";
tooltipProfile = "GuiToolTipProfile";
};
};
@ -285,20 +283,26 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiRolloutCtrl() {
caption = ":: Color Palette";
margin = "5 5 5 5";
position = "0 445";
extent = "271 36";
extent = "271 46";
profile = "GuiRolloutProfile";
tooltipProfile = "GuiToolTipProfile";
new GuiStackControl() {
stackingType = "Dynamic";
padding = "5";
changeChildSizeToFit = "0";
position = "0 17";
extent = "271 16";
profile = "GuiDefaultProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiDynamicCtrlArrayControl(ColorPaletteStack) {
colCount = "12";
colSize = "12";
rowSize = "12";
rowCount = "3";
rowSpacing = "1";
colSpacing = "1";
dynamicSize = "1";
padding = "3 3 3 3";
position = "0 17";
extent = "271 47";
profile = "GuiDefaultProfile";
tooltipProfile = "GuiToolTipProfile";
};
};
};
};
@ -344,6 +348,87 @@ function GetColorF( %currentColor, %callback, %root, %updateCallback, %cancelCal
%root.pushDialog(ColorPickerDlg);
}
function ColorPaletteStack::onWake(%this)
{
if($Pref::ColorPicker::ColorPalette $= "")
{
$Pref::ColorPicker::ColorPalette = "#FFFFFF #FF0000 #00FF00 #0000FF";
}
%colorCount = getWordCount($Pref::ColorPicker::ColorPalette);
if(%colorCount > 63)
%colorCount = 63;
for(%i=0; %i < %colorCount; %i++)
{
%hex = getWord($Pref::ColorPicker::ColorPalette, %i);
%rgb = ColorHEXToRGB(%hex);
%rgb = ColorIntToFloat(%rgb);
%colorBox = new GuiSwatchButtonCtrl() {
extent = "16 16";
color = %rgb;
profile = "GuiDefaultProfile";
colorHex = %hex;
useMouseEvents = "1";
class = "ColorPaletteSwatch";
};
ColorPaletteStack.Add(%colorBox);
}
%button = new GuiButtonCtrl() {
text = "+";
extent = "16 16";
profile = "ToolsGuiButtonProfile";
tooltipProfile = "GuiToolTipProfile";
command = "ColorPaletteStack.addCurrentColorToStack();";
};
ColorPaletteStack.Add(%button);
}
function ColorPaletteStack::addCurrentColorToStack(%this)
{
%hex = HexTextEditor.getValue();
//Make sure we have 6 characters
while(strlen(%hex) < 6)
{
%hex = "0" @ %hex;
}
%hex = strupr(%hex);
$Pref::ColorPicker::ColorPalette = "#" @ %hex SPC $Pref::ColorPicker::ColorPalette;
ColorPaletteStack.clear();
ColorPaletteStack.onWake();
}
function ColorPaletteStack::onSleep(%this)
{
ColorPaletteStack.clear();
}
function ColorPaletteSwatch::onMouseDown(%this)
{
//Update all the other color fields
%rgb = ColorHEXToRGB(%this.colorHex);
%hsb = ColorRGBToHSB(%rgb);
// these automatically update our ColorNewSelected which
// updates all text fields including these.
ColorHueRange.setSelectedHue(getWord(%hsb, 0));
ColorHueRange.executeUpdate();
ColorBlendRange.setSelectedSaturation(getWord(%hsb, 1));
ColorBlendRange.setSelectedBrightness(getWord(%hsb, 2));
ColorBlendRange.executeUpdate();
// for now just set full alpha until we save out alpha as well
ColorAlphaRange.setSelectedAlpha(255);
ColorAlphaRange.executeUpdate();
}
function ColorPickerRGBClass::onValidate(%this)
{
%red = RedTextEdit.getValue();
@ -352,8 +437,13 @@ function ColorPickerRGBClass::onValidate(%this)
%alpha = AlphaTextEdit.getValue();
//Update all the other color fields
%hsb = ColorRGBToHSB(%red SPC %green SPC %blue);
if( $ColorCallbackType == 1)
%hsb = ColorRGBToHSB(%red SPC %green SPC %blue);
else
{
%hsb = ColorLinearRGBToHSB(%red SPC %green SPC %blue);
%alpha *= 255.0;
}
// these automatically update our ColorNewSelected which
// updates all text fields including these.
ColorHueRange.setSelectedHue(getWord(%hsb, 0));

3
Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="add-simgroup-btn_ctrl_i_image"
imageFile="@assetFile=add-simgroup-btn_ctrl_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="add-simgroup-btn_i_image"
imageFile="@assetFile=add-simgroup-btn_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/camera-btn_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="camera-btn_i_image"
imageFile="@assetFile=camera-btn_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/clear-icon_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="clear-icon_i_image"
imageFile="@assetFile=clear-icon_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/delete_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="delete_i_image"
imageFile="@assetFile=delete_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="dropdown-button-arrow_d_image"
imageFile="@assetFile=dropdown-button-arrow_d.png"/>

3
Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="dropdown-button-arrow_h_image"
imageFile="@assetFile=dropdown-button-arrow_h.png"/>

3
Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="dropdown-button-arrow_i_image"
imageFile="@assetFile=dropdown-button-arrow_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="dropdown-button-arrow_n_image"
imageFile="@assetFile=dropdown-button-arrow_n.png"/>

BIN
Templates/BaseGame/game/tools/gui/images/eyedropper_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Templates/BaseGame/game/tools/gui/images/eyedropper_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="eyedropper_d_image"
imageFile="@assetFile=eyedropper_d.png"/>

BIN
Templates/BaseGame/game/tools/gui/images/eyedropper_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

3
Templates/BaseGame/game/tools/gui/images/eyedropper_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="eyedropper_h_image"
imageFile="@assetFile=eyedropper_h.png"/>

BIN
Templates/BaseGame/game/tools/gui/images/eyedropper_i.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Templates/BaseGame/game/tools/gui/images/eyedropper_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="eyedropper_i_image"
imageFile="@assetFile=eyedropper_i.png"/>

BIN
Templates/BaseGame/game/tools/gui/images/eyedropper_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Templates/BaseGame/game/tools/gui/images/eyedropper_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="eyedropper_n_image"
imageFile="@assetFile=eyedropper_n.png"/>

3
Templates/BaseGame/game/tools/gui/images/folder_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="folder_d_image"
imageFile="@assetFile=folder_d.png"/>

3
Templates/BaseGame/game/tools/gui/images/folder_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="folder_h_image"
imageFile="@assetFile=folder_h.png"/>

3
Templates/BaseGame/game/tools/gui/images/folder_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="folder_i_image"
imageFile="@assetFile=folder_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/folder_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="folder_n_image"
imageFile="@assetFile=folder_n.png"/>

3
Templates/BaseGame/game/tools/gui/images/images_menuGrid_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="images_menuGrid_d_image"
imageFile="@assetFile=menuGrid_d.png"/>

3
Templates/BaseGame/game/tools/gui/images/images_menuGrid_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="images_menuGrid_h_image"
imageFile="@assetFile=menuGrid_h.png"/>

3
Templates/BaseGame/game/tools/gui/images/images_menuGrid_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="images_menuGrid_image"
imageFile="@assetFile=menuGrid.png"/>

3
Templates/BaseGame/game/tools/gui/images/images_menuGrid_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="images_menuGrid_n_image"
imageFile="@assetFile=menuGrid_n.png"/>

3
Templates/BaseGame/game/tools/gui/images/layers-btn_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="layers-btn_i_image"
imageFile="@assetFile=layers-btn_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/lock_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="lock_i_image"
imageFile="@assetFile=lock_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/new-folder-btn_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="new-folder-btn_i_image"
imageFile="@assetFile=new-folder-btn_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/new_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="new_i_image"
imageFile="@assetFile=new_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/numericslider_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="numericslider_image"
imageFile="@assetFile=numericslider.png"/>

3
Templates/BaseGame/game/tools/gui/images/open-file_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="open-file_i_image"
imageFile="@assetFile=open-file_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/reset-icon_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="reset-icon_i_image"
imageFile="@assetFile=reset-icon_i.png"/>

3
Templates/BaseGame/game/tools/gui/images/selector-button_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="selector-button_image"
imageFile="@assetFile=selector-button.png"/>

3
Templates/BaseGame/game/tools/gui/images/tab-border_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="tab-border_image"
imageFile="@assetFile=tab-border.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_black_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_black_image"
imageFile="@assetFile=textEdit_black.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_blue_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_blue_image"
imageFile="@assetFile=textEdit_blue.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_cyan_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_cyan_image"
imageFile="@assetFile=textEdit_cyan.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_green_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_green_image"
imageFile="@assetFile=textEdit_green.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_magenta_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_magenta_image"
imageFile="@assetFile=textEdit_magenta.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_red_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_red_image"
imageFile="@assetFile=textEdit_red.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_white_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_white_image"
imageFile="@assetFile=textEdit_white.png"/>

3
Templates/BaseGame/game/tools/gui/images/textEdit_yellow_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="textEdit_yellow_image"
imageFile="@assetFile=textEdit_yellow.png"/>

3
Templates/BaseGame/game/tools/gui/images/uv-editor-btn_i_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="uv-editor-btn_i_image"
imageFile="@assetFile=uv-editor-btn_i.png"/>

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

@ -2733,6 +2733,11 @@ function matEdDragNDropMapAssignment(%type, %payload)
MaterialEditorGui.guiSync( materialEd_previewMaterial );
MaterialEditorGui.doUpdateTextureMap( %assetId );
Canvas.popDialog(EditorDragAndDropLayer);
if(EditorSettings.value("AssetManagement/Assets/closeBrowserOnDragAction", false))
{
AssetBrowser.hideDialog();
}
}
function materialEditorDiffuseMapContainer::onControlDropped( %this, %payload, %position )

16
Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
View file

@ -1502,6 +1502,22 @@ function ObjectBuilderGui::buildFlyingVehicle(%this)
%this.process();
}
function ObjectBuilderGui::buildSpawnSphere(%this)
{
%this.objectClassName = "SpawnSphere";
%this.addField("dataBlock", "TypeDataBlock", "dataBlock", "MissionMarkerData SpawnSphereMarker");
%this.addField("radius", "TypeFloat", "Radius", 1);
%this.addField("sphereWeight", "TypeFloat", "Sphere Weight", 1);
%this.addField("spawnClass", "TypeString", "Spawn Class", "");
%this.addField("spawnDatablock", "TypeString", "Spawn Data", "");
%this.addField("spawnTransform", "TypeBool", "Spawn Here", "true");
%this.addField("autoSpawn", "TypeBool", "Auto Spawn Objects", "false");
%this.addField("spawnScript", "TypeString", "spawnScript", "%this.spawned = $SpawnObject;");
%this.addField("canSaveDynamicFields", "TypeBool", "Save metadata", "false");
%this.process();
}
function ObjectBuilderGui::buildObserverDropPoint(%this)
{
%this.objectClassName = "SpawnSphere";

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 890 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_d_image"
imageFile="@assetFile=Copy_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 741 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_h_image"
imageFile="@assetFile=Copy_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 B

3
Templates/BaseGame/game/tools/worldEditor/images/Copy_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="Copy_terr_n_image"
imageFile="@assetFile=Copy_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 729 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_d_image"
imageFile="@assetFile=erodeH_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 640 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_h_image"
imageFile="@assetFile=erodeH_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeH_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 509 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeH_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeH_n_image"
imageFile="@assetFile=erodeH_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 477 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_d_image"
imageFile="@assetFile=erodeT_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 468 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_h_image"
imageFile="@assetFile=erodeT_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/erodeT_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 427 B

3
Templates/BaseGame/game/tools/worldEditor/images/erodeT_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="erodeT_n_image"
imageFile="@assetFile=erodeT_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 898 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_d_image"
imageFile="@assetFile=pasteDown_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 739 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_h_image"
imageFile="@assetFile=pasteDown_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 633 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteDown_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteDown_terr_n_image"
imageFile="@assetFile=pasteDown_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 958 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_d_image"
imageFile="@assetFile=pasteUp_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 776 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_h_image"
imageFile="@assetFile=pasteUp_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 619 B

3
Templates/BaseGame/game/tools/worldEditor/images/pasteUp_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="pasteUp_terr_n_image"
imageFile="@assetFile=pasteUp_terr_n.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_d.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 745 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_d_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_d_image"
imageFile="@assetFile=paste_terr_d.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_h.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 661 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_h_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_h_image"
imageFile="@assetFile=paste_terr_h.png"/>

BIN
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 556 B

3
Templates/BaseGame/game/tools/worldEditor/images/paste_terr_n_image.asset.taml Normal file
View file

@ -0,0 +1,3 @@
<ImageAsset
AssetName="paste_terr_n_image"
imageFile="@assetFile=paste_terr_n.png"/>

26
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -1205,10 +1205,12 @@ function TerrainEditorPlugin::onWorldEditorStartup( %this )
%map.bindCmd( keyboard, "4", "ToolsPaletteArray->smoothHeight.performClick();", "" ); // Average Height
%map.bindCmd( keyboard, "5", "ToolsPaletteArray->smoothSlope.performClick();", "" ); // Smooth Slope
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->paintNoise.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "0", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "6", "ToolsPaletteArray->thermalErode.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "7", "ToolsPaletteArray->hydraulicErode.performClick();", "" ); // Noise
%map.bindCmd( keyboard, "8", "ToolsPaletteArray->flattenHeight.performClick();", "" ); // Flatten
%map.bindCmd( keyboard, "9", "ToolsPaletteArray->setHeight.performClick();", "" ); // Set Height
%map.bindCmd( keyboard, "0", "ToolsPaletteArray->setEmpty.performClick();", "" ); // Clear Terrain
%map.bindCmd( keyboard, "shift 0", "ToolsPaletteArray->clearEmpty.performClick();", "" ); // Restore Terrain
%map.bindCmd( keyboard, "v", "EWTerrainEditToolbarBrushType->ellipse.performClick();", "" );// Circle Brush
%map.bindCmd( keyboard, "b", "EWTerrainEditToolbarBrushType->box.performClick();", "" );// Box Brush
%map.bindCmd( keyboard, "=", "TerrainEditorPlugin.keyboardModifyBrushSize(1);", "" );// +1 Brush Size
@ -1248,11 +1250,17 @@ function EditorGui::SetTerrainPalletBar()
EWToolsPaletteWindow.addButton("LowerHeight", "ToolsModule:lowerHeight_n_image", "ETerrainEditor.switchAction( lowerHeight );", "", "Lower Height", "3");
EWToolsPaletteWindow.addButton("SmoothHeight", "ToolsModule:smoothHeight_n_image", "ETerrainEditor.switchAction( smoothHeight );", "", "Smooth Height", "4");
EWToolsPaletteWindow.addButton("SmoothSlope", "ToolsModule:softCurve_n_image", "ETerrainEditor.switchAction( smoothSlope );", "", "Smooth Slope", "5");
EWToolsPaletteWindow.addButton("PaintNoise", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( paintNoise );", "", "Paint Noise", "6");
EWToolsPaletteWindow.addButton("FlattenHeight", "ToolsModule:flattenHeight_n_image", "ETerrainEditor.switchAction( flattenHeight );", "", "Flatten Height", "7");
EWToolsPaletteWindow.addButton("SetHeight", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( setHeight );", "", "Set Height", "8");
EWToolsPaletteWindow.addButton("SetEmpty", "ToolsModule:setEmpty_n_image", "ETerrainEditor.switchAction( setEmpty );", "", "Set Empty", "9");
EWToolsPaletteWindow.addButton("ClearEmpty", "ToolsModule:clearEmpty_n_image", "ETerrainEditor.switchAction( clearEmpty );", "", "Clear Empty", "0");
EWToolsPaletteWindow.addButton("PaintNoise", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( paintNoise );", "", "Paint Noise", "6");
EWToolsPaletteWindow.addButton("thermalErode", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( thermalErode );", "", "thermal Erode", "7");
EWToolsPaletteWindow.addButton("hydraulicErode", "ToolsModule:brushPaintNoise_n_image", "ETerrainEditor.switchAction( hydraulicErode );", "", "hydraulic Erode", "8");
EWToolsPaletteWindow.addButton("FlattenHeight", "ToolsModule:flattenHeight_n_image", "ETerrainEditor.switchAction( flattenHeight );", "", "Flatten Height", "9");
EWToolsPaletteWindow.addButton("SetHeight", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( setHeight );", "", "Set Height", "0");
EWToolsPaletteWindow.addButton("SetEmpty", "ToolsModule:setEmpty_n_image", "ETerrainEditor.switchAction( setEmpty );", "", "Set Empty", "0");
EWToolsPaletteWindow.addButton("ClearEmpty", "ToolsModule:clearEmpty_n_image", "ETerrainEditor.switchAction( clearEmpty );", "", "Clear Empty", "shift 0");
EWToolsPaletteWindow.addButton("Copy", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( copy );", "", "copy", "ctrl C");
EWToolsPaletteWindow.addButton("Paste", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( paste );", "", "paste", "ctrl v");
EWToolsPaletteWindow.addButton("pasteUp", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( pasteUp );", "", "pasteUp", "ctrl b");
EWToolsPaletteWindow.addButton("PasteDown", "ToolsModule:setHeight_n_image", "ETerrainEditor.switchAction( pasteDown );", "", "pasteDown", "ctrl n");
EWToolsPaletteWindow.refresh();
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/buttonPalette.tscript
View file

@ -148,7 +148,7 @@ function ButtonPalette::refresh(%this)
variable = getField(%buttonInfo, 3);
};
%extents.y += 23;
%extents.y += 25;
if(isObject(%this.actionMap))
%this.actionMap.bindCmd( keyboard, getField(%buttonInfo, 5), %paletteButton @ ".performClick();", "" );