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

Merge pull request #1698 from Azaezel/alpha41/particleED_pill
Some checks are pending
Linux Build / Ubuntu Latest GCC (push) Waiting to run
Details
MacOSX Build / MacOSX Latest Clang (push) Waiting to run
Details
Windows Build / Windows Latest MSVC (push) Waiting to run
Details

Browse source 
fix particle editor
This commit is contained in:
Brian Roberts 2026-03-22 16:29:04 -05:00 • committed by GitHub
commit 53a0667e9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,15 +173,15 @@ function PE_ParticleEditor::updateParticle(%this, %propertyField, %value, %isSli
function PE_ParticleEditor::setDirty( %this ) function PE_ParticleEditor::setDirty( %this )
{ {
this.text = "*Particle"; %this.text = "*Particle";
this.dirty = true; %this.dirty = true;
if(!startsWith(%this-->PopupMenu.text, "*")) if(!startsWith(%this-->PopupMenu.text, "*"))
{ {
%this-->PopupMenu.text = "*" @ %this-->PopupMenu.text; %this-->PopupMenu.text = "*" @ %this-->PopupMenu.text;
} }
%particle = this.currParticle; %particle = %this.currParticle;
%filename = %particle.getFilename(); %filename = %particle.getFilename();
%editorFilename = "tools/particleEditor/scripts/particleParticleEditor.ed." @ $TorqueScriptFileExtension; %editorFilename = "tools/particleEditor/scripts/particleParticleEditor.ed." @ $TorqueScriptFileExtension;
@ -211,17 +211,17 @@ function PE_ParticleEditor::setNotDirty( %this )
function PE_ParticleEditor::showNewDialog( %this, %replaceSlot ) function PE_ParticleEditor::showNewDialog( %this, %replaceSlot )
{ {
// Open a dialog if the current Particle is dirty // Open a dialog if the current Particle is dirty
if( this.dirty ) if( %this.dirty )
{ {
toolsMessageBoxYesNoCancel("Save Particle Changes?", toolsMessageBoxYesNoCancel("Save Particle Changes?",
"Do you wish to save the changes made to the <br>current particle before changing the particle?", "Do you wish to save the changes made to the <br>current particle before changing the particle?",
"PE_ParticleEditor.saveParticle( " @ this.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );", "PE_ParticleEditor.saveParticle( " @ %this.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );",
"PE_ParticleEditor.saveParticleDialogDontSave( " @ this.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );" "PE_ParticleEditor.saveParticleDialogDontSave( " @ %this.currParticle.getName() @ " ); PE_ParticleEditor.createParticle( " @ %replaceSlot @ " );"
); );
} }
else else
{ {
this.createParticle( %replaceSlot ); %this.createParticle( %replaceSlot );
} }
} }
@ -263,7 +263,7 @@ function PE_ParticleEditor::pickedNewParticleTargetModule( %this, %module )
ParticleEditorCreatePrompt.show("Particle", "ParticleData", "PE_ParticleEditor.doCreateNewParticle(\"" @ %module @ "\");" ); ParticleEditorCreatePrompt.show("Particle", "ParticleData", "PE_ParticleEditor.doCreateNewParticle(\"" @ %module @ "\");" );
} }
function PE_ParticleEditor::doCreateNewEmitter(%this, %module) function PE_ParticleEditor::doCreateNewParticle(%this, %module)
{ {
//Sanity checks //Sanity checks
%newName = ParticleEditorCreatePrompt-->nameText.getText(); %newName = ParticleEditorCreatePrompt-->nameText.getText();