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
/
basic
/
solidpolygon
/
SolidPolygon.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
index
1b4bcfc
..
e941408
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
@@
-8,6
+8,7
@@
import eu.svjatoslav.sixth.e3d.geometry.Point2D;
import eu.svjatoslav.sixth.e3d.geometry.Point3D;
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
import eu.svjatoslav.sixth.e3d.gui.humaninput.MouseInteractionController;
import eu.svjatoslav.sixth.e3d.geometry.Point3D;
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
import eu.svjatoslav.sixth.e3d.gui.humaninput.MouseInteractionController;
+import eu.svjatoslav.sixth.e3d.math.Vertex;
import eu.svjatoslav.sixth.e3d.renderer.raster.Color;
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape;
import eu.svjatoslav.sixth.e3d.renderer.raster.Color;
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape;
@@
-25,7
+26,11
@@
public class SolidPolygon extends AbstractCoordinateShape {
public SolidPolygon(final Point3D point1, final Point3D point2,
final Point3D point3, final Color color) {
public SolidPolygon(final Point3D point1, final Point3D point2,
final Point3D point3, final Color color) {
- super(point1, point2, point3);
+ super(
+ new Vertex(point1),
+ new Vertex(point2),
+ new Vertex(point3)
+ );
this.color = color;
}
this.color = color;
}
@@
-51,7
+56,7
@@
public class SolidPolygon extends AbstractCoordinateShape {
final int width = x2 - x1;
int offset = ((y * renderBuffer.width) + x1) * 4;
final int width = x2 - x1;
int offset = ((y * renderBuffer.width) + x1) * 4;
- final byte[] offSreenBufferBytes = renderBuffer.pixels;
+ final byte[] offS
c
reenBufferBytes = renderBuffer.pixels;
final int polygonAlpha = color.a;
final int b = color.b;
final int polygonAlpha = color.a;
final int b = color.b;
@@
-60,13
+65,13
@@
public class SolidPolygon extends AbstractCoordinateShape {
if (polygonAlpha == 255)
for (int i = 0; i < width; i++) {
if (polygonAlpha == 255)
for (int i = 0; i < width; i++) {
- offSreenBufferBytes[offset] = (byte) 255;
+ offS
c
reenBufferBytes[offset] = (byte) 255;
offset++;
offset++;
- offSreenBufferBytes[offset] = (byte) b;
+ offS
c
reenBufferBytes[offset] = (byte) b;
offset++;
offset++;
- offSreenBufferBytes[offset] = (byte) g;
+ offS
c
reenBufferBytes[offset] = (byte) g;
offset++;
offset++;
- offSreenBufferBytes[offset] = (byte) r;
+ offS
c
reenBufferBytes[offset] = (byte) r;
offset++;
}
else {
offset++;
}
else {
@@
-77,13
+82,13
@@
public class SolidPolygon extends AbstractCoordinateShape {
final int redWithAlpha = r * polygonAlpha;
for (int i = 0; i < width; i++) {
final int redWithAlpha = r * polygonAlpha;
for (int i = 0; i < width; i++) {
- offSreenBufferBytes[offset] = (byte) 255;
+ offS
c
reenBufferBytes[offset] = (byte) 255;
offset++;
offset++;
- offS
reenBufferBytes[offset] = (byte) ((((offS
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + blueWithAlpha) / 256);
+ offS
creenBufferBytes[offset] = (byte) ((((offSc
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + blueWithAlpha) / 256);
offset++;
offset++;
- offS
reenBufferBytes[offset] = (byte) ((((offS
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + greenWithAlpha) / 256);
+ offS
creenBufferBytes[offset] = (byte) ((((offSc
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + greenWithAlpha) / 256);
offset++;
offset++;
- offS
reenBufferBytes[offset] = (byte) ((((offS
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + redWithAlpha) / 256);
+ offS
creenBufferBytes[offset] = (byte) ((((offSc
reenBufferBytes[offset] & 0xff) * backgroundAlpha) + redWithAlpha) / 256);
offset++;
}
offset++;
}