projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed mouse hovering detection
[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
ff900d8
..
3539ab1
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
@@
-1,17
+1,16
@@
/*
/*
- * Sixth - System for data storage, computation, exploration and interaction.
- * Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
+ * 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.
* 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.
+ *
*/
package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.texturedpolygon;
import eu.svjatoslav.sixth.e3d.geometry.Point2D;
import eu.svjatoslav.sixth.e3d.geometry.Point3D;
*/
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;
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;
@@
-105,7
+106,7
@@
public class TexturedPolygon extends AbstractCoordinateShape {
x2 = renderBuffer.width - 1;
int renderBufferOffset = ((y * renderBuffer.width) + x1) * 4;
x2 = renderBuffer.width - 1;
int renderBufferOffset = ((y * renderBuffer.width) + x1) * 4;
- final byte[] renderBufferBytes = renderBuffer.
byte
s;
+ final byte[] renderBufferBytes = renderBuffer.
pixel
s;
final double twidth = tx2 - tx1;
final double theight = ty2 - ty1;
final double twidth = tx2 - tx1;
final double theight = ty2 - ty1;
@@
-140,11
+141,11
@@
public class TexturedPolygon extends AbstractCoordinateShape {
projectedPoint3.roundToInteger();
if (mouseInteractionController != null)
projectedPoint3.roundToInteger();
if (mouseInteractionController != null)
- if (renderBuffer.
mouseClick
!= null)
- if (
Polygon.
pointWithinPolygon(
- renderBuffer.
mouseClick
.coordinate, projectedPoint1,
+ if (renderBuffer.
getMouseEvent()
!= null)
+ if (pointWithinPolygon(
+ renderBuffer.
getMouseEvent()
.coordinate, projectedPoint1,
projectedPoint2, projectedPoint3))
projectedPoint2, projectedPoint3))
- renderBuffer.
clickedItem = mouseInteractionController
;
+ renderBuffer.
setObjectUnderMouse(mouseInteractionController)
;
// Show polygon boundaries (for debugging)
if (showBorders)
// Show polygon boundaries (for debugging)
if (showBorders)