Improved code readability

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

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/base/AbstractCompositeShape.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/base/AbstractCompositeShape.java
index 55c81e8..52acbc2 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/base/AbstractCompositeShape.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/base/AbstractCompositeShape.java
@@ -22,11 +22,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * In order to get perspective correct textures, large textured polygons are
- * sliced into smaller ones.
- */
-
 public class AbstractCompositeShape extends AbstractShape {
     private final List<SubShape> originalSubShapes = new ArrayList<>();
     private final UserRelativityTracker relativityTracker;
@@ -87,19 +82,19 @@ public class AbstractCompositeShape extends AbstractShape {
         });
     }
 
-    private boolean isReslicingNeeded(double sliceFactor1, double sliceFactor2) {
+    private boolean isReslicingNeeded(double proposedNewSliceFactor, double currentSliceFactor) {
 
         if (slicingOutdated)
             return true;
 
-        if (sliceFactor1 > sliceFactor2) {
-            final double tmp = sliceFactor1;
-            sliceFactor1 = sliceFactor2;
-            sliceFactor2 = tmp;
+        // reslice if there is significant difference between proposed and current slice factor
+        if (proposedNewSliceFactor > currentSliceFactor) {
+            final double tmp = proposedNewSliceFactor;
+            proposedNewSliceFactor = currentSliceFactor;
+            currentSliceFactor = tmp;
         }
 
-        return (sliceFactor2 / sliceFactor1) > 1.5d;
-
+        return (currentSliceFactor / proposedNewSliceFactor) > 1.5d;
     }
 
     public void removeGroup(final String groupIdentifier) {
@@ -123,12 +118,11 @@ public class AbstractCompositeShape extends AbstractShape {
 
     private void resliceIfNeeded() {
 
-        final double proposedSliceFactor = relativityTracker
-                .proposeSliceFactor();
+        final double proposedSliceFactor = relativityTracker.proposeSliceFactor();
 
         if (isReslicingNeeded(proposedSliceFactor, currentSliceFactor)) {
             currentSliceFactor = proposedSliceFactor;
-            slice();
+            reslice();
         }
     }
 
@@ -175,7 +169,7 @@ public class AbstractCompositeShape extends AbstractShape {
         });
     }
 
-    private void slice() {
+    private void reslice() {
         slicingOutdated = false;
 
         final List<AbstractShape> result = new ArrayList<>();