Refactoring to remove unneeded complexity.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / renderer / raster / slicer / BorderLine.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/slicer/BorderLine.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/slicer/BorderLine.java
index aebf479..b21e5ed 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/slicer/BorderLine.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/slicer/BorderLine.java
@@ -6,16 +6,17 @@ package eu.svjatoslav.sixth.e3d.renderer.raster.slicer;
 
 import eu.svjatoslav.sixth.e3d.geometry.Point2D;
 import eu.svjatoslav.sixth.e3d.geometry.Point3D;
+import eu.svjatoslav.sixth.e3d.math.Vertex;
 
 import java.util.Comparator;
 
 public class BorderLine implements Comparator<BorderLine> {
 
     public final int count;
-    final PolygonCoordinate c1;
-    final PolygonCoordinate c2;
+    final Vertex c1;
+    final Vertex c2;
 
-    public BorderLine(final PolygonCoordinate c1, final PolygonCoordinate c2,
+    public BorderLine(final Vertex c1, final Vertex c2,
                       final int count) {
         this.c1 = c1;
         this.c2 = c2;
@@ -28,12 +29,12 @@ public class BorderLine implements Comparator<BorderLine> {
     }
 
     public double getLength() {
-        return c1.spaceCoordinate.getDistanceTo(c2.spaceCoordinate);
+        return c1.coordinate.getDistanceTo(c2.coordinate);
     }
 
-    public PolygonCoordinate getMiddlePoint() {
-        return new PolygonCoordinate(new Point3D().computeMiddlePoint(c1.spaceCoordinate,
-                c2.spaceCoordinate), new Point2D().setToMiddle(c1.textureCoordinate,
-                c2.textureCoordinate));
+    public Vertex getMiddlePoint() {
+        return new Vertex(
+                new Point3D().computeMiddlePoint(c1.coordinate, c2.coordinate),
+                new Point2D().setToMiddle(c1.textureCoordinate, c2.textureCoordinate));
     }
 }