mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 23:24:41 +00:00
Improve handling of non-default script filenames
This commit is contained in:
parent
099dd4f1f3
commit
9ccaa6d3ea
118 changed files with 534 additions and 528 deletions
|
|
@ -30,10 +30,10 @@ function initializeParticleEditor()
|
|||
echo( " % - Initializing Particle Editor" );
|
||||
|
||||
exec( "./ParticleEditor.ed.gui" );
|
||||
exec( "./particleEditor.ed.tscript" );
|
||||
exec( "./particleEditorUndo.ed.tscript" );
|
||||
exec( "./particleEmitterEditor.ed.tscript" );
|
||||
exec( "./particleParticleEditor.ed.tscript" );
|
||||
exec( "./particleEditor.ed." @ $TorqueScriptFileExtension );
|
||||
exec( "./particleEditorUndo.ed." @ $TorqueScriptFileExtension );
|
||||
exec( "./particleEmitterEditor.ed." @ $TorqueScriptFileExtension );
|
||||
exec( "./particleParticleEditor.ed." @ $TorqueScriptFileExtension );
|
||||
|
||||
PE_Window.setVisible( false );
|
||||
EditorGui.add( PE_Window );
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ function ActionDeleteEmitter::redo( %this )
|
|||
// Remove from file.
|
||||
|
||||
if( %emitter.getFileName() !$= ""
|
||||
&& %emitter.getFilename() !$= "tools/particleEditor/particleEmitterEditor.ed.tscript" )
|
||||
&& %emitter.getFilename() !$= "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension )
|
||||
PE_EmitterSaver.removeObjectFromFile( %emitter );
|
||||
|
||||
// Select DefaultEmitter or first in list.
|
||||
|
|
@ -449,7 +449,7 @@ function ActionDeleteParticle::redo( %this )
|
|||
// Remove from file.
|
||||
|
||||
if( %particle.getFileName() !$= ""
|
||||
&& %particle.getFilename() !$= "tools/particleEditor/particleParticleEditor.ed.tscript" )
|
||||
&& %particle.getFilename() !$= "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension )
|
||||
PE_ParticleSaver.removeObjectFromFile( %particleId );
|
||||
|
||||
// Remove from dropdown.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData.tscript";
|
||||
$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData." @ $TorqueScriptFileExtension;
|
||||
|
||||
|
||||
//=============================================================================================
|
||||
|
|
@ -500,7 +500,7 @@ function PE_EmitterEditor::setEmitterDirty( %this )
|
|||
|
||||
%emitter = PE_EmitterEditor.currEmitter;
|
||||
|
||||
if( %emitter.getFilename() $= "" || %emitter.getFilename() $= "tools/particleEditor/particleEmitterEditor.ed.tscript" )
|
||||
if( %emitter.getFilename() $= "" || %emitter.getFilename() $= "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension )
|
||||
PE_EmitterSaver.setDirty( %emitter, $PE_EMITTEREDITOR_DEFAULT_FILENAME );
|
||||
else
|
||||
PE_EmitterSaver.setDirty( %emitter );
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData.tscript";
|
||||
$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData." @ $TorqueScriptFileExtension;
|
||||
|
||||
|
||||
//=============================================================================================
|
||||
|
|
@ -407,7 +407,7 @@ function PE_ParticleEditor::setParticleDirty( %this )
|
|||
|
||||
%particle = PE_ParticleEditor.currParticle;
|
||||
|
||||
if( %particle.getFilename() $= "" || %particle.getFilename() $= "tools/particleEditor/particleParticleEditor.ed.tscript" )
|
||||
if( %particle.getFilename() $= "" || %particle.getFilename() $= "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension )
|
||||
PE_ParticleSaver.setDirty( %particle, $PE_PARTICLEEDITOR_DEFAULT_FILENAME );
|
||||
else
|
||||
PE_ParticleSaver.setDirty( %particle );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue