TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added getShapeConstructorFilePath console function on shapeAsset

Browse source 
Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets
This commit is contained in:
Areloch 2021-08-02 04:20:27 -05:00
parent 52c83d19e1
commit 88ae8a9665
181 changed files with 2343 additions and 1577 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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