Refactoring to remove unneeded complexity.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / renderer / raster / shapes / composite / TexturedRectangle.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/TexturedRectangle.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/TexturedRectangle.java
index 919a87e..e5e3e18 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/TexturedRectangle.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/TexturedRectangle.java
@@ -7,6 +7,7 @@ package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite;
 import eu.svjatoslav.sixth.e3d.geometry.Point2D;
 import eu.svjatoslav.sixth.e3d.geometry.Point3D;
 import eu.svjatoslav.sixth.e3d.math.Transform;
+import eu.svjatoslav.sixth.e3d.math.Vertex;
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.texturedpolygon.TexturedPolygon;
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.base.AbstractCompositeShape;
 import eu.svjatoslav.sixth.e3d.renderer.raster.texture.Texture;
@@ -62,16 +63,21 @@ public class TexturedRectangle extends AbstractCompositeShape {
         textureBottomRight = new Point2D(textureWidth, textureHeight);
         textureBottomLeft = new Point2D(0, textureHeight);
 
-        final TexturedPolygon texturedPolygon1 = new TexturedPolygon(topLeft,
-                topRight, bottomRight, textureTopLeft, textureTopRight,
-                textureBottomRight, texture);
+
+
+
+        final TexturedPolygon texturedPolygon1 = new TexturedPolygon(
+                new Vertex(topLeft, textureTopLeft),
+                new Vertex(topRight, textureTopRight),
+                new Vertex(bottomRight, textureBottomRight), texture);
 
         texturedPolygon1
                 .setMouseInteractionController(mouseInteractionController);
 
-        final TexturedPolygon texturedPolygon2 = new TexturedPolygon(topLeft,
-                bottomLeft, bottomRight, textureTopLeft, textureBottomLeft,
-                textureBottomRight, texture);
+        final TexturedPolygon texturedPolygon2 = new TexturedPolygon(
+                new Vertex(topLeft, textureTopLeft),
+                new Vertex(bottomLeft, textureBottomLeft),
+                new Vertex(bottomRight, textureBottomRight), texture);
 
         texturedPolygon2
                 .setMouseInteractionController(mouseInteractionController);