DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Catmull-Rom spline interpolator to simplepathing

Browse Source
This commit is contained in:
johni0702
2017-01-28 11:03:59 +01:00
parent 5cbfd2884e
commit bdbffd5c33
6 changed files with 99 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/java/com/replaymod/simplepathing/SPTimelineTest.java
View File

@@ -5,6 +5,7 @@ import com.replaymod.pathing.properties.CameraProperties;
import com.replaymod.pathing.properties.SpectatorProperty;
import com.replaymod.pathing.properties.TimestampProperty;
import com.replaymod.replaystudio.pathing.change.Change;
import com.replaymod.replaystudio.pathing.interpolation.CatmullRomSplineInterpolator;
import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
import com.replaymod.replaystudio.pathing.path.Keyframe;
@@ -510,6 +511,37 @@ public class SPTimelineTest {
assertValidInterpolators(SPPath.POSITION, 4);
}
@Test(expected = IllegalArgumentException.class)
public void testSetDefaultInterpolatorDifferentType() {
addPosition(0, 0);
addPosition(1, 1);
impl.setDefaultInterpolator(new CatmullRomSplineInterpolator(42));
}
@Test
public void testSetDefaultInterpolatorSameType() {
impl.setDefaultInterpolatorType(InterpolatorType.CATMULL_ROM);
addPosition(0, 0);
addSpectator(1, 1);
addSpectator(2, 2);
addPosition(3, 3);
addPosition(4, 3);
impl.setDefaultInterpolator(new CatmullRomSplineInterpolator(42));
assertValidInterpolators(SPPath.POSITION, 3);
assertIsCatmullRom(0, 42);
assertIsCatmullRom(2, 42);
assertIsCatmullRom(3, 42);
}
private void assertIsCatmullRom(int index, double alpha) {
String str = prettyPrintInterpolators(impl, SPPath.POSITION);
Interpolator interpolator = Iterables.get(impl.getPositionPath().getSegments(), index).getInterpolator();
assertTrue("Expected segment " + index + " to be catmull rom interpolator: " + str,
interpolator instanceof CatmullRomSplineInterpolator);
assertTrue("Expected interpolator of segment segment " + index + " to have alpha " + alpha + ": " + str,
((CatmullRomSplineInterpolator) interpolator).getAlpha() == 42);
}
private void addPosition(int time, int expectedNumberOfInterpolators) {
impl.addPositionKeyframe(time, 1, 2, 3, 4, 5, 6, -1);
assertNotNull(impl.getKeyframe(SPPath.POSITION, time));