X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2FRenderAggregator.java;h=33843510569e9c1fbdab5b05116d58f28c96b3f0;hp=049938cac87dd64f1ed97f81db83f31c0f3227cb;hb=2e7e46514dd35006e9dde07b1959540078292691;hpb=58faaac88fe1a65fe42a68979d4e4d8f3765d878 diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java index 049938c..3384351 100644 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java @@ -14,21 +14,16 @@ import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; public class RenderAggregator { - ArrayList shapes = new ArrayList<>(); - ShapesComparator comparator = new ShapesComparator(); + private ArrayList shapes = new ArrayList<>(); + private ShapesZIndexComparator comparator = new ShapesZIndexComparator(); public void paint(final RenderingContext renderBuffer) { - - Collections.sort(shapes, comparator); - - for (final AbstractCoordinateShape shape : shapes) - shape.paint(renderBuffer); - + shapes.sort(comparator); + shapes.forEach(shape -> shape.paint(renderBuffer)); } public void queueShapeForRendering(final AbstractCoordinateShape shape) { @@ -39,7 +34,7 @@ public class RenderAggregator { shapes.clear(); } - static class ShapesComparator implements Comparator, Serializable { + static class ShapesZIndexComparator implements Comparator, Serializable { @Override public int compare(final AbstractCoordinateShape o1, final AbstractCoordinateShape o2) {