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

more torquescript template fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-05-04 22:49:19 -04:00
parent 6f7fdca87d
commit b2bbd771f6
54 changed files with 122 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -1439,6 +1439,8 @@ function ShapeEdPropWindow::update_onSequenceBlendChanged( %this, %seqName, %ble
%proxyName = ShapeEditor.getProxyName( %seqName );
if ( ShapeEditor.shape.getSequenceIndex( %proxyName ) != -1 )
{
//TODO
%oldBlend = false;
if ( %blend && %oldBlend )
ShapeEditor.shape.setSequenceBlend( %proxyName, false, %oldBlendSeq, %oldBlendFrame );
ShapeEditor.shape.setSequenceBlend( %proxyName, %blend, %blendSeq, %blendFrame );
@ -2217,7 +2219,7 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s
if ( %frame != %oldFrame )
{
%pos = ShapeEdAnimWindow.getTimelineBitmapPos( ShapeEdAnimWindow-->seqIn.getText() + %frame, 2 );
eval( "%ctrl = ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl = eval( "return ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl.position = %pos SPC "0";
}
}