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=f2fdde00390a861a89ee1a8bf2e9764226742640;hp=649e546b2a0652eddcf3b1605f340af173851a3e;hb=de8fb260a5e99922231b1d0f437916e796ec6ccb;hpb=a377e3094d304bbc815b36edc2eb303ec023ea48 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 649e546..f2fdde0 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 @@ -6,7 +6,7 @@ package eu.svjatoslav.sixth.e3d.renderer.raster.shapes; import eu.svjatoslav.sixth.e3d.geometry.Point3D; import eu.svjatoslav.sixth.e3d.gui.RenderingContext; -import eu.svjatoslav.sixth.e3d.math.GeometryCoordinate; +import eu.svjatoslav.sixth.e3d.math.Vertex; import eu.svjatoslav.sixth.e3d.math.TransformsPipeline; import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator; @@ -16,22 +16,22 @@ public abstract class AbstractCoordinateShape extends AbstractShape { private static final AtomicInteger lastShapeId = new AtomicInteger(); public final int shapeId; - public final GeometryCoordinate[] coordinates; + public final Vertex[] coordinates; public double onScreenZ; public AbstractCoordinateShape(final int pointsCount) { - coordinates = new GeometryCoordinate[pointsCount]; + coordinates = new Vertex[pointsCount]; for (int i = 0; i < pointsCount; i++) - coordinates[i] = new GeometryCoordinate(); + coordinates[i] = new Vertex(); shapeId = lastShapeId.getAndIncrement(); } public AbstractCoordinateShape(final Point3D... vertexes) { - coordinates = new GeometryCoordinate[vertexes.length]; + coordinates = new Vertex[vertexes.length]; for (int i = 0; i < vertexes.length; i++) - coordinates[i] = new GeometryCoordinate(vertexes[i]); + coordinates[i] = new Vertex(vertexes[i]); shapeId = lastShapeId.getAndIncrement(); } @@ -50,7 +50,7 @@ public abstract class AbstractCoordinateShape extends AbstractShape { double accumulatedZ = 0; boolean paint = true; - for (final GeometryCoordinate geometryPoint : coordinates) { + for (final Vertex geometryPoint : coordinates) { geometryPoint.transform(transforms, renderingContext); accumulatedZ += geometryPoint.transformedCoordinate.z;