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

corrects https://github.com/GarageGames/Torque3D/issues/1273 with suggested resolution

Browse source
This commit is contained in:
Azaezel 2016-06-09 13:23:37 -05:00
parent 5122360552
commit b4dfb9ad08
2 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Templates/Empty/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -2206,15 +2206,22 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s
function ShapeEdSequences::onAddTrigger( %this ) function ShapeEdSequences::onAddTrigger( %this )
{ {
// Can only add triggers if a sequence is selected // Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName(); %seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" ) if ( %seqName !$= "" )
{ {
// Add a new trigger at the current frame // Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() ); %frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText();
%state = ShapeEdTriggerList.rowCount() % 30; if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText()))
ShapeEditor.doAddTrigger( %seqName, %frame, %state ); {
} MessageBoxOK( "Error", "Trigger out of range of the selected animation." );
}
else
{
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
}
} }
function ShapeEdTriggerList::onDeleteSelection( %this ) function ShapeEdTriggerList::onDeleteSelection( %this )

25
Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -2206,15 +2206,22 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s
function ShapeEdSequences::onAddTrigger( %this ) function ShapeEdSequences::onAddTrigger( %this )
{ {
// Can only add triggers if a sequence is selected // Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName(); %seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" ) if ( %seqName !$= "" )
{ {
// Add a new trigger at the current frame // Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() ); %frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText();
%state = ShapeEdTriggerList.rowCount() % 30; if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText()))
ShapeEditor.doAddTrigger( %seqName, %frame, %state ); {
} MessageBoxOK( "Error", "Trigger out of range of the selected animation." );
}
else
{
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
}
} }
function ShapeEdTriggerList::onDeleteSelection( %this ) function ShapeEdTriggerList::onDeleteSelection( %this )