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%2FAbstractCoordinateShape.java;h=f67fb498da25b055ff82048d001adc23ba33b9d1;hp=5e915735dc659a4b7a6b34b8df4b83ca619d8c48;hb=0da1a9ccb564ca3b7c230bcdfd67a14b9c56a5cf;hpb=b1e8d7bd8c9d0905e9fe3c46fc84a11779b95982

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/AbstractCoordinateShape.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/AbstractCoordinateShape.java
index 5e91573..f67fb49 100644
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/AbstractCoordinateShape.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/AbstractCoordinateShape.java
@@ -1,5 +1,5 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2017, 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
@@ -9,20 +9,20 @@
 
 package eu.svjatoslav.sixth.e3d.renderer.raster.shapes;
 
-import eu.svjatoslav.sixth.e3d.geometry.GeometryCoordinate;
 import eu.svjatoslav.sixth.e3d.geometry.Point3D;
-import eu.svjatoslav.sixth.e3d.geometry.TransformPipe;
 import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
+import eu.svjatoslav.sixth.e3d.math.GeometryCoordinate;
+import eu.svjatoslav.sixth.e3d.math.TransformPipe;
 import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class AbstractCoordinateShape extends AbstractShape {
 
-    public static final AtomicInteger lastShapeId = new AtomicInteger();
+    private static final AtomicInteger lastShapeId = new AtomicInteger();
     public final int shapeId;
+    public final GeometryCoordinate[] coordinates;
     public double onScreenZ;
-    public GeometryCoordinate[] coordinates;
 
     public AbstractCoordinateShape(final int pointsCount) {
         coordinates = new GeometryCoordinate[pointsCount];
@@ -32,11 +32,11 @@ public abstract class AbstractCoordinateShape extends AbstractShape {
         shapeId = lastShapeId.getAndIncrement();
     }
 
-    public AbstractCoordinateShape(final Point3D... locationPoints) {
-        coordinates = new GeometryCoordinate[locationPoints.length];
+    public AbstractCoordinateShape(final Point3D... vertexes) {
+        coordinates = new GeometryCoordinate[vertexes.length];
 
-        for (int i = 0; i < locationPoints.length; i++)
-            coordinates[i] = new GeometryCoordinate(locationPoints[i]);
+        for (int i = 0; i < vertexes.length; i++)
+            coordinates[i] = new GeometryCoordinate(vertexes[i]);
 
         shapeId = lastShapeId.getAndIncrement();
     }
@@ -60,7 +60,7 @@ public abstract class AbstractCoordinateShape extends AbstractShape {
 
             accumulatedZ += geometryPoint.transformedCoordinate.z;
 
-            if (!geometryPoint.transformedCoordinate.withinDrawingLimits())
+            if (!geometryPoint.transformedCoordinate.isVisible())
                 paint = false;
         }