projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore IntelliJ project files
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
renderer
/
raster
/
RenderAggregator.java
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
7f05bf2
..
3384351
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/RenderAggregator.java
@@
-1,5
+1,5
@@
/*
/*
- * Sixth 3D engine. Copyright ©2012-201
7
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-201
8
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
@@
-14,21
+14,16
@@
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape;
import java.io.Serializable;
import java.util.ArrayList;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
public class RenderAggregator {
import java.util.Comparator;
public class RenderAggregator {
- ArrayList<AbstractCoordinateShape> shapes = new ArrayList<>();
-
ShapesComparator comparator = new Shapes
Comparator();
+
private
ArrayList<AbstractCoordinateShape> shapes = new ArrayList<>();
+
private ShapesZIndexComparator comparator = new ShapesZIndex
Comparator();
public void paint(final RenderingContext renderBuffer) {
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) {
}
public void queueShapeForRendering(final AbstractCoordinateShape shape) {
@@
-39,7
+34,7
@@
public class RenderAggregator {
shapes.clear();
}
shapes.clear();
}
- static class ShapesComparator implements Comparator<AbstractCoordinateShape>, Serializable {
+ static class Shapes
ZIndex
Comparator implements Comparator<AbstractCoordinateShape>, Serializable {
@Override
public int compare(final AbstractCoordinateShape o1, final AbstractCoordinateShape o2) {
@Override
public int compare(final AbstractCoordinateShape o1, final AbstractCoordinateShape o2) {