X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2Fshapes%2Fbasic%2Fsolidpolygon%2FLineInterpolator.java;h=8f028cc52b8a957313bfb4e9206bb75b0181414a;hb=a3ff3683bd0a025061667b26b6fcf56fe20f0afc;hp=45d5b96f6b62ec38f2cb16887a5cf79888e60b52;hpb=dcdff57f0bab42387b2e4e215778d9e8efc60221;p=sixth-3d.git diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/LineInterpolator.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/LineInterpolator.java index 45d5b96..8f028cc 100644 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/LineInterpolator.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/LineInterpolator.java @@ -1,12 +1,7 @@ /* - * Sixth 3D engine. Copyright ©2012-2018, 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.solidpolygon; import eu.svjatoslav.sixth.e3d.geometry.Point2D; @@ -33,12 +28,8 @@ public class LineInterpolator implements Comparable { if (absoluteHeight > o.absoluteHeight) return -1; - if (width < o.width) - return 1; - if (width > o.width) - return -1; + return Integer.compare(o.width, width); - return 0; } @Override @@ -52,11 +43,9 @@ public class LineInterpolator implements Comparable { if (p1.y <= p2.y) { if (y >= p1.y) - if (y <= p2.y) - return true; + return y <= p2.y; } else if (y >= p2.y) - if (y <= p1.y) - return true; + return y <= p1.y; return false; }