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

Implemented expected behaviour in KeyframeList#getPreviousKeyframe and KeyframeList#getNextKeyframe

Browse Source
This commit is contained in:
CrushedPixel
2015-07-20 02:03:53 +02:00
parent 6201a7d13c
commit 30f0a4d6a9
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeList.java
View File

@@ -71,16 +71,12 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
public Keyframe<K> getPreviousKeyframe(int realTime, boolean inclusive) { public Keyframe<K> getPreviousKeyframe(int realTime, boolean inclusive) {
if(this.isEmpty()) return null; if(this.isEmpty()) return null;
Keyframe<K> backup = null;
List<Keyframe<K>> found = new ArrayList<Keyframe<K>>(); List<Keyframe<K>> found = new ArrayList<Keyframe<K>>();
for(Keyframe<K> kf : this) { for(Keyframe<K> kf : this) {
if((inclusive && kf.getRealTimestamp() <= realTime) || (!inclusive && kf.getRealTimestamp() < realTime)) { if((inclusive && kf.getRealTimestamp() <= realTime) || (!inclusive && kf.getRealTimestamp() < realTime)) {
found.add(kf); found.add(kf);
} else if(kf.getRealTimestamp() == realTime) {
backup = kf;
} }
} }
@@ -88,7 +84,7 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
if(found.size() > 0) if(found.size() > 0)
return found.get(found.size() - 1); //last element is nearest return found.get(found.size() - 1); //last element is nearest
else return backup; return null;
} }
/** /**
@@ -100,19 +96,15 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
public Keyframe<K> getNextKeyframe(int realTime, boolean inclusive) { public Keyframe<K> getNextKeyframe(int realTime, boolean inclusive) {
if(this.isEmpty()) return null; if(this.isEmpty()) return null;
Keyframe<K> backup = null;
for(Keyframe<K> kf : this) { for(Keyframe<K> kf : this) {
if((inclusive && kf.getRealTimestamp() >= realTime) || (!inclusive && kf.getRealTimestamp() > realTime)) { if((inclusive && kf.getRealTimestamp() >= realTime) || (!inclusive && kf.getRealTimestamp() > realTime)) {
return kf; //first found element is next return kf; //first found element is next
} else if(kf.getRealTimestamp() == realTime) {
backup = kf;
} }
} }
return backup; return null;
} }
/** /**