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

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/tools/particleEditor/PE_Window.asset.taml Normal file
View file

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

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

@ -214,7 +214,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/new";
bitmap = "ToolsModule:new_image";
tooltip = "Create New Emitter";
};
new GuiBitmapButtonCtrl() {
@ -234,7 +234,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
tooltip = "Delete Current Emitter";
};
};
@ -445,7 +445,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -700,7 +700,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -856,7 +856,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "0 Degrees ( Up )";
};
new GuiBitmapCtrl(){ // 90 Degrees
@ -864,7 +864,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/4)+1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "90 Degrees ( Left )";
};
new GuiBitmapCtrl(){ // 180 Degrees
@ -872,7 +872,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "180 Degrees ( Down )";
};
new GuiBitmapCtrl(){ // 270 Degrees
@ -880,7 +880,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2+mCeil(getWord($PE_guielement_ext_slider,0)/4))-4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "270 Degrees ( Right )";
};
new GuiBitmapCtrl(){ // 360 Degrees
@ -888,7 +888,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0))-5 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "360 Degrees ( Up )";
};
@ -943,7 +943,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "0 Degrees ( Up )";
};
new GuiBitmapCtrl(){ // 90 Degrees
@ -951,7 +951,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/4)+1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "90 Degrees ( Left )";
};
new GuiBitmapCtrl(){ // 180 Degrees
@ -959,7 +959,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
minExtent = "0 0";
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "180 Degrees ( Down )";
};
new GuiBitmapCtrl(){ // 270 Degrees
@ -967,7 +967,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2+mCeil(getWord($PE_guielement_ext_slider,0)/4))-4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "270 Degrees ( Right )";
};
new GuiBitmapCtrl(){ // 360 Degrees
@ -975,7 +975,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0))-5 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "360 Degrees ( Up )";
};
@ -1031,7 +1031,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "0 Degrees ( Up )";
};
new GuiBitmapCtrl(){ // 90 Degrees
@ -1039,7 +1039,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/4)+1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "45 Degrees";
};
new GuiBitmapCtrl(){ // 180 Degrees
@ -1047,7 +1047,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
minExtent = "0 0";
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "90 Degrees";
};
new GuiBitmapCtrl(){ // 270 Degrees
@ -1055,7 +1055,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2+mCeil(getWord($PE_guielement_ext_slider,0)/4))-4 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "135 Degrees";
};
new GuiBitmapCtrl(){ // 360 Degrees
@ -1063,7 +1063,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0))-5 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "180 Degrees";
};
@ -1110,7 +1110,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -1355,7 +1355,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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";
@ -1403,7 +1403,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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";
@ -1451,7 +1451,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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";
@ -1615,7 +1615,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -1866,7 +1866,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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";
};
@ -1886,7 +1886,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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";
};
@ -1907,7 +1907,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
tooltip = "Delete Current Particle";
};
};
@ -1964,7 +1964,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialEditor/gui/unknownImage";
bitmapAsset = "ToolsModule:unknownImage_image";
wrap = "0";
};
new GuiTextCtrl() {
@ -2009,7 +2009,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -2030,7 +2030,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image";
Command = "PE_ParticleEditor.updateParticleTexture(1);";
};
new GuiCheckBoxCtrl() {
@ -2083,7 +2083,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
//visible = false;
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -2339,7 +2339,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -2356,7 +2356,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "0 Gravity";
};
@ -2538,7 +2538,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "No Spin";
};
@ -2593,7 +2593,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
position = getWord($PE_guielement_pos_slider,0)+mCeil(getWord($PE_guielement_ext_slider,0)/2)-1 SPC "0";
Extent = "2 18";
minExtent = "0 0";
bitmap = "tools/gui/images/separator-h";
bitmapAsset = "ToolsModule:separator_h_image";
tooltip = "No Spin";
};
@ -2640,7 +2640,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -3058,7 +3058,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -3443,7 +3443,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
isContainer = "1"; HorizSizing = "width"; Position = "0 0"; Extent = "194 8";
new GuiBitmapCtrl(){
position="0 3"; extent ="188 2"; HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
bitmapAsset ="ToolsModule:separator_v_image";
};
};// end spacer ----------------------------------------
@ -3845,7 +3845,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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 = "";
@ -3868,7 +3868,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
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 = "";

8
Templates/BaseGame/game/tools/particleEditor/images/play_btn_d_image.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/particleEditor/images/play_btn_h_image.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/particleEditor/images/play_btn_n_image.asset.taml Normal file
View file

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

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

16
Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.tscript
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData." @ $TorqueScriptFileExtension;
$PE_EMITTEREDITOR_DEFAULT_FILENAME = "data/managedParticleEmitterData." @ $TorqueScriptFileExtension;
//=============================================================================================
@ -499,8 +499,10 @@ function PE_EmitterEditor::setEmitterDirty( %this )
PE_EmitterEditor.dirty = true;
%emitter = PE_EmitterEditor.currEmitter;
%filename = %emitter.getFilename();
%editorFilename = "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension;
if( %emitter.getFilename() $= "" || %emitter.getFilename() $= "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension )
if( %filename $= "" || %filename $= %editorFilename )
PE_EmitterSaver.setDirty( %emitter, $PE_EMITTEREDITOR_DEFAULT_FILENAME );
else
PE_EmitterSaver.setDirty( %emitter );
@ -551,6 +553,16 @@ function PE_EmitterEditor::showNewDialog( %this )
function PE_EmitterEditor::createEmitter( %this )
{
AssetBrowser_SelectModule.showDialog("PE_EmitterEditor.pickedNewEmitterTargetModule");
AssetBrowser_SelectModuleWindow.selectWindow();
}
function PE_EmitterEditor::pickedNewEmitterTargetModule( %this, %module )
{
%moduleDef = ModuleDatabase.findModule(%module);
PE_EmitterEditor.targetModule = %module;
$PE_EMITTEREDITOR_DEFAULT_FILENAME = %moduleDef.ModulePath @ "/scripts/managedData/managedParticleEmitterData." @ $TorqueScriptFileExtension;
// Create a new emitter.
%emitter = getUniqueName( "newEmitter" );
datablock ParticleEmitterData( %emitter : DefaultEmitter )

66
Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.tscript
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData." @ $TorqueScriptFileExtension;
$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "data/managedParticleData." @ $TorqueScriptFileExtension;
//=============================================================================================
@ -57,11 +57,16 @@ function PE_ParticleEditor::guiSync( %this )
%popup.sort();
%popup.setSelected( %data );
%bitmap = MaterialEditorGui.searchForTexture( %data.getName(), %data.textureName );
%bitmap = %data.getTexture();//MaterialEditorGui.searchForTexture( %data.getName(), %data.getTexture() );
if( %bitmap !$= "" )
{
PE_ParticleEditor-->PEP_previewImage.setBitmap( %bitmap );
PE_ParticleEditor-->PEP_previewImageName.setText( %bitmap );
%text = %data.getTextureAsset();
if(%text $= "")
%text = %bitmap;
PE_ParticleEditor-->PEP_previewImageName.setText( %text );
PE_ParticleEditor-->PEP_previewImageName.tooltip = %bitmap;
}
else
@ -215,15 +220,7 @@ function PE_ParticleEditor::updateParticleTexture( %this, %action )
{
if( %action )
{
%texture = MaterialEditorGui.openFile("texture");
if( %texture !$= "" )
{
PE_ParticleEditor-->PEP_previewImage.setBitmap(%texture);
PE_ParticleEditor-->PEP_previewImageName.setText(%texture);
PE_ParticleEditor-->PEP_previewImageName.tooltip = %texture;
PE_ParticleEditor.updateParticle( "textureName", %texture );
}
AssetBrowser.showDialog("ImageAsset", "PE_ParticleEditor.onImageAssetSelected");
}
else
{
@ -235,6 +232,18 @@ function PE_ParticleEditor::updateParticleTexture( %this, %action )
}
}
function PE_ParticleEditor::onImageAssetSelected(%this, %assetId)
{
if( AssetDatabase.isDeclaredAsset(%assetId) )
{
PE_ParticleEditor-->PEP_previewImage.setBitmap(%assetId);
PE_ParticleEditor-->PEP_previewImageName.setText(%assetId);
PE_ParticleEditor-->PEP_previewImageName.tooltip = %assetId;
PE_ParticleEditor.updateParticle( "textureAsset", %assetId );
}
}
//---------------------------------------------------------------------------------------------
function PE_ParticleEditor::updateLifeFields( %this, %isRandom, %value, %isSlider, %onMouseUp )
@ -389,11 +398,18 @@ function PE_ParticleEditor::loadNewParticle( %this, %particle )
PE_ParticleEditor.currParticle = %particle;
error("PE_ParticleEditor::loadNewParticle() - Loading particle: " @ %particle.getName());
error("Particle TextureName: " @ %particle.getTexture());
error("ReloadingParticle...");
%particle.reload();
PE_ParticleEditor_NotDirtyParticle.assignFieldsFrom( %particle );
PE_ParticleEditor_NotDirtyParticle.originalName = %particle.getName();
error("Post duplicate Particle TextureName: " @ %particle.getTexture());
error("Post duplicate PE_ParticleEditor_NotDirtyParticle TextureName: " @ PE_ParticleEditor_NotDirtyParticle.getTexture());
PE_ParticleEditor.guiSync();
PE_ParticleEditor.setParticleNotDirty();
}
@ -406,8 +422,10 @@ function PE_ParticleEditor::setParticleDirty( %this )
PE_ParticleEditor.dirty = true;
%particle = PE_ParticleEditor.currParticle;
%filename = %particle.getFilename();
%editorFilename = "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension;
if( %particle.getFilename() $= "" || %particle.getFilename() $= "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension )
if( %filename $= "" || %filename $= %editorFilename )
PE_ParticleSaver.setDirty( %particle, $PE_PARTICLEEDITOR_DEFAULT_FILENAME );
else
PE_ParticleSaver.setDirty( %particle );
@ -462,6 +480,24 @@ function PE_ParticleEditor::createParticle( %this, %replaceSlot )
else
%particleIndex = %replaceSlot - 1;
PE_ParticleEditor.newParticleSlot = %particleIndex;
if(%replaceSlot $= "" || %replaceSlot != 0)
{
AssetBrowser_SelectModule.showDialog("PE_ParticleEditor.pickedNewParticleTargetModule");
AssetBrowser_SelectModuleWindow.selectWindow();
}
else
{
PE_ParticleEditor.pickedNewParticleTargetModule(PE_EmitterEditor.targetModule);
}
}
function PE_ParticleEditor::pickedNewParticleTargetModule(%this, %module)
{
%moduleDef = ModuleDatabase.findModule(%module);
$PE_PARTICLEEDITOR_DEFAULT_FILENAME = %moduleDef.ModulePath @ "/scripts/managedData/managedParticleData." @ $TorqueScriptFileExtension;
// Create the particle datablock and add to the emitter.
%newParticle = getUniqueName( "newParticle" );
@ -474,8 +510,8 @@ function PE_ParticleEditor::createParticle( %this, %replaceSlot )
%action = ParticleEditor.createUndo( ActionCreateNewParticle, "Create New Particle" );
%action.particle = %newParticle.getId();
%action.particleIndex = %particleIndex;
%action.prevParticle = ( "PEE_EmitterParticleSelector" @ ( %particleIndex + 1 ) ).getSelected();
%action.particleIndex = PE_ParticleEditor.newParticleSlot;
%action.prevParticle = ( "PEE_EmitterParticleSelector" @ ( PE_ParticleEditor.newParticleSlot + 1 ) ).getSelected();
%action.emitter = PE_EmitterEditor.currEmitter;
ParticleEditor.submitUndo( %action );