projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimized frame repainting. Fixed mouse click processing.
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
renderer
/
raster
/
shapes
/
basic
/
texturedpolygon
/
TexturedPolygon.java
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
(file)
--- 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.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;
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 java.awt.*;
+import static eu.svjatoslav.sixth.e3d.geometry.Polygon.pointWithinPolygon;
+
public class TexturedPolygon extends AbstractCoordinateShape {
public final Texture texture;
public class TexturedPolygon extends AbstractCoordinateShape {
public final Texture texture;
@@
-140,11
+141,11
@@
public class TexturedPolygon extends AbstractCoordinateShape {
projectedPoint3.roundToInteger();
if (mouseInteractionController != null)
projectedPoint3.roundToInteger();
if (mouseInteractionController != null)
- if (renderBuffer.mouse
Click
!= null)
- if (
Polygon.
pointWithinPolygon(
- renderBuffer.mouse
Click
.coordinate, projectedPoint1,
+ if (renderBuffer.mouse
Event
!= null)
+ if (pointWithinPolygon(
+ renderBuffer.mouse
Event
.coordinate, projectedPoint1,
projectedPoint2, projectedPoint3))
projectedPoint2, projectedPoint3))
- renderBuffer.
clickedItem
= mouseInteractionController;
+ renderBuffer.
objectUnderMouse
= mouseInteractionController;
// Show polygon boundaries (for debugging)
if (showBorders)
// Show polygon boundaries (for debugging)
if (showBorders)