Code refactoring.

[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 d5cb35c..b06699d 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
@@ -28,8 +28,8 @@ public class Line extends AbstractCoordinateShape {
 
     public Line(final Line parentLine) {
         this(parentLine.coordinates[0].coordinate.clone(),
-                parentLine.coordinates[1].coordinate.clone(), new Color(
-                        parentLine.color), parentLine.width);
+                parentLine.coordinates[1].coordinate.clone(),
+                new Color(parentLine.color), parentLine.width);
     }
 
     public Line(final Point3D point1, final Point3D point2, final Color color,
@@ -45,9 +45,9 @@ public class Line extends AbstractCoordinateShape {
 
     }
 
-    public void drawHorizontalLine(final LineInterpolator line1,
-                                   final LineInterpolator line2, final int y,
-                                   final RenderingContext renderBuffer) {
+    private void drawHorizontalLine(final LineInterpolator line1,
+                                    final LineInterpolator line2, final int y,
+                                    final RenderingContext renderBuffer) {
 
         int x1 = line1.getX(y);
         int x2 = line2.getX(y);
@@ -79,7 +79,7 @@ public class Line extends AbstractCoordinateShape {
         final int drawnWidth = x2 - x1;
 
         int offset = ((y * renderBuffer.width) + x1) * 4;
-        final byte[] offSreenBufferBytes = renderBuffer.bytes;
+        final byte[] offSreenBufferBytes = renderBuffer.pixels;
 
         final int lineAlpha = color.a;
 
@@ -108,8 +108,8 @@ public class Line extends AbstractCoordinateShape {
 
     }
 
-    public void drawSinglePixelHorizontalLine(final RenderingContext buffer,
-                                              final int alpha) {
+    private void drawSinglePixelHorizontalLine(final RenderingContext buffer,
+                                               final int alpha) {
 
         final Point2D onScreenPoint1 = coordinates[0].onScreenCoordinate;
         final Point2D onScreenPoint2 = coordinates[1].onScreenCoordinate;
@@ -135,7 +135,7 @@ public class Line extends AbstractCoordinateShape {
         if (lineWidth == 0)
             return;
 
-        final byte[] offSreenBufferBytes = buffer.bytes;
+        final byte[] offSreenBufferBytes = buffer.pixels;
         final int backgroundAlpha = 255 - alpha;
 
         final int blueWithAlpha = color.b * alpha;
@@ -164,8 +164,8 @@ public class Line extends AbstractCoordinateShape {
 
     }
 
-    public void drawSinglePixelVerticalLine(final RenderingContext buffer,
-                                            final int alpha) {
+    private void drawSinglePixelVerticalLine(final RenderingContext buffer,
+                                             final int alpha) {
 
         final Point2D onScreenPoint1 = coordinates[0].onScreenCoordinate;
         final Point2D onScreenPoint2 = coordinates[1].onScreenCoordinate;
@@ -191,11 +191,11 @@ public class Line extends AbstractCoordinateShape {
         if (lineHeight == 0)
             return;
 
-        final byte[] offSreenBufferBytes = buffer.bytes;
+        final byte[] offScreenBufferBytes = buffer.pixels;
         final int backgroundAlpha = 255 - alpha;
 
         final int blueWithAlpha = color.b * alpha;
-        final int greenWithAplha = color.g * alpha;
+        final int greenWithAlpha = color.g * alpha;
         final int redWithAlpha = color.r * alpha;
 
         for (int relativeY = 0; relativeY <= lineHeight; relativeY++) {
@@ -207,19 +207,19 @@ public class Line extends AbstractCoordinateShape {
                 if ((x >= 0) && (x < buffer.width)) {
                     int ramOffset = ((y * buffer.width) + x) * 4;
 
-                    offSreenBufferBytes[ramOffset] = (byte) 255;
+                    offScreenBufferBytes[ramOffset] = (byte) 255;
                     ramOffset++;
-                    offSreenBufferBytes[ramOffset] = (byte) ((((offSreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + blueWithAlpha) / 256);
+                    offScreenBufferBytes[ramOffset] = (byte) ((((offScreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + blueWithAlpha) / 256);
                     ramOffset++;
-                    offSreenBufferBytes[ramOffset] = (byte) ((((offSreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + greenWithAplha) / 256);
+                    offScreenBufferBytes[ramOffset] = (byte) ((((offScreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + greenWithAlpha) / 256);
                     ramOffset++;
-                    offSreenBufferBytes[ramOffset] = (byte) ((((offSreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + redWithAlpha) / 256);
+                    offScreenBufferBytes[ramOffset] = (byte) ((((offScreenBufferBytes[ramOffset] & 0xff) * backgroundAlpha) + redWithAlpha) / 256);
                 }
             }
         }
     }
 
-    public 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))