Improved code readability

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / renderer / raster / shapes / composite / Galaxy.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/Galaxy.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/Galaxy.java
index 45d92eb..5aedf45 100755 (executable)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/Galaxy.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/Galaxy.java
@@ -14,44 +14,46 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import static java.lang.Math.*;
+
 public class Galaxy extends AbstractCompositeShape {
 
     private static List<Color> colors;
 
-    public Galaxy(final int size, final int tailCount, final int starsCount,
+    public Galaxy(final int galaxySize, final int tailCount, final int starsCount,
                   Transform transform) {
 
         super(transform);
 
         ensureColorsAreInitialized();
 
-        final double angle1 = Math.random() * 10;
-        final double angle2 = Math.random() * 10;
+        final double angle1 = random() * 10;
+        final double angle2 = random() * 10;
 
-        final double angleSin1 = Math.sin(angle1);
-        final double angleCos1 = Math.cos(angle1);
-        final double angleSin2 = Math.sin(angle2);
-        final double angleCos2 = Math.cos(angle2);
+        final double angleSin1 = sin(angle1);
+        final double angleCos1 = cos(angle1);
+        final double angleSin2 = sin(angle2);
+        final double angleCos2 = cos(angle2);
 
         Random random = new Random();
 
+        double starSize = galaxySize / 70d;
+
         for (int i = 1; i < starsCount; i++) {
-            final double b = Math.random() * 10;
+            final double b = random() * 10;
 
             final double s = (b * b) / 30;
 
-            final double v1 = (Math.random() * (11.5 - b)) / 3;
+            final double v1 = (random() * (11.5 - b)) / 3;
             final double v1p = v1 / 2;
 
-            final double ane = ((Math.random() * (s / 2)) / tailCount) * 2;
-            final double sba = ((2 * Math.PI) / tailCount)
+            final double ane = ((random() * (s / 2)) / tailCount) * 2;
+            final double sba = ((2 * PI) / tailCount)
                     * random.nextInt(tailCount);
 
-            final double x = (((Math.sin((b - sba) + ane) * s) + (Math.random() * v1)) - v1p)
-                    * size;
-            final double z = (((Math.cos((b - sba) + ane) * s) + (Math.random() * v1)) - v1p)
-                    * size;
-            final double y = ((Math.random() * v1) - v1p) * size;
+            final double x = (((sin((b - sba) + ane) * s) + (random() * v1)) - v1p) * galaxySize;
+            final double z = (((cos((b - sba) + ane) * s) + (random() * v1)) - v1p) * galaxySize;
+            final double y = ((random() * v1) - v1p) * galaxySize;
 
             final double x1 = (x * angleCos1) + (z * angleSin1);
             final double z1 = (z * angleCos1) - (x * angleSin1);
@@ -59,14 +61,12 @@ public class Galaxy extends AbstractCompositeShape {
             final double y1 = (y * angleCos2) + (z1 * angleSin2);
             final double z2 = (z1 * angleCos2) - (y * angleSin2);
 
-            addStar(new Point3D(x1, y1, z2));
+            addStar(new Point3D(x1, y1, z2), starSize);
         }
     }
 
-    private void addStar(final Point3D starLocation) {
-        addShape(
-                new GlowingPoint(starLocation, 10,
-                        colors.get((int) (Math.random() * colors.size()))));
+    private void addStar(final Point3D starLocation, double size) {
+        addShape(new GlowingPoint(starLocation, size, colors.get((int) (random() * colors.size()))));
     }
 
     private synchronized void ensureColorsAreInitialized() {
@@ -77,9 +77,9 @@ public class Galaxy extends AbstractCompositeShape {
         for (int i = 0; i < 30; i++)
             colors.add(
                     new Color(
-                            Math.random() + 0.5,
-                            Math.random() + 0.5,
-                            Math.random() + 0.5,
+                            random() + 0.5,
+                            random() + 0.5,
+                            random() + 0.5,
                             255));
     }