X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2Fshapes%2Fcomposite%2Fbase%2FAbstractCompositeShape.java;h=52acbc2919df878cee23402fd8db006810ba8673;hb=9f20345e99404017a98d3ae95b7588cabb31a9bf;hp=55c81e8bba4a396dd150d1c03ad81545bc2aa5f2;hpb=77e87370474822855924c2650fcccf61cb41a05f;p=sixth-3d.git 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 --- 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 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 result = new ArrayList<>();