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%2Fshapes%2Fcomposite%2Fbase%2FAbstractCompositeShape.java;h=747dd08174ddfae07968f892a93c41b1d56b669b;hp=184d57a7e77a68649e2a7c1d78758db93b8ed577;hb=a38bc412f8c6ae6c8fdf9466ae9b2073c2a73614;hpb=de8fb260a5e99922231b1d0f437916e796ec6ccb 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 184d57a..747dd08 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 @@ -9,7 +9,7 @@ import eu.svjatoslav.sixth.e3d.gui.RenderingContext; import eu.svjatoslav.sixth.e3d.gui.UserRelativityTracker; import eu.svjatoslav.sixth.e3d.gui.humaninput.MouseInteractionController; import eu.svjatoslav.sixth.e3d.math.Transform; -import eu.svjatoslav.sixth.e3d.math.TransformsPipeline; +import eu.svjatoslav.sixth.e3d.math.TransformsStack; import eu.svjatoslav.sixth.e3d.renderer.raster.Color; import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator; import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractShape; @@ -64,7 +64,7 @@ public class AbstractCompositeShape extends AbstractShape { * This method should be overridden by anyone wanting to customize shape * before it is rendered. */ - public void beforeTransformHook(final TransformsPipeline transformPipe, + public void beforeTransformHook(final TransformsStack transformPipe, final RenderingContext context) { } @@ -181,7 +181,7 @@ public class AbstractCompositeShape extends AbstractShape { final List result = new ArrayList<>(); final Slicer slicer = new Slicer(currentSliceFactor); - originalSubShapes.stream().filter(subShape -> subShape.isVisible()).forEach(subShape -> { + originalSubShapes.stream().filter(SubShape::isVisible).forEach(subShape -> { if (subShape.getShape() instanceof TexturedPolygon) slicer.slice((TexturedPolygon) subShape.getShape()); else @@ -194,7 +194,7 @@ public class AbstractCompositeShape extends AbstractShape { } @Override - public void transform(final TransformsPipeline transformPipe, + public void transform(final TransformsStack transformPipe, final RenderAggregator aggregator, final RenderingContext context) { // add current composite shape transform to the end of the transform