Browse Source

Improved code readability: ParticlePointMesh and ParticleTriMesh (#1831)

Wyatt Gillette 3 years ago
parent
commit
43e9302a5b

+ 2 - 0
jme3-core/src/main/java/com/jme3/effect/ParticlePointMesh.java

@@ -133,6 +133,7 @@ public class ParticlePointMesh extends ParticleMesh {
         colors.rewind();
         colors.rewind();
         sizes.rewind();
         sizes.rewind();
         texcoords.rewind();
         texcoords.rewind();
+        
         for (int i = 0; i < particles.length; i++) {
         for (int i = 0; i < particles.length; i++) {
             Particle p = particles[i];
             Particle p = particles[i];
 
 
@@ -153,6 +154,7 @@ public class ParticlePointMesh extends ParticleMesh {
 
 
             texcoords.put(startX).put(startY).put(endX).put(endY);
             texcoords.put(startX).put(startY).put(endX).put(endY);
         }
         }
+        
         positions.flip();
         positions.flip();
         colors.flip();
         colors.flip();
         sizes.flip();
         sizes.flip();

+ 9 - 6
jme3-core/src/main/java/com/jme3/effect/ParticleTriMesh.java

@@ -172,8 +172,8 @@ public class ParticleTriMesh extends ParticleMesh {
 
 
         boolean facingVelocity = emitter.isFacingVelocity();
         boolean facingVelocity = emitter.isFacingVelocity();
 
 
-        Vector3f up = new Vector3f(),
-                 left = new Vector3f();
+        Vector3f up = new Vector3f();
+        Vector3f left = new Vector3f();
 
 
         if (!facingVelocity) {
         if (!facingVelocity) {
             up.set(camUp);
             up.set(camUp);
@@ -189,6 +189,7 @@ public class ParticleTriMesh extends ParticleMesh {
         for (int i = 0; i < particles.length; i++) {
         for (int i = 0; i < particles.length; i++) {
             Particle p = particles[i];
             Particle p = particles[i];
             boolean dead = p.life == 0;
             boolean dead = p.life == 0;
+            
             if (dead) {
             if (dead) {
                 positions.put(0).put(0).put(0);
                 positions.put(0).put(0).put(0);
                 positions.put(0).put(0).put(0);
                 positions.put(0).put(0).put(0);
@@ -202,11 +203,13 @@ public class ParticleTriMesh extends ParticleMesh {
                 camDir.cross(left, up);
                 camDir.cross(left, up);
                 up.multLocal(p.size);
                 up.multLocal(p.size);
                 left.multLocal(p.size);
                 left.multLocal(p.size);
+                
             } else if (faceNormal != null) {
             } else if (faceNormal != null) {
                 up.set(faceNormal).crossLocal(Vector3f.UNIT_X);
                 up.set(faceNormal).crossLocal(Vector3f.UNIT_X);
                 faceNormal.cross(up, left);
                 faceNormal.cross(up, left);
                 up.multLocal(p.size);
                 up.multLocal(p.size);
                 left.multLocal(p.size);
                 left.multLocal(p.size);
+                
                 if (p.angle != 0) {
                 if (p.angle != 0) {
                     TempVars vars = TempVars.get();
                     TempVars vars = TempVars.get();
                     vars.vect1.set(faceNormal).normalizeLocal();
                     vars.vect1.set(faceNormal).normalizeLocal();
@@ -226,6 +229,7 @@ public class ParticleTriMesh extends ParticleMesh {
                 up.x = camLeft.x * -sin + camUp.x * cos;
                 up.x = camLeft.x * -sin + camUp.x * cos;
                 up.y = camLeft.y * -sin + camUp.y * cos;
                 up.y = camLeft.y * -sin + camUp.y * cos;
                 up.z = camLeft.z * -sin + camUp.z * cos;
                 up.z = camLeft.z * -sin + camUp.z * cos;
+                
             } else {
             } else {
                 up.set(camUp);
                 up.set(camUp);
                 left.set(camLeft);
                 left.set(camLeft);
@@ -273,10 +277,9 @@ public class ParticleTriMesh extends ParticleMesh {
 
 
         positions.clear();
         positions.clear();
         colors.clear();
         colors.clear();
-        if (!uniqueTexCoords)
-            texcoords.clear();
-        else {
-            texcoords.clear();
+        texcoords.clear();
+        
+        if (uniqueTexCoords) {
             tvb.updateData(texcoords);
             tvb.updateData(texcoords);
         }
         }