sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a NPE when Serializing a Spline without points. Also fixed a Typo.

Browse Source
This commit is contained in:
MeFisto94 2016-03-20 12:45:19 +01:00
parent 8b1ddbe60f
commit 23fe0658a6
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jme3-core/src/main/java/com/jme3/math/Spline.java
View File

@ -90,7 +90,7 @@ public class Spline implements Savable {
type = splineType;
this.curveTension = curveTension;
this.cycle = cycle;
this.computeTotalLentgh();
this.computeTotalLength();
}
/**
@ -116,7 +116,7 @@ public class Spline implements Savable {
this.controlPoints.addAll(controlPoints);
this.curveTension = curveTension;
this.cycle = cycle;
this.computeTotalLentgh();
this.computeTotalLength();
}
/**
@ -144,7 +144,7 @@ public class Spline implements Savable {
this.weights[i] = controlPoint.w;
}
CurveAndSurfaceMath.prepareNurbsKnots(knots, basisFunctionDegree);
this.computeTotalLentgh();
this.computeTotalLength();
}
private void initCatmullRomWayPoints(List<Vector3f> list) {
@ -186,7 +186,7 @@ public class Spline implements Savable {
controlPoints.add(controlPoints.get(0).clone());
}
if (controlPoints.size() > 1) {
this.computeTotalLentgh();
this.computeTotalLength();
}
}
@ -197,7 +197,7 @@ public class Spline implements Savable {
public void removeControlPoint(Vector3f controlPoint) {
controlPoints.remove(controlPoint);
if (controlPoints.size() > 1) {
this.computeTotalLentgh();
this.computeTotalLength();
}
}
@ -209,7 +209,7 @@ public class Spline implements Savable {
/**
* This method computes the total length of the curve.
*/
private void computeTotalLentgh() {
private void computeTotalLength() {
totalLength = 0;
float l = 0;
if (segmentsLength == null) {
@ -317,7 +317,7 @@ public class Spline implements Savable {
public void setCurveTension(float curveTension) {
this.curveTension = curveTension;
if(type==SplineType.CatmullRom && !getControlPoints().isEmpty()) {
this.computeTotalLentgh();
this.computeTotalLength();
}
}
@ -342,7 +342,7 @@ public class Spline implements Savable {
controlPoints.add(controlPoints.get(0));
}
this.cycle = cycle;
this.computeTotalLentgh();
this.computeTotalLength();
} else {
this.cycle = cycle;
}
@ -369,7 +369,7 @@ public class Spline implements Savable {
*/
public void setType(SplineType type) {
this.type = type;
this.computeTotalLentgh();
this.computeTotalLength();
}
/**
@ -435,9 +435,13 @@ public class Spline implements Savable {
OutputCapsule oc = ex.getCapsule(this);
oc.writeSavableArrayList((ArrayList) controlPoints, "controlPoints", null);
oc.write(type, "type", SplineType.CatmullRom);
float list[] = new float[segmentsLength.size()];
for (int i = 0; i < segmentsLength.size(); i++) {
list[i] = segmentsLength.get(i);
float list[] = null;
if (segmentsLength != null) {
list = new float[segmentsLength.size()];
for (int i = 0; i < segmentsLength.size(); i++) {
list[i] = segmentsLength.get(i);
}
}
oc.write(list, "segmentsLength", null);