* Formatting and minor changes in Curve, Cylinder, PQTorus
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9303 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
0aa5efb028
commit
f6b5335976
@ -39,10 +39,11 @@ import java.util.Iterator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A <code>Curve</code> is a visual, line-based representation of a {@link Spline}.
|
* A
|
||||||
|
* <code>Curve</code> is a visual, line-based representation of a {@link Spline}.
|
||||||
* The underlying Spline will be sampled N times where N is the number of
|
* The underlying Spline will be sampled N times where N is the number of
|
||||||
* segments as specified in the constructor. Each segment will represent
|
* segments as specified in the constructor. Each segment will represent one
|
||||||
* one line in the generated mesh.
|
* line in the generated mesh.
|
||||||
*
|
*
|
||||||
* @author Nehon
|
* @author Nehon
|
||||||
*/
|
*/
|
||||||
@ -54,12 +55,11 @@ public class Curve extends Mesh {
|
|||||||
/**
|
/**
|
||||||
* Serialization only. Do not use.
|
* Serialization only. Do not use.
|
||||||
*/
|
*/
|
||||||
public Curve(){
|
public Curve() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a curve mesh.
|
* Create a curve mesh. Use a CatmullRom spline model that does not cycle.
|
||||||
* Use a CatmullRom spline model that does not cycle.
|
|
||||||
*
|
*
|
||||||
* @param controlPoints the control points to use to create this curve
|
* @param controlPoints the control points to use to create this curve
|
||||||
* @param nbSubSegments the number of subsegments between the control points
|
* @param nbSubSegments the number of subsegments between the control points
|
||||||
@ -122,7 +122,7 @@ public class Curve extends Mesh {
|
|||||||
}
|
}
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
int k = 0;
|
int k;
|
||||||
for (int j = 0; j < (spline.getControlPoints().size() - 1) * nbSubSegments; j++) {
|
for (int j = 0; j < (spline.getControlPoints().size() - 1) * nbSubSegments; j++) {
|
||||||
k = j;
|
k = j;
|
||||||
indices[i] = (short) k;
|
indices[i] = (short) k;
|
||||||
@ -142,11 +142,11 @@ public class Curve extends Mesh {
|
|||||||
/**
|
/**
|
||||||
* This method creates the Bezier path for this curve.
|
* This method creates the Bezier path for this curve.
|
||||||
*
|
*
|
||||||
* @param nbSubSegments
|
* @param nbSubSegments amount of subsegments between position control
|
||||||
* amount of subsegments between position control points
|
* points
|
||||||
*/
|
*/
|
||||||
private void createBezierMesh(int nbSubSegments) {
|
private void createBezierMesh(int nbSubSegments) {
|
||||||
if(nbSubSegments==0) {
|
if (nbSubSegments == 0) {
|
||||||
nbSubSegments = 1;
|
nbSubSegments = 1;
|
||||||
}
|
}
|
||||||
int centerPointsAmount = (spline.getControlPoints().size() + 2) / 3;
|
int centerPointsAmount = (spline.getControlPoints().size() + 2) / 3;
|
||||||
@ -175,7 +175,7 @@ public class Curve extends Mesh {
|
|||||||
array[lineIndex++] = vector3f.z;
|
array[lineIndex++] = vector3f.z;
|
||||||
|
|
||||||
//calculating indexes
|
//calculating indexes
|
||||||
int i = 0, k = 0;
|
int i = 0, k;
|
||||||
short[] indices = new short[(centerPointsAmount - 1) * nbSubSegments << 1];
|
short[] indices = new short[(centerPointsAmount - 1) * nbSubSegments << 1];
|
||||||
for (int j = 0; j < (centerPointsAmount - 1) * nbSubSegments; ++j) {
|
for (int j = 0; j < (centerPointsAmount - 1) * nbSubSegments; ++j) {
|
||||||
k = j;
|
k = j;
|
||||||
@ -193,19 +193,20 @@ public class Curve extends Mesh {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This method creates the Nurb path for this curve.
|
* This method creates the Nurb path for this curve.
|
||||||
* @param nbSubSegments
|
*
|
||||||
* amount of subsegments between position control points
|
* @param nbSubSegments amount of subsegments between position control
|
||||||
|
* points
|
||||||
*/
|
*/
|
||||||
private void createNurbMesh(int nbSubSegments) {
|
private void createNurbMesh(int nbSubSegments) {
|
||||||
float minKnot = spline.getMinNurbKnot();
|
float minKnot = spline.getMinNurbKnot();
|
||||||
float maxKnot = spline.getMaxNurbKnot();
|
float maxKnot = spline.getMaxNurbKnot();
|
||||||
float deltaU = (maxKnot - minKnot)/nbSubSegments;
|
float deltaU = (maxKnot - minKnot) / nbSubSegments;
|
||||||
|
|
||||||
float[] array = new float[(nbSubSegments + 1) * 3];
|
float[] array = new float[(nbSubSegments + 1) * 3];
|
||||||
|
|
||||||
float u = minKnot;
|
float u = minKnot;
|
||||||
Vector3f interpolationResult = new Vector3f();
|
Vector3f interpolationResult = new Vector3f();
|
||||||
for(int i=0;i<array.length;i+=3) {
|
for (int i = 0; i < array.length; i += 3) {
|
||||||
spline.interpolate(u, 0, interpolationResult);
|
spline.interpolate(u, 0, interpolationResult);
|
||||||
array[i] = interpolationResult.x;
|
array[i] = interpolationResult.x;
|
||||||
array[i + 1] = interpolationResult.y;
|
array[i + 1] = interpolationResult.y;
|
||||||
@ -233,7 +234,7 @@ public class Curve extends Mesh {
|
|||||||
short[] indices = new short[(spline.getControlPoints().size() - 1) * 2];
|
short[] indices = new short[(spline.getControlPoints().size() - 1) * 2];
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int cpt = 0;
|
int cpt = 0;
|
||||||
int k = 0;
|
int k;
|
||||||
int j = 0;
|
int j = 0;
|
||||||
for (Iterator<Vector3f> it = spline.getControlPoints().iterator(); it.hasNext();) {
|
for (Iterator<Vector3f> it = spline.getControlPoints().iterator(); it.hasNext();) {
|
||||||
Vector3f vector3f = it.next();
|
Vector3f vector3f = it.next();
|
||||||
@ -263,6 +264,7 @@ public class Curve extends Mesh {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This method returns the length of the curve.
|
* This method returns the length of the curve.
|
||||||
|
*
|
||||||
* @return the length of the curve
|
* @return the length of the curve
|
||||||
*/
|
*/
|
||||||
public float getLength() {
|
public float getLength() {
|
||||||
|
@ -392,6 +392,7 @@ public class Cylinder extends Mesh {
|
|||||||
updateBound();
|
updateBound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void read(JmeImporter e) throws IOException {
|
public void read(JmeImporter e) throws IOException {
|
||||||
super.read(e);
|
super.read(e);
|
||||||
InputCapsule capsule = e.getCapsule(this);
|
InputCapsule capsule = e.getCapsule(this);
|
||||||
@ -404,6 +405,7 @@ public class Cylinder extends Mesh {
|
|||||||
inverted = capsule.readBoolean("inverted", false);
|
inverted = capsule.readBoolean("inverted", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void write(JmeExporter e) throws IOException {
|
public void write(JmeExporter e) throws IOException {
|
||||||
super.write(e);
|
super.write(e);
|
||||||
OutputCapsule capsule = e.getCapsule(this);
|
OutputCapsule capsule = e.getCapsule(this);
|
||||||
|
@ -105,17 +105,6 @@ public class PQTorus extends Mesh {
|
|||||||
return width;
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void read(JmeImporter e) throws IOException {
|
|
||||||
super.read(e);
|
|
||||||
InputCapsule capsule = e.getCapsule(this);
|
|
||||||
p = capsule.readFloat("p", 0);
|
|
||||||
q = capsule.readFloat("q", 0);
|
|
||||||
radius = capsule.readFloat("radius", 0);
|
|
||||||
width = capsule.readFloat("width", 0);
|
|
||||||
steps = capsule.readInt("steps", 0);
|
|
||||||
radialSamples = capsule.readInt("radialSamples", 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rebuilds this torus based on a new set of parameters.
|
* Rebuilds this torus based on a new set of parameters.
|
||||||
*
|
*
|
||||||
@ -145,9 +134,9 @@ public class PQTorus extends Mesh {
|
|||||||
FloatBuffer fnb = createVector3Buffer(vertCount);
|
FloatBuffer fnb = createVector3Buffer(vertCount);
|
||||||
FloatBuffer ftb = createVector2Buffer(vertCount);
|
FloatBuffer ftb = createVector2Buffer(vertCount);
|
||||||
|
|
||||||
Vector3f pointB = new Vector3f(), T = new Vector3f(), N = new Vector3f(), B = new Vector3f();
|
Vector3f pointB, T, N, B;
|
||||||
Vector3f tempNorm = new Vector3f();
|
Vector3f tempNorm = new Vector3f();
|
||||||
float r, x, y, z, theta = 0.0f, beta = 0.0f;
|
float r, x, y, z, theta = 0.0f, beta;
|
||||||
int nvertex = 0;
|
int nvertex = 0;
|
||||||
|
|
||||||
// Move along the length of the pq torus
|
// Move along the length of the pq torus
|
||||||
@ -224,6 +213,18 @@ public class PQTorus extends Mesh {
|
|||||||
setBuffer(Type.Index, 3, sib);
|
setBuffer(Type.Index, 3, sib);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void read(JmeImporter e) throws IOException {
|
||||||
|
super.read(e);
|
||||||
|
InputCapsule capsule = e.getCapsule(this);
|
||||||
|
p = capsule.readFloat("p", 0);
|
||||||
|
q = capsule.readFloat("q", 0);
|
||||||
|
radius = capsule.readFloat("radius", 0);
|
||||||
|
width = capsule.readFloat("width", 0);
|
||||||
|
steps = capsule.readInt("steps", 0);
|
||||||
|
radialSamples = capsule.readInt("radialSamples", 0);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(JmeExporter e) throws IOException {
|
public void write(JmeExporter e) throws IOException {
|
||||||
super.write(e);
|
super.write(e);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user