rename more method arguments for clarity (#1742)

* rename a couple method args

* KinematicRagdollControl: rename "reccount"

* rename 2 method args

* rename method args

Author: stephengold

jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java

@@ -580,8 +580,8 @@ public void glRenderbufferStorageMultisampleEXT(int target, int samples, int int
     }
 
     @Override
-    public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedsamplelocations) {
-        GLES31.glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedSampleLocations) {
+        GLES31.glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedSampleLocations);
     }
 
     @Override

jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java

@@ -673,10 +673,10 @@ protected void scanSpatial(Spatial model) {
      * @param model the spatial with the model's SkeletonControl (not null)
      * @param bone the bone to be linked (not null)
      * @param parent the body linked to the parent bone (not null)
-     * @param reccount depth of the recursion (≥1)
+     * @param recursionCount depth of the recursion (≥1)
      * @param pointsMap (not null)
      */
-    protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent, int reccount, Map<Integer, List<Float>> pointsMap) {
+    protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent, int recursionCount, Map<Integer, List<Float>> pointsMap) {
         PhysicsRigidBody parentShape = parent;
         if (boneList.contains(bone.getName())) {
 
@@ -693,10 +693,10 @@ protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent,
                 shape = RagdollUtils.makeShapeFromVerticeWeights(model, RagdollUtils.getBoneIndices(link.bone, skeleton, boneList), initScale, link.bone.getModelSpacePosition(), weightThreshold);
             }
 
-            PhysicsRigidBody shapeNode = new PhysicsRigidBody(shape, rootMass / reccount);
+            PhysicsRigidBody shapeNode = new PhysicsRigidBody(shape, rootMass / recursionCount);
 
             shapeNode.setKinematic(mode == Mode.Kinematic);
-            totalMass += rootMass / reccount;
+            totalMass += rootMass / recursionCount;
 
             link.rigidBody = shapeNode;
             link.initalWorldRotation = bone.getModelSpaceRotation().clone();
@@ -721,7 +721,7 @@ protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent,
 
         for (Iterator<Bone> it = bone.getChildren().iterator(); it.hasNext();) {
             Bone childBone = it.next();
-            boneRecursion(model, childBone, parentShape, reccount + 1, pointsMap);
+            boneRecursion(model, childBone, parentShape, recursionCount + 1, pointsMap);
         }
     }
 

jme3-core/src/main/java/com/jme3/audio/Environment.java

@@ -94,8 +94,8 @@ public Environment(Environment source) {
     }
 
     public Environment(float density, float diffusion, float gain, float gainHf,
-                       float decayTime, float decayHf, float reflGain,
-                       float reflDelay, float lateGain, float lateDelay) {
+                       float decayTime, float decayHf, float reflectGain,
+                       float reflectDelay, float lateGain, float lateDelay) {
         this.decayTime = decayTime;
         this.decayHFRatio = decayHf;
         this.density = density;
@@ -104,8 +104,8 @@ public Environment(float density, float diffusion, float gain, float gainHf,
         this.gainHf = gainHf;
         this.lateReverbDelay = lateDelay;
         this.lateReverbGain = lateGain;
-        this.reflectDelay = reflDelay;
-        this.reflectGain = reflGain;
+        this.reflectDelay = reflectDelay;
+        this.reflectGain = reflectGain;
     }
 
     public Environment(float[] e) {

jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java

@@ -935,22 +935,22 @@ public float distanceToEdge(Vector3f point) {
      *
      * @param denom
      *            the denominator of the line segment.
-     * @param numer
+     * @param numerator
      *            the numerator of the line segment.
      * @param t
      *            test values of the plane.
      * @return true if the line segment intersects the plane, false otherwise.
      */
-    private boolean clip(float denom, float numer, float[] t) {
+    private boolean clip(float denom, float numerator, float[] t) {
         // Return value is 'true' if line segment intersects the current test
         // plane. Otherwise, 'false' is returned, in which case the line segment
         // is entirely clipped.
         if (denom > 0.0f) {
             // This is the old if statement...
-            // if (numer > denom * t[1]) {
+            // if (numerator > denom * t[1]) {
             //
             // The problem is that what is actually stored is
-            // numer/denom.  In non-floating point, this math should
+            // numerator/denom.  In non-floating point, this math should
             // work out the same but in floating point there can
             // be subtle math errors.  The multiply will exaggerate
             // errors that may have been introduced when the value
@@ -974,7 +974,7 @@ private boolean clip(float denom, float numer, float[] t) {
             // angles and distances because they fail the bounding box test.
             // Many Bothans died bring you this fix.
             //    -pspeed
-            float newT = numer / denom;
+            float newT = numerator / denom;
             if (newT > t[1]) {
                 return false;
             }
@@ -984,12 +984,12 @@ private boolean clip(float denom, float numer, float[] t) {
             return true;
         } else if (denom < 0.0f) {
             // Old if statement... see above
-            // if (numer > denom * t[0]) {
+            // if (numerator > denom * t[0]) {
             //
             // Note though that denom is always negative in this block.
             // When we move it over to the other side we have to flip
             // the comparison.  Algebra for the win.
-            float newT = numer / denom;
+            float newT = numerator / denom;
             if (newT < t[0]) {
                 return false;
             }
@@ -998,7 +998,7 @@ private boolean clip(float denom, float numer, float[] t) {
             }
             return true;
         } else {
-            return numer <= 0.0;
+            return numerator <= 0.0;
         }
     }
 

jme3-core/src/main/java/com/jme3/environment/util/EnvMapUtils.java

@@ -390,9 +390,9 @@ public static int getSampleFromMip(int mipLevel, int miptot) {
 
     //see Lagarde's paper https://seblagarde.files.wordpress.com/2015/07/course_notes_moving_frostbite_to_pbr_v32.pdf
     //linear roughness
-    public static float getRoughnessFromMip(int miplevel, int miptot) {
+    public static float getRoughnessFromMip(int mipLevel, int miptot) {
         float step = 1f / ((float) miptot - 1);
-        step *= miplevel;
+        step *= mipLevel;
         return step * step;
     }
 

jme3-core/src/main/java/com/jme3/util/mikktspace/MikktspaceTangentGenerator.java

@@ -1164,7 +1164,7 @@ static boolean generateTSpaces(TSpace psTspace[], final TriInfo pTriInfos[], fin
     }
 
     static TSpace evalTspace(int face_indices[], final int iFaces, final int piTriListIn[], final TriInfo pTriInfos[],
-            final MikkTSpaceContext mikkTSpace, final int iVertexRepresentitive) {
+            final MikkTSpaceContext mikkTSpace, final int iVertexRepresentative) {
         TSpace res = new TSpace();
         float fAngleSum = 0;        
 
@@ -1175,11 +1175,11 @@ static TSpace evalTspace(int face_indices[], final int iFaces, final int piTriLi
             if ((pTriInfos[f].flag & GROUP_WITH_ANY) == 0) {
 
                 int i = -1;
-                if (piTriListIn[3 * f + 0] == iVertexRepresentitive) {
+                if (piTriListIn[3 * f + 0] == iVertexRepresentative) {
                     i = 0;
-                } else if (piTriListIn[3 * f + 1] == iVertexRepresentitive) {
+                } else if (piTriListIn[3 * f + 1] == iVertexRepresentative) {
                     i = 1;
-                } else if (piTriListIn[3 * f + 2] == iVertexRepresentitive) {
+                } else if (piTriListIn[3 * f + 2] == iVertexRepresentative) {
                     i = 2;
                 }
                 assert (i >= 0 && i < 3);

jme3-desktop/src/main/java/com/jme3/app/state/MjpegFileWriter.java

@@ -109,9 +109,9 @@ public void addImage(Image image, float quality) throws Exception {
         addImage(writeImageToBytes(image, quality));
     }
 
-    public void addImage(byte[] imagedata) throws Exception {
+    public void addImage(byte[] imageData) throws Exception {
         byte[] fcc = new byte[]{'0', '0', 'd', 'b'};
-        int useLength = imagedata.length;
+        int useLength = imageData.length;
         int extra = (useLength + (int) position) % 4;
         if (extra > 0) {
             useLength = useLength + extra;
@@ -122,15 +122,15 @@ public void addImage(byte[] imagedata) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(fcc.length + 4 + useLength);
         baos.write(fcc);
         baos.write(intBytes(swapInt(useLength)));
-        baos.write(imagedata);
+        baos.write(imageData);
         if (extra > 0) {
             for (int i = 0; i < extra; i++) {
                 baos.write(0);
             }
         }
         byte[] data = baos.toByteArray();
         aviOutput.write(data);
-        imagedata = null;
+        imageData = null;
 
         numFrames++; //add a frame
         position += data.length;