Core/Movement: ported MotionMaster::MoveJumpWithGravity implementation from master branch and cut off post Cataclsym features
This commit is contained in:
1 parent
ce9da3a209
commit
2aee19fc86
5 files changed
+43
-3
No files matched your search
@@ -204,8 +204,15 @@ void MoveSpline::Initialize(MoveSplineInitArgs const& args)
|
||||
effect_start_time = Duration() * args.time_perc;
|
||||
if (args.flags.parabolic && effect_start_time < Duration())
|
||||
{
|
||||
float f_duration = MSToSec(Duration() - effect_start_time);
|
||||
vertical_acceleration = args.parabolic_amplitude * 8.f / (f_duration * f_duration);
|
||||
if (args.parabolic_amplitude != 0.0f)
|
||||
{
|
||||
float f_duration = MSToSec(Duration() - effect_start_time);
|
||||
vertical_acceleration = args.parabolic_amplitude * 8.f / (f_duration * f_duration);
|
||||
}
|
||||
else if (args.vertical_acceleration != 0.0f)
|
||||
{
|
||||
vertical_acceleration = args.vertical_acceleration;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -218,7 +225,7 @@ MoveSpline::MoveSpline() : m_Id(0), time_passed(0),
|
||||
}
|
||||
|
||||
MoveSplineInitArgs::MoveSplineInitArgs(size_t path_capacity /*= 16*/) : path_Idx_offset(0), velocity(0.f),
|
||||
parabolic_amplitude(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f), walk(false),
|
||||
parabolic_amplitude(0.f), vertical_acceleration(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f), walk(false),
|
||||
HasVelocity(false), TransformForTransport(true)
|
||||
{
|
||||
path.reserve(path_capacity);
|
||||
|
||||
Reference in new issue
Block a user