Commit Graph

83 Commits

Author SHA1 Message Date
Daniel Jour
b40fa6922e Keyframe::GetMaxPoint() simplify loop 2019-12-03 16:58:53 +01:00
Daniel Jour
79cb8483f3 Keyframe: Move Bezier code into extra function, parameterise
Bezier interpolation code is now in a dedicated function and can be
used to either find a Y from a known X or a X from a known Y, with a
given allowed error.
2019-12-03 16:56:53 +01:00
Daniel Jour
65cb3dfde9 Keyframe::GetClosestPoint(): Use binary search 2019-11-30 11:58:51 +01:00
Daniel Jour
54e8e37d2d Keyframe::Contains(): Use binary search instead of linear search 2019-11-30 11:32:52 +01:00
Daniel Jour
a67fb9555c Keyframe interpolation selection: Use switch instead of if
Using switch allows (some) compilers to emit a warning if a possible
enum value for the interpolation type has been forgotten.  This is not
the case now, but might guard against future errors (e.g. adding an
interpolation type)
2019-11-25 10:37:51 +01:00
Daniel Jour
b546b6a982 Keyframe: Dedicated Point comparision function instead of lambda's 2019-11-25 10:34:14 +01:00
Daniel Jour
6f71736c6a Keyframe: mark all non-modifying member functions const
Member functions that do not (need to) modify any members or internal
state of the Keyframe class should be declared as const.
2019-11-25 10:29:58 +01:00
Daniel Jour
edf85dda78 Keyframe: use = default to specify default constructor 2019-11-25 10:23:45 +01:00
Daniel Jour
3b2e262821 Keyframe: New implementation calculating values ondemand
- GetValue() calculates the value at the given position now ondemand,
  without caching values as previously.  First, it uses binary search
  to find the segment (start and end point) containing the given
  position.  Constant and linear interpolation are straightforward,
  bezier curves are calculating by binary search between the end
  points until a point on the curve is found with a X coordinate close
  enough to the given position. That points Y coordinate is returned.

- IsIncreasing(), GetRepeatFraction(), GetDelta() use GetValue()
  instead of accessing the (removed) Values vector.

- Removed now unused private functions, and the unused public
  Process().

First test results show good performance improvements for the
"rendering case" (setting up the keyframe points at once, then getting
all values) and drastic performance improvements for the "preview
case" (changing keyframe points, mixed with getting values).
2019-11-22 22:37:06 +01:00
Daniel Jour
6d81033bff Keyframe::GetPoint() returns a constant reference now
Returning a non constant reference is not possible; this allows
outside code to invalidate internal invariants (sorted order of
points) by modifying the returned point.  To make updates the current
best approach is to remove the point by index, and then add it again.
2019-11-22 00:36:52 +01:00
Daniel Jour
6bc3428307 Keyframe::AddPoint() fix: reallocation invalidates iterator
Points.push_back can (and will) cause reallocation, which invalidates
the candidate iterator.  Thus better use an (integer) index.
2019-11-21 11:35:23 +01:00
Daniel Jour
cb5574180e Keyframe::AddPoint() add at correct index, keeping Points ordered
AddPoint() now searches (binary search) for the best place to insert a
new point, thus always maintaining the order of Points.  Therefore,
ReorderPoints() is no longer needed.

CAVEAT: This breaks if some outside code changes (the public member)
Points!
2019-11-19 22:43:34 +01:00
Daniel Jour
d9322c100c Keyframe::ReorderPoints() use std::sort instead of selection sort
With few points the performance doesn't differ that much; using
std::sort removes the possibility of introducing bugs into the
handmade sorting algorithm, though.
2019-11-19 22:43:34 +01:00
Daniel Jour
5ba0ecfb2b Keyframe::GetInt() and Keyframe::GetLong() use GetValue
GetInt(), GetLong() are exactly the same as GetValue() except that
their result is rounded and converted to the repsective data type.
Thus avoid code duplication and use GetValue().
2019-11-19 22:43:34 +01:00
Daniel Jour
280504f007 Keyframe::IsIncreasing() remove loop to previous values and counter
The previous values do not influence the return value of the function
nor does looping over them have any side effect.

The next_repeats value is not used in any way, thus it doesn't need to
be calculated.
2019-11-19 22:43:34 +01:00
Daniel Jour
d47c40dc14 Keyframe::GetDelta() removed unused loop and variables 2019-11-19 22:43:34 +01:00
Daniel Jour
5f7766e49e Keyframe::RemovePoint() only set needs_update if a point was removed 2019-11-19 22:43:34 +01:00
Daniel Jour
6226e9d8e9 Keyframe::UpdatePoint() removed redundant code
needs_update = true is set both by RemovePoint() and AddPoint(),
ReorderPoints() is called by AddPoint().
2019-11-19 22:43:34 +01:00
Daniel Jour
2b18ad099b Keyframe::ScalePoints() skip first point without branch in loop 2019-11-19 22:43:34 +01:00
Daniel Jour
5ddc6a3b3a Keyframe::FlipPoints() without temporary vector
The Y coordinate of each point is adjusted inplace; reduces memory
overhead and iteration count for the loop.
2019-11-19 22:43:34 +01:00
Jonathan Thomas
272f004c0e Merge pull request #296 from OpenShot/std-prefixes
Remove all 'using namespace' directives from headers
2019-11-17 16:18:14 -06:00
SuslikV
87c06feda1 Clarify some comments 2019-11-02 20:04:58 +02:00
Frank Dana
8bde07682c Merge branch 'develop' into std-prefixes 2019-10-22 21:00:27 -04:00
FeRD (Frank Dana)
366ff2c5e6 src: Don't pass "" file_path args to exceptions 2019-08-27 15:47:39 -04:00
FeRD (Frank Dana)
3879b09047 FrameMapper/KeyFrame/Point: std:: prefixes 2019-08-04 22:54:06 -04:00