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=8864f740207f0ea1638dcf32d5cf5c2f20a371fb;hb=59baa428fb2d9e7f0fe5423f4cea47f2d6245914;hpb=6213716671ccab6b7256de41838e1f5401ce173c

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 8864f74..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,20 +1,20 @@
 /*
- * Sixth - System for data storage, computation, exploration and interaction.
- * Copyright ©2012-2016, 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
  * or later as published by the Free Software Foundation.
+ *
  */
 
 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