projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved code readability
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
renderer
/
raster
/
shapes
/
basic
/
line
/
Line.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/line/Line.java
b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/line/Line.java
index
6a4bf2d
..
2366e79
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/line/Line.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/line/Line.java
@@
-1,5
+1,5
@@
/*
/*
- * 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.basic.line;
* This project is released under Creative Commons Zero (CC0) license.
*/
package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.line;
@@
-10,14
+10,26
@@
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
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;
+/**
+ * Line in 3D space.
+ *
+ * Line is represented by two points, width and color and width.
+ */
public class Line extends AbstractCoordinateShape {
private static final double MINIMUM_WIDTH_THRESHOLD = 1;
private static final double LINE_WIDTH_MULTIPLIER = 0.2d;
public class Line extends AbstractCoordinateShape {
private static final double MINIMUM_WIDTH_THRESHOLD = 1;
private static final double LINE_WIDTH_MULTIPLIER = 0.2d;
+ /**
+ * width of the line.
+ */
public final double width;
public final double width;
- final LineInterpolator[] li = new LineInterpolator[4];
+ final LineInterpolator[] lineInterpolators = new LineInterpolator[4];
+
+ /**
+ * Color of the line.
+ */
public Color color;
public Line(final Line parentLine) {
public Color color;
public Line(final Line parentLine) {
@@
-34,8
+46,8
@@
public class Line extends AbstractCoordinateShape {
this.color = color;
this.width = width;
this.color = color;
this.width = width;
- for (int i = 0; i < li.length; i++)
- li[i] = new LineInterpolator();
+ for (int i = 0; i < li
neInterpolators
.length; i++)
+ li
neInterpolators
[i] = new LineInterpolator();
}
}
@@
-215,8
+227,8
@@
public class Line extends AbstractCoordinateShape {
private int getLineInterpolator(final int startPointer, final int y) {
private int getLineInterpolator(final int startPointer, final int y) {
- for (int i = startPointer; i < li.length; i++)
- if (li[i].containsY(y))
+ for (int i = startPointer; i < li
neInterpolators
.length; i++)
+ if (li
neInterpolators
[i].containsY(y))
return i;
return -1;
}
return i;
return -1;
}
@@
-274,11
+286,11
@@
public class Line extends AbstractCoordinateShape {
final double p2x2 = onScreenPoint2.x + xdec2;
final double p2y2 = onScreenPoint2.y - yinc2;
final double p2x2 = onScreenPoint2.x + xdec2;
final double p2y2 = onScreenPoint2.y - yinc2;
- li[0].setPoints(p1x1, p1y1, 1d, p2x1, p2y1, 1d);
- li[1].setPoints(p1x2, p1y2, -1d, p2x2, p2y2, -1d);
+ li
neInterpolators
[0].setPoints(p1x1, p1y1, 1d, p2x1, p2y1, 1d);
+ li
neInterpolators
[1].setPoints(p1x2, p1y2, -1d, p2x2, p2y2, -1d);
- li[2].setPoints(p1x1, p1y1, 1d, p1x2, p1y2, -1d);
- li[3].setPoints(p2x1, p2y1, 1d, p2x2, p2y2, -1d);
+ li
neInterpolators
[2].setPoints(p1x1, p1y1, 1d, p1x2, p1y2, -1d);
+ li
neInterpolators
[3].setPoints(p2x1, p2y1, 1d, p2x2, p2y2, -1d);
double ymin = p1y1;
if (p1y2 < ymin)
double ymin = p1y1;
if (p1y2 < ymin)
@@
-305,7
+317,7
@@
public class Line extends AbstractCoordinateShape {
if (li1 != -1) {
final int li2 = getLineInterpolator(li1 + 1, y);
if (li2 != -1)
if (li1 != -1) {
final int li2 = getLineInterpolator(li1 + 1, y);
if (li2 != -1)
- drawHorizontalLine(li
[li1], li
[li2], y, buffer);
+ drawHorizontalLine(li
neInterpolators[li1], lineInterpolators
[li2], y, buffer);
}
}
}
}
}
}