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=f5637814be075678825a14d2e09b4d17b7578eaa;hb=8bceefbdb7316557ee77902cc6ac216f5c1ff160;hpb=b1e8d7bd8c9d0905e9fe3c46fc84a11779b95982

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 f563781..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
@@ -1,5 +1,5 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-2018, 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.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