Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14298/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Moving the tips
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** View.java 10 Aug 2006 13:08:01 -0000 1.134
--- View.java 11 Aug 2006 08:23:26 -0000 1.135
***************
*** 1015,1019 ****
dist = (c.getOrigin().minus(v)).length() * scale;
}
! drawGeneralConstructor(c, dist, false, true);
}
}
--- 1015,1019 ----
dist = (c.getOrigin().minus(v)).length() * scale;
}
! drawGeneralConstructor(c, dist, false, OBJECTS);
}
}
***************
*** 1072,1076 ****
}
if (target != c && !highligts.contains(c)) {
! drawGeneralConstructor(c, dist, true, true);
}
}
--- 1072,1076 ----
}
if (target != c && !highligts.contains(c)) {
! drawGeneralConstructor(c, dist, true, OBJECTS);
}
}
***************
*** 1087,1091 ****
dist = (c.getOrigin().distance(v)) * scale;
}
! drawGeneralConstructor(c, dist, true, true);
}
}
--- 1087,1091 ----
dist = (c.getOrigin().distance(v)) * scale;
}
! drawGeneralConstructor(c, dist, true, OBJECTS);
}
}
***************
*** 1096,1103 ****
* @param dist The dist parameter
* @param colorize Apply color
! * @param active Draw the constructor active if active
*/
private void drawGeneralConstructor(Constructor constructor, double dist,
! boolean colorize, boolean active) {
if (constructor instanceof Point) {
if (colorize) {
--- 1096,1103 ----
* @param dist The dist parameter
* @param colorize Apply color
! * @param mode mode
*/
private void drawGeneralConstructor(Constructor constructor, double dist,
! boolean colorize, int mode) {
if (constructor instanceof Point) {
if (colorize) {
***************
*** 1118,1122 ****
} else if (constructor instanceof CoordinateSystem) {
CoordinateSystem system = (CoordinateSystem)constructor;
! drawCoordinateSystem(system, dist, colorize, active);
}
}
--- 1118,1122 ----
} else if (constructor instanceof CoordinateSystem) {
CoordinateSystem system = (CoordinateSystem)constructor;
! drawCoordinateSystem(system, dist, colorize, mode);
}
}
***************
*** 1127,1136 ****
* @param dist The distance to the center of the system
* @param colorize Apply color
! * @param active Draw the constructor active if active
*/
private void drawCoordinateSystem(CoordinateSystem cs, double dist,
! boolean colorize, boolean active) {
Vertex i = cs.getI();
Vertex j = cs.getJ();
if (cs.onlyPlane()) {
if (colorize) {
--- 1127,1137 ----
* @param dist The distance to the center of the system
* @param colorize Apply color
! * @param mode mode
*/
private void drawCoordinateSystem(CoordinateSystem cs, double dist,
! boolean colorize, int mode) {
Vertex i = cs.getI();
Vertex j = cs.getJ();
+ boolean active = (mode == OBJECTS) || (mode == INTERSECTIONS);
if (cs.onlyPlane()) {
if (colorize) {
***************
*** 1906,1912 ****
}
} else {
! pushName(gl, current);
! drawGeneralConstructor(current, dist, false, false);
! popName(gl);
}
}
--- 1907,1927 ----
}
} else {
! if (selectionMode == HANDLES) {
! Vertex origin = current.getOriginHandle();
! pushName(gl, origin);
! drawVertexHit(origin);
! popName(gl);
! if (current instanceof Line) {
! Line line = (Line) current;
! Vertex tip = line.tip(dist / 16);
! pushName(gl, tip);
! this.drawVectorTip(origin, tip);
! popName(gl);
! }
! } else {
! pushName(gl, current);
! drawGeneralConstructor(current, dist, false, selectionMode);
! popName(gl);
! }
}
}
|
