projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use proper variable naming
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
renderer
/
raster
/
shapes
/
AbstractCoordinateShape.java
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
1a5bf0a
..
f67fb49
100644
(file)
--- 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,28
+1,28
@@
/*
/*
- * 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.
* 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.shapes;
*/
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.Point3D;
-import eu.svjatoslav.sixth.e3d.geometry.TransformPipe;
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
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 {
import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator;
import java.util.concurrent.atomic.AtomicInteger;
public abstract class AbstractCoordinateShape extends AbstractShape {
- p
ublic
static final AtomicInteger lastShapeId = new AtomicInteger();
+ p
rivate
static final AtomicInteger lastShapeId = new AtomicInteger();
public final int shapeId;
public final int shapeId;
+ public final GeometryCoordinate[] coordinates;
public double onScreenZ;
public double onScreenZ;
- public GeometryCoordinate[] coordinates;
public AbstractCoordinateShape(final int pointsCount) {
coordinates = new GeometryCoordinate[pointsCount];
public AbstractCoordinateShape(final int pointsCount) {
coordinates = new GeometryCoordinate[pointsCount];
@@
-32,11
+32,11
@@
public abstract class AbstractCoordinateShape extends AbstractShape {
shapeId = lastShapeId.getAndIncrement();
}
shapeId = lastShapeId.getAndIncrement();
}
- public AbstractCoordinateShape(final Point3D...
locationPoint
s) {
- coordinates = new GeometryCoordinate[
locationPoint
s.length];
+ public AbstractCoordinateShape(final Point3D...
vertexe
s) {
+ coordinates = new GeometryCoordinate[
vertexe
s.length];
- for (int i = 0; i <
locationPoint
s.length; i++)
- coordinates[i] = new GeometryCoordinate(
locationPoint
s[i]);
+ for (int i = 0; i <
vertexe
s.length; i++)
+ coordinates[i] = new GeometryCoordinate(
vertexe
s[i]);
shapeId = lastShapeId.getAndIncrement();
}
shapeId = lastShapeId.getAndIncrement();
}
@@
-60,7
+60,7
@@
public abstract class AbstractCoordinateShape extends AbstractShape {
accumulatedZ += geometryPoint.transformedCoordinate.z;
accumulatedZ += geometryPoint.transformedCoordinate.z;
- if (!geometryPoint.transformedCoordinate.
withinDrawingLimits
())
+ if (!geometryPoint.transformedCoordinate.
isVisible
())
paint = false;
}
paint = false;
}