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

Moves the delta-based rounding function Verve used up into the engine so it wouldn't override the regular mRound function. Now is mRoundDelta.

Browse source
This commit is contained in:
Areloch 2020-07-18 02:53:34 -05:00
parent b62ea8c701
commit 247c0eb34a
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Engine/source/math/mConsoleFunctions.cpp
View file

@ -105,6 +105,17 @@ DefineEngineFunction( mRound, S32, ( F32 v ),,
return mRound(v); return mRound(v);
} }
DefineEngineFunction(mRoundDelta, S32, (F32 v, S32 d), (0.0, 1),
"Round v to the nearest number based on the delta"
"@param v Value to round"
"@param d Delta use when rounding"
"@return The rounded value as a S32."
"@ingroup Math")
{
return (mFloor(v / d + 0.5) * d);
}
DefineEngineFunction( mRoundColour, F32, ( F32 v, S32 n ), (0), DefineEngineFunction( mRoundColour, F32, ( F32 v, S32 n ), (0),
"Round v to the nth decimal place or the nearest whole number by default." "Round v to the nth decimal place or the nearest whole number by default."
"@param v Value to roundn" "@param v Value to roundn"

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VDirectorEvent.cs
View file

@ -91,7 +91,7 @@ function VDirectorEvent::getSnapTime( %this, %targetTime )
if ( $VerveEditor::Event::SnapTime > 0 ) if ( $VerveEditor::Event::SnapTime > 0 )
{ {
// Snap. // Snap.
return mRound( %targetTime, $VerveEditor::Event::SnapTime ); return mRoundDelta( %targetTime, $VerveEditor::Event::SnapTime );
} }
// No Snap! // No Snap!

2
Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VEvent.cs
View file

@ -197,7 +197,7 @@ function VEvent::getSnapTime( %this, %targetTime )
if ( $Pref::VerveEditor::Event::SnapToTime && $Pref::VerveEditor::Event::SnapToTimeThreshold > 0 ) if ( $Pref::VerveEditor::Event::SnapToTime && $Pref::VerveEditor::Event::SnapToTimeThreshold > 0 )
{ {
// Snap. // Snap.
return mRound( %targetTime, $Pref::VerveEditor::Event::SnapToTimeThreshold ); return mRoundDelta( %targetTime, $Pref::VerveEditor::Event::SnapToTimeThreshold );
} }
// No Snap! // No Snap!

11
Templates/BaseGame/game/tools/VerveEditor/Scripts/Utility.cs
View file

@ -45,17 +45,6 @@ function GuiControl::getParentOfType( %this, %className )
return 0; return 0;
} }
//-----------------------------------------------------------------------------
//
// MATH
//
//-----------------------------------------------------------------------------
function mRound( %number, %delta )
{
return ( mFloor( %number / %delta + 0.5 ) * %delta );
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// STRING // STRING