* Formatting and minor changes in Curve, Cylinder, PQTorus

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9303 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/core/com/jme3/scene/shape/Curve.java

@@ -39,10 +39,11 @@ import java.util.Iterator;
 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
- * 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
  */
@@ -58,8 +59,7 @@ public class Curve extends Mesh {
     }
 
     /**
-     * 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 nbSubSegments the number of subsegments between the control points
@@ -122,7 +122,7 @@ public class Curve extends Mesh {
         }
 
         i = 0;
-        int k = 0;
+        int k;
         for (int j = 0; j < (spline.getControlPoints().size() - 1) * nbSubSegments; j++) {
             k = j;
             indices[i] = (short) k;
@@ -142,8 +142,8 @@ public class Curve extends Mesh {
     /**
      * 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) {
         if (nbSubSegments == 0) {
@@ -175,7 +175,7 @@ public class Curve extends Mesh {
         array[lineIndex++] = vector3f.z;
 
         //calculating indexes
-		int i = 0, k = 0;
+        int i = 0, k;
         short[] indices = new short[(centerPointsAmount - 1) * nbSubSegments << 1];
         for (int j = 0; j < (centerPointsAmount - 1) * nbSubSegments; ++j) {
             k = j;
@@ -193,8 +193,9 @@ public class Curve extends Mesh {
 
     /**
      * 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) {
         float minKnot = spline.getMinNurbKnot();
@@ -233,7 +234,7 @@ public class Curve extends Mesh {
         short[] indices = new short[(spline.getControlPoints().size() - 1) * 2];
         int i = 0;
         int cpt = 0;
-        int k = 0;
+        int k;
         int j = 0;
         for (Iterator<Vector3f> it = spline.getControlPoints().iterator(); it.hasNext();) {
             Vector3f vector3f = it.next();
@@ -263,6 +264,7 @@ public class Curve extends Mesh {
 
     /**
      * This method returns the length of the curve.
+     *
      * @return the length of the curve
      */
     public float getLength() {

engine/src/core/com/jme3/scene/shape/Cylinder.java

@@ -392,6 +392,7 @@ public class Cylinder extends Mesh {
         updateBound();
     }
 
+    @Override
     public void read(JmeImporter e) throws IOException {
         super.read(e);
         InputCapsule capsule = e.getCapsule(this);
@@ -404,6 +405,7 @@ public class Cylinder extends Mesh {
         inverted = capsule.readBoolean("inverted", false);
     }
 
+    @Override
     public void write(JmeExporter e) throws IOException {
         super.write(e);
         OutputCapsule capsule = e.getCapsule(this);

engine/src/core/com/jme3/scene/shape/PQTorus.java

@@ -105,17 +105,6 @@ public class PQTorus extends Mesh {
         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.
      * 
@@ -145,9 +134,9 @@ public class PQTorus extends Mesh {
         FloatBuffer fnb = createVector3Buffer(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();
-        float r, x, y, z, theta = 0.0f, beta = 0.0f;
+        float r, x, y, z, theta = 0.0f, beta;
         int nvertex = 0;
 
         // Move along the length of the pq torus
@@ -224,6 +213,18 @@ public class PQTorus extends Mesh {
         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
     public void write(JmeExporter e) throws IOException {
         super.write(e);