[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.249, 1.250 Display.java,
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2007-10-15 10:29:32
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28075/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Display.java Log Message: fixed bug in hit-detection Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Display.java 15 Oct 2007 08:18:26 -0000 1.34 --- Display.java 15 Oct 2007 10:29:27 -0000 1.35 *************** *** 65,68 **** --- 65,69 ---- private static int mode; private static boolean transparency; + private static Collection<Geometric> excluded; private static Project project; *************** *** 213,216 **** --- 214,225 ---- /** + * + * @param value collection of excluded geometry + */ + public static void excluded(Collection<Geometric> value) { + excluded = value; + } + + /** * Returns the value of intersecting * @return intersecting *************** *** 651,656 **** if (intersecting) { for (Constructor current : constructors) { ! Collection<Edge> guides = current.guides(grid.size()); ! selectEdges(guides); } } else { --- 660,667 ---- if (intersecting) { for (Constructor current : constructors) { ! if (!excluded.contains(current)) { ! Collection<Edge> guides = current.guides(grid.size()); ! selectEdges(guides); ! } } } else { Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.249 retrieving revision 1.250 diff -C2 -d -r1.249 -r1.250 *** View.java 12 Oct 2007 14:34:34 -0000 1.249 --- View.java 15 Oct 2007 10:29:27 -0000 1.250 *************** *** 720,723 **** --- 720,724 ---- Display.colors(colorMap); Display.targetColor(targetColor); + Display.excluded(excluded); if (target instanceof Geometric) { Display.target((Geometric) target); |