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

Created @Interpolate annotation for Interpolators to know which fields to interpolate (instead of all public fields)

Browse Source
This commit is contained in:
CrushedPixel
2015-07-08 11:43:58 +02:00
parent 64628eaac3
commit 8a973fa3e9
7 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/crushedpixel/replaymod/holders/Point.java
View File

@@ -1,5 +1,6 @@
package eu.crushedpixel.replaymod.holders; package eu.crushedpixel.replaymod.holders;
import eu.crushedpixel.replaymod.interpolation.Interpolate;
import eu.crushedpixel.replaymod.interpolation.KeyframeValue; import eu.crushedpixel.replaymod.interpolation.KeyframeValue;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class Point extends KeyframeValue { public class Point extends KeyframeValue {
@Interpolate
public double x, y; public double x, y;
} }

3
src/main/java/eu/crushedpixel/replaymod/holders/Position.java
View File

@@ -1,5 +1,6 @@
package eu.crushedpixel.replaymod.holders; package eu.crushedpixel.replaymod.holders;
import eu.crushedpixel.replaymod.interpolation.Interpolate;
import eu.crushedpixel.replaymod.interpolation.KeyframeValue; import eu.crushedpixel.replaymod.interpolation.KeyframeValue;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@@ -14,7 +15,9 @@ import net.minecraft.entity.Entity;
@EqualsAndHashCode(callSuper=true) @EqualsAndHashCode(callSuper=true)
public class Position extends KeyframeValue { public class Position extends KeyframeValue {
@Interpolate
public double x, y, z; public double x, y, z;
@Interpolate
public double pitch, yaw, roll; public double pitch, yaw, roll;
private Integer spectatedEntityID; private Integer spectatedEntityID;

2
src/main/java/eu/crushedpixel/replaymod/holders/TimestampValue.java
View File

@@ -1,5 +1,6 @@
package eu.crushedpixel.replaymod.holders; package eu.crushedpixel.replaymod.holders;
import eu.crushedpixel.replaymod.interpolation.Interpolate;
import eu.crushedpixel.replaymod.interpolation.KeyframeValue; import eu.crushedpixel.replaymod.interpolation.KeyframeValue;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class TimestampValue extends KeyframeValue { public class TimestampValue extends KeyframeValue {
@Interpolate
public double value; public double value;
} }

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

@@ -1,7 +1,6 @@
package eu.crushedpixel.replaymod.interpolation; package eu.crushedpixel.replaymod.interpolation;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -23,7 +22,7 @@ public class GenericLinearInterpolation<T extends KeyframeValue> implements Inte
List<Field> fields = new ArrayList<Field>(); List<Field> fields = new ArrayList<Field>();
for(Field f : point.getClass().getDeclaredFields()) { for(Field f : point.getClass().getDeclaredFields()) {
if(Modifier.isPublic(f.getModifiers())) { if(f.isAnnotationPresent(Interpolate.class)) {
fields.add(f); fields.add(f);
} }
} }

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

@@ -1,7 +1,6 @@
package eu.crushedpixel.replaymod.interpolation; package eu.crushedpixel.replaymod.interpolation;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
@@ -22,7 +21,7 @@ public class GenericSplineInterpolation<T extends KeyframeValue> extends BasicSp
List<Field> fields = new ArrayList<Field>(); List<Field> fields = new ArrayList<Field>();
for(Field f : point.getClass().getDeclaredFields()) { for(Field f : point.getClass().getDeclaredFields()) {
if(Modifier.isPublic(f.getModifiers())) { if(f.isAnnotationPresent(Interpolate.class)) {
fields.add(f); fields.add(f);
} }
} }

13
src/main/java/eu/crushedpixel/replaymod/interpolation/Interpolate.java Normal file
View File

@@ -0,0 +1,13 @@
package eu.crushedpixel.replaymod.interpolation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface Interpolate {
}

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

@@ -2,7 +2,7 @@ package eu.crushedpixel.replaymod.interpolation;
/** /**
* An abstract class that GenericSplineInterpolation can process. * An abstract class that GenericSplineInterpolation can process.
* Subclasses simply have to declare at least one <b>public</b> double field, * Subclasses simply have to annotate at least one field with @Interpolate,
* and the GenericSplineInterpolation will interpolate these. * and the GenericSplineInterpolation will interpolate these.
* <br><br> * <br><br>
* It is recommended for KeyframeValue subclasses to have a @NoArgsConstructor annotation. * It is recommended for KeyframeValue subclasses to have a @NoArgsConstructor annotation.