X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2Fshapes%2Fbasic%2Fline%2FLine.java;h=10896ec728c349248ac84259ede490882c2f25fd;hb=a3ff3683bd0a025061667b26b6fcf56fe20f0afc;hp=490e82578a73dff133d1851424fe2e9b5d81e0f7;hpb=6213716671ccab6b7256de41838e1f5401ce173c;p=sixth-3d.git

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 490e825..10896ec 100644
--- 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,13 +1,7 @@
 /*
- * Sixth - System for data storage, computation, exploration and interaction.
- * Copyright ©2012-2016, 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.
+ * 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;
 
 import eu.svjatoslav.sixth.e3d.geometry.Point2D;
@@ -28,8 +22,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 +39,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 +73,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 +102,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 +129,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 +158,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 +185,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 +201,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))