X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2Fshapes%2Fbasic%2Ftexturedpolygon%2FTexturedPolygon.java;h=cafcbbf7ee946f2d331b0824501c983cf756af88;hp=686244c83828d2e41266f2cc038a034bdbdf16d4;hb=9dcd9d8a7d3bc16eb6fde3681cd32e02dc0707e9;hpb=4bb8945294848559aab76e248207781c6e097714 diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/texturedpolygon/TexturedPolygon.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/texturedpolygon/TexturedPolygon.java index 686244c..cafcbbf 100644 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/texturedpolygon/TexturedPolygon.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/texturedpolygon/TexturedPolygon.java @@ -11,7 +11,6 @@ package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.texturedpolygon; import eu.svjatoslav.sixth.e3d.geometry.Point2D; import eu.svjatoslav.sixth.e3d.geometry.Point3D; -import eu.svjatoslav.sixth.e3d.geometry.Polygon; import eu.svjatoslav.sixth.e3d.gui.RenderingContext; import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape; import eu.svjatoslav.sixth.e3d.renderer.raster.slicer.PolygonCoordinate; @@ -20,6 +19,8 @@ import eu.svjatoslav.sixth.e3d.renderer.raster.texture.TextureBitmap; import java.awt.*; +import static eu.svjatoslav.sixth.e3d.geometry.Polygon.pointWithinPolygon; + public class TexturedPolygon extends AbstractCoordinateShape { public final Texture texture; @@ -140,11 +141,11 @@ public class TexturedPolygon extends AbstractCoordinateShape { projectedPoint3.roundToInteger(); if (mouseInteractionController != null) - if (renderBuffer.mouseClick != null) - if (Polygon.pointWithinPolygon( - renderBuffer.mouseClick.coordinate, projectedPoint1, + if (renderBuffer.mouseEvent != null) + if (pointWithinPolygon( + renderBuffer.mouseEvent.coordinate, projectedPoint1, projectedPoint2, projectedPoint3)) - renderBuffer.clickedItem = mouseInteractionController; + renderBuffer.objectUnderMouse = mouseInteractionController; // Show polygon boundaries (for debugging) if (showBorders)