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
/
solidpolygon
/
SolidPolygon.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
index
d235606
..
e45a991
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/basic/solidpolygon/SolidPolygon.java
@@
-1,10
+1,10
@@
/*
/*
- * 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.solidpolygon;
*/
package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.solidpolygon;
@@
-19,9
+19,9
@@
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractCoordinateShape;
public class SolidPolygon extends AbstractCoordinateShape {
public class SolidPolygon extends AbstractCoordinateShape {
- final static LineInterpolator polygonBoundary1 = new LineInterpolator();
- final static LineInterpolator polygonBoundary2 = new LineInterpolator();
- final static LineInterpolator polygonBoundary3 = new LineInterpolator();
+
private
final static LineInterpolator polygonBoundary1 = new LineInterpolator();
+
private
final static LineInterpolator polygonBoundary2 = new LineInterpolator();
+
private
final static LineInterpolator polygonBoundary3 = new LineInterpolator();
private Color color;
public SolidPolygon(final Point3D point1, final Point3D point2,
private Color color;
public SolidPolygon(final Point3D point1, final Point3D point2,
@@
-52,7
+52,7
@@
public class SolidPolygon extends AbstractCoordinateShape {
final int width = x2 - x1;
int offset = ((y * renderBuffer.width) + x1) * 4;
final int width = x2 - x1;
int offset = ((y * renderBuffer.width) + x1) * 4;
- final byte[] offSreenBufferBytes = renderBuffer.
byte
s;
+ final byte[] offSreenBufferBytes = renderBuffer.
pixel
s;
final int polygonAlpha = color.a;
final int b = color.b;
final int polygonAlpha = color.a;
final int b = color.b;
@@
-103,10
+103,10
@@
public class SolidPolygon extends AbstractCoordinateShape {
onScreenPoint3.roundToInteger();
if (mouseInteractionController != null)
onScreenPoint3.roundToInteger();
if (mouseInteractionController != null)
- if (context.mouse
Click
!= null)
- if (Polygon.pointWithinPolygon(context.mouse
Click
.coordinate,
+ if (context.mouse
Event
!= null)
+ if (Polygon.pointWithinPolygon(context.mouse
Event
.coordinate,
onScreenPoint1, onScreenPoint2, onScreenPoint3))
onScreenPoint1, onScreenPoint2, onScreenPoint3))
- context.
clickedItem
= mouseInteractionController;
+ context.
objectUnderMouse
= mouseInteractionController;
if (color.isTransparent())
return;
if (color.isTransparent())
return;