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=521051514479ba47b86bbedd805061cd3601f920;hp=cbab6f4278c948052dd7043149f0327582b4d491;hb=8bceefbdb7316557ee77902cc6ac216f5c1ff160;hpb=dcdff57f0bab42387b2e4e215778d9e8efc60221 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 cbab6f4..5210515 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 @@ -10,11 +10,11 @@ package eu.svjatoslav.sixth.e3d.renderer.raster; import eu.svjatoslav.sixth.e3d.geometry.Point3D; -import eu.svjatoslav.sixth.e3d.geometry.Transform; -import eu.svjatoslav.sixth.e3d.geometry.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++; @@ -47,8 +47,8 @@ public class ShapeCollection { aggregator.reset(); transformPipe.clear(); - // translate scene according to avatar current location - final Avatar avatar = viewContext.getAvatar(); + // translate scene according to camera current location + final Avatar avatar = viewPanel.getAvatar(); // rotate scene according to avatar looking direction transformPipe.addTransform(new Transform(new Point3D(), avatar