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

General warning cleanup

Browse Source
This commit is contained in:
johni0702
2015-07-19 16:18:34 +02:00
parent 4f718ab302
commit 6422558028
31 changed files with 88 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/crushedpixel/replaymod/interpolation/BasicSpline.java
View File

@@ -1,12 +1,11 @@
package eu.crushedpixel.replaymod.interpolation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.List;
public abstract class BasicSpline {
public void calcNaturalCubic(List valueCollection, Field val, Collection<Cubic> cubicCollection) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
public void calcNaturalCubic(List valueCollection, Field val, Collection<Cubic> cubicCollection) throws IllegalArgumentException, IllegalAccessException {
int num = valueCollection.size() - 1;
double[] gamma = new double[num + 1];

25
src/main/java/eu/crushedpixel/replaymod/interpolation/GenericSplineInterpolation.java
View File

@@ -3,6 +3,8 @@ package eu.crushedpixel.replaymod.interpolation;
import eu.crushedpixel.replaymod.utils.ReflectionUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Vector;
@@ -11,7 +13,7 @@ public class GenericSplineInterpolation<T extends KeyframeValue> extends BasicSp
private Field[] fields;
private Vector<T> points;
private Vector<Cubic>[] cubics = new Vector[0];
private List<Vector<Cubic>> cubics = Collections.emptyList();
public GenericSplineInterpolation() {
this.points = new Vector<T>();
@@ -24,10 +26,6 @@ public class GenericSplineInterpolation<T extends KeyframeValue> extends BasicSp
this.fields = fields.toArray(new Field[fields.size()]);
}
public Vector<T> getPoints() {
return points;
}
@Override
public void prepare() {
if(fields.length <= 0) {
@@ -35,12 +33,13 @@ public class GenericSplineInterpolation<T extends KeyframeValue> extends BasicSp
" has to contain at least one Field");
}
if(!points.isEmpty()) {
cubics = new Vector[fields.length];
for(int i=0; i<fields.length; i++) {
cubics[i] = new Vector<Cubic>();
cubics = new ArrayList<Vector<Cubic>>(fields.length);
for (Field field : fields) {
Vector<Cubic> vec = new Vector<Cubic>();
cubics.add(vec);
try {
calcNaturalCubic(points, fields[i], cubics[i]);
} catch(Exception e) {
calcNaturalCubic(points, field, vec);
} catch (Exception e) {
e.printStackTrace();
}
}
@@ -51,15 +50,15 @@ public class GenericSplineInterpolation<T extends KeyframeValue> extends BasicSp
}
public void applyPoint(float position, T toEdit) {
Vector<Cubic> first = cubics[0];
Vector<Cubic> first = cubics.get(0);
position = position * first.size();
int cubicNum = (int) Math.min(cubics[0].size() - 1, position);
int cubicNum = (int) Math.min(first.size() - 1, position);
float cubicPos = (position - cubicNum);
int i = 0;
for(Field f : fields) {
try {
f.set(toEdit, cubics[i].get(cubicNum).eval(cubicPos));
f.set(toEdit, cubics.get(i).get(cubicNum).eval(cubicPos));
} catch(Exception e) {
e.printStackTrace();
}

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

@@ -157,7 +157,8 @@ public class KeyframeList<K extends KeyframeValue> extends ArrayList<Keyframe<K>
if(first() == null) return null;
if(size() == 1) return first().getValue();
K toApply = (K)first().getValue().newInstance();
@SuppressWarnings("unchecked")
K toApply = (K) first().getValue().newInstance();
if(previousCallLinear != (Boolean)linear) {
interpolation = linear ? new GenericLinearInterpolation<K>() : new GenericSplineInterpolation<K>();

2
src/main/java/eu/crushedpixel/replaymod/interpolation/KeyframeValue.java
View File

@@ -9,6 +9,6 @@ package eu.crushedpixel.replaymod.interpolation;
*/
public interface KeyframeValue {
public KeyframeValue newInstance();
KeyframeValue newInstance();
}