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%2FShapeCollection.java;h=9bbc193271e3f5c2b62ad2b1a25482876b461b6c;hp=2faf8801708cf5837f4a885b953015c6c7b0f60d;hb=59baa428fb2d9e7f0fe5423f4cea47f2d6245914;hpb=baab2e2c2ad89695293f3136311c585c9a5afed1 diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java index 2faf880..9bbc193 100755 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java @@ -1,5 +1,5 @@ /* - * Sixth 3D engine. Copyright ©2012-2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Sixth 3D engine. Copyright ©2012-2019, 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 @@ -10,11 +10,11 @@ package eu.svjatoslav.sixth.e3d.renderer.raster; import eu.svjatoslav.sixth.e3d.geometry.Point3D; -import eu.svjatoslav.sixth.e3d.math.Transform; -import eu.svjatoslav.sixth.e3d.math.TransformPipe; import eu.svjatoslav.sixth.e3d.gui.Avatar; import eu.svjatoslav.sixth.e3d.gui.RenderingContext; -import eu.svjatoslav.sixth.e3d.gui.ViewContext; +import eu.svjatoslav.sixth.e3d.gui.ViewPanel; +import eu.svjatoslav.sixth.e3d.math.Transform; +import eu.svjatoslav.sixth.e3d.math.TransformPipe; import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractShape; import java.util.ArrayList; @@ -39,7 +39,7 @@ public class ShapeCollection { shapes.clear(); } - public synchronized void paint(final ViewContext viewContext, + public synchronized void paint(final ViewPanel viewPanel, final RenderingContext renderingContext) { renderingContext.frameNumber++; @@ -48,7 +48,7 @@ public class ShapeCollection { transformPipe.clear(); // translate scene according to camera current location - final Avatar avatar = viewContext.getAvatar(); + final Avatar avatar = viewPanel.getAvatar(); // rotate scene according to avatar looking direction transformPipe.addTransform(new Transform(new Point3D(), avatar