TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-31 18:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1643 from Azaezel/TriggerTrouble

Browse source 
corrects https://github.com/GarageGames/Torque3D/issues/1273
This commit is contained in:
Areloch 2016-06-18 11:54:41 -05:00 • committed by GitHub
commit 80dcf3eba5
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 )
{
// Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" )
{
// Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() );
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
// Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" )
{
// Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText();
if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText()))
{
MessageBoxOK( "Error", "Trigger out of range of the selected animation." );
}
else
{
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
}
}
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 )
{
// Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" )
{
// Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() );
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
// Can only add triggers if a sequence is selected
%seqName = ShapeEdSequenceList.getSelectedName();
if ( %seqName !$= "" )
{
// Add a new trigger at the current frame
%frame = mRound( ShapeEdSeqSlider.getValue() ) - %this-->startFrame.getText();
if ((%frame < 0) || (%frame > %this-->endFrame.getText() - %this-->startFrame.getText()))
{
MessageBoxOK( "Error", "Trigger out of range of the selected animation." );
}
else
{
%state = ShapeEdTriggerList.rowCount() % 30;
ShapeEditor.doAddTrigger( %seqName, %frame, %state );
}
}
}
function ShapeEdTriggerList::onDeleteSelection( %this )