[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java,1.87,1.88
Status: Pre-Alpha
Brought to you by:
henryml
|
From: Michael L. <he...@us...> - 2006-05-05 11:40:32
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16949/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Improvement of hit-detection Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** View.java 5 May 2006 11:31:04 -0000 1.87 --- View.java 5 May 2006 11:40:07 -0000 1.88 *************** *** 1813,1816 **** --- 1813,1829 ---- } else { if (edge != null) { + + { + Vertex m = edge.getFrom().add(edge.getTo()); + m.scale(0.5); + Vertex projected = transformation.project(m); + double dx = x - projected.getX(); + double dy = (height - y) - projected.getY(); + double distance = Math.sqrt(dx * dx + dy * dy); + if (distance < 5) { + return new Intersection(m, Intersection.EDGE_MIDPOINT, edge); + } + } + Edge e1 = edge; Vertex v1 = e1.getTo().minus(e1.getFrom()); *************** *** 1839,1853 **** } ! { ! Vertex m = edge.getFrom().add(edge.getTo()); ! m.scale(0.5); ! Vertex projected = transformation.project(m); ! double dx = x - projected.getX(); ! double dy = (height - y) - projected.getY(); ! double distance = Math.sqrt(dx * dx + dy * dy); ! if (distance < 5) { ! return new Intersection(m, Intersection.EDGE_MIDPOINT, edge); ! } ! } { --- 1852,1856 ---- } ! { |