projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring to remove unneeded complexity.
[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
30384e6
..
50e4bd9
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,13
+1,12
@@
/*
/*
- * Sixth 3D engine. Author: Svjatoslav Agejenko.
+ * Sixth 3D engine. Author: Svjatoslav Agejenko.
* This project is released under Creative Commons Zero (CC0) license.
*/
package eu.svjatoslav.sixth.e3d.renderer.raster.shapes;
* This project is released under Creative Commons Zero (CC0) license.
*/
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.gui.RenderingContext;
-import eu.svjatoslav.sixth.e3d.math.
GeometryCoordinate
;
-import eu.svjatoslav.sixth.e3d.math.
TransformPipe
;
+import eu.svjatoslav.sixth.e3d.math.
TransformsStack
;
+import eu.svjatoslav.sixth.e3d.math.
Vertex
;
import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator;
import java.util.concurrent.atomic.AtomicInteger;
import eu.svjatoslav.sixth.e3d.renderer.raster.RenderAggregator;
import java.util.concurrent.atomic.AtomicInteger;
@@
-16,22
+15,19
@@
public abstract class AbstractCoordinateShape extends AbstractShape {
private static final AtomicInteger lastShapeId = new AtomicInteger();
public final int shapeId;
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) {
public double onScreenZ;
public AbstractCoordinateShape(final int pointsCount) {
- coordinates = new
GeometryCoordinate
[pointsCount];
+ coordinates = new
Vertex
[pointsCount];
for (int i = 0; i < pointsCount; i++)
for (int i = 0; i < pointsCount; i++)
- coordinates[i] = new
GeometryCoordinate
();
+ coordinates[i] = new
Vertex
();
shapeId = lastShapeId.getAndIncrement();
}
shapeId = lastShapeId.getAndIncrement();
}
- public AbstractCoordinateShape(final Point3D... vertexes) {
- coordinates = new GeometryCoordinate[vertexes.length];
-
- for (int i = 0; i < vertexes.length; i++)
- coordinates[i] = new GeometryCoordinate(vertexes[i]);
+ public AbstractCoordinateShape(final Vertex... vertexes) {
+ coordinates = vertexes;
shapeId = lastShapeId.getAndIncrement();
}
shapeId = lastShapeId.getAndIncrement();
}
@@
-43,15
+39,15
@@
public abstract class AbstractCoordinateShape extends AbstractShape {
public abstract void paint(RenderingContext renderBuffer);
@Override
public abstract void paint(RenderingContext renderBuffer);
@Override
- public void transform(final Transform
Pipe
transforms,
+ public void transform(final Transform
sStack
transforms,
final RenderAggregator aggregator,
final RenderingContext renderingContext) {
double accumulatedZ = 0;
boolean paint = true;
final RenderAggregator aggregator,
final RenderingContext renderingContext) {
double accumulatedZ = 0;
boolean paint = true;
- for (final
GeometryCoordinate
geometryPoint : coordinates) {
- geometryPoint.
transform
(transforms, renderingContext);
+ for (final
Vertex
geometryPoint : coordinates) {
+ geometryPoint.
calculateLocationRelativeToViewer
(transforms, renderingContext);
accumulatedZ += geometryPoint.transformedCoordinate.z;
accumulatedZ += geometryPoint.transformedCoordinate.z;