Mirrors/WarsmashModEngine
1
0
Fork 0
mirror of https://github.com/Retera/WarsmashModEngine.git synced 2022-07-31 17:38:59 +02:00
Code Issues Projects Releases Wiki Activity

Improve some edge cases when sequences are missing start and end keyframes

Browse Source
This commit is contained in:
Retera 2020-11-07 14:55:09 -05:00
parent b5bb731b29
commit b74b2f6c91
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
core/src/com/etheller/warsmash/viewer5/handlers/mdx/SdSequence.java
View File

@ -6,9 +6,9 @@ import java.util.Arrays;
import com.etheller.warsmash.parsers.mdlx.AnimationMap; import com.etheller.warsmash.parsers.mdlx.AnimationMap;
import com.etheller.warsmash.parsers.mdlx.timeline.Timeline; import com.etheller.warsmash.parsers.mdlx.timeline.Timeline;
import com.etheller.warsmash.util.ParseUtils; import com.etheller.warsmash.util.ParseUtils;
import com.etheller.warsmash.util.RenderMathUtils;
public final class SdSequence<TYPE> { public final class SdSequence<TYPE> {
private static boolean INJECT_FRAMES_GHOSTWOLF_STYLE = false;
private final Sd<TYPE> sd; private final Sd<TYPE> sd;
public final long start; // UInt32 public final long start; // UInt32
@ -99,7 +99,7 @@ public final class SdSequence<TYPE> {
} }
this.constant = allFramesMatch; this.constant = allFramesMatch;
if (!this.constant) { if (!this.constant && INJECT_FRAMES_GHOSTWOLF_STYLE) {
// If there is no opening keyframe for this sequence, inject one // If there is no opening keyframe for this sequence, inject one
// with the default value. // with the default value.
final boolean hasStart = framesBuilder.get(0) == start; final boolean hasStart = framesBuilder.get(0) == start;
@ -152,7 +152,7 @@ public final class SdSequence<TYPE> {
} }
private TYPE[] fixTimelineArray(final Timeline<TYPE> timeline, final TYPE[] values) { private TYPE[] fixTimelineArray(final Timeline<TYPE> timeline, final TYPE[] values) {
if(values == null) { if (values == null) {
return null; return null;
} }
if (timeline.getName().equals(AnimationMap.KLAC.getWar3id()) if (timeline.getName().equals(AnimationMap.KLAC.getWar3id())
@ -166,10 +166,6 @@ public final class SdSequence<TYPE> {
return values; return values;
} }
// private TYPE[] makeArray(final int size) {
// return (TYPE[]) new Object[size];
// }
public int getValue(final TYPE out, final long frame) { public int getValue(final TYPE out, final long frame) {
final int l = this.frames.length; final int l = this.frames.length;
@ -178,26 +174,35 @@ public final class SdSequence<TYPE> {
return -1; return -1;
} }
else if (frame >= this.end) {
this.sd.copy(out, this.values[l - 1]);
return l - 1;
}
else { else {
for (int i = 1; i < l; i++) { int startFrame = -1;
if (this.frames[i] > frame) { int endFrame = -1;
final long start = this.frames[i - 1]; final int l1 = l - 1;
final long end = this.frames[i]; if ((frame < this.frames[0]) || (frame >= this.frames[l1])) {
final float t = RenderMathUtils startFrame = l1;
.clamp(((end - start) == 0 ? 0 : ((frame - start) / (float) (end - start))), 0, 1); endFrame = 0;
}
this.sd.interpolate(out, this.values, this.inTans, this.outTans, i - 1, i, t); else {
for (int i = 1; i < l; i++) {
return i; if (this.frames[i] > frame) {
startFrame = i - 1;
endFrame = i;
break;
}
} }
} }
long start = this.frames[startFrame];
return -1; final long end = this.frames[endFrame];
long timeBetweenFrames = end - start;
if (timeBetweenFrames < 0) {
timeBetweenFrames += (this.end - this.start);
if (frame < start) {
start = end;
}
}
final float t = ((timeBetweenFrames) == 0 ? 0 : ((frame - start) / (float) (timeBetweenFrames)));
this.sd.interpolate(out, this.values, this.inTans, this.outTans, startFrame, endFrame, t);
return startFrame;
} }
} }