Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16091/src/net/sourceforge/bprocessor/gl/view
Modified Files:
AbstractView.java View.java
Log Message:
Changed feedback in PencilTool to hilite target
Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** AbstractView.java 11 Oct 2005 12:05:15 -0000 1.42
--- AbstractView.java 21 Oct 2005 11:57:09 -0000 1.43
***************
*** 86,91 ****
protected static double[] alignPoint = null;
! /** The alignment vertex */
protected static Vertex alignVertex = null;
/** The GL */
--- 86,95 ----
protected static double[] alignPoint = null;
! /** The alignment vertex */
protected static Vertex alignVertex = null;
+
+ /** The target */
+
+ protected static Object target = null;
/** The GL */
***************
*** 322,325 ****
--- 326,330 ----
setSnapVertex(null);
setAlignPoint(null);
+ makeTarget(null);
}
***************
*** 553,583 ****
}
// draw selection
Iterator selit = selection.iterator();
while (selit.hasNext()) {
Object o = selit.next();
! gl.glColor3fv(SELECTED_COLOR);
! if (o instanceof Vertex) {
! Vertex v = (Vertex) o;
! gl.glPointSize(5.0f);
! gl.glBegin(GL.GL_POINTS);
! gl.glVertex3d(v.getX(), v.getY(), v.getZ());
! gl.glEnd();
! gl.glPointSize(1.0f);
! } else if (o instanceof Edge) {
! Edge e = (Edge) o;
! Vertex to = e.getTo();
! Vertex from = e.getFrom();
! gl.glBegin(GL.GL_LINES);
! gl.glVertex3d(to.getX(), to.getY(), to.getZ());
! gl.glVertex3d(from.getX(), from.getY(), from.getZ());
! gl.glEnd();
! } else if (o instanceof Surface) {
! gl.glEnable(GL.GL_POLYGON_STIPPLE);
! gl.glPolygonStipple(transparency);
! Surface s = (Surface) o;
! log.info(s.getName() + " angle: " + s.angle());
! drawSurface(s);
! gl.glDisable(GL.GL_POLYGON_STIPPLE);
! }
}
--- 558,572 ----
}
// draw selection
+ gl.glColor3fv(SELECTED_COLOR);
Iterator selit = selection.iterator();
while (selit.hasNext()) {
Object o = selit.next();
! drawObject(o);
! }
!
! // draw target
! gl.glColor3fv(TARGET_COLOR);
! if (target != null) {
! drawObject(target);
}
***************
*** 698,701 ****
--- 687,718 ----
/**
+ * Draw an object
+ * @param o The Object
+ */
+ private void drawObject(Object o) {
+ if (o instanceof Vertex) {
+ Vertex v = (Vertex) o;
+ gl.glPointSize(5.0f);
+ gl.glBegin(GL.GL_POINTS);
+ gl.glVertex3d(v.getX(), v.getY(), v.getZ());
+ gl.glEnd();
+ gl.glPointSize(1.0f);
+ } else if (o instanceof Edge) {
+ Edge e = (Edge) o;
+ Vertex to = e.getTo();
+ Vertex from = e.getFrom();
+ gl.glBegin(GL.GL_LINES);
+ gl.glVertex3d(to.getX(), to.getY(), to.getZ());
+ gl.glVertex3d(from.getX(), from.getY(), from.getZ());
+ gl.glEnd();
+ } else if (o instanceof Surface) {
+ gl.glEnable(GL.GL_POLYGON_STIPPLE);
+ gl.glPolygonStipple(transparency);
+ Surface s = (Surface) o;
+ drawSurface(s);
+ gl.glDisable(GL.GL_POLYGON_STIPPLE);
+ }
+ }
+ /**
* Draw a surface
* @param s The surface to draw
***************
*** 947,950 ****
--- 964,975 ----
return alignPoint;
}
+
+ /**
+ * Setter for target
+ * @param o The object to be target
+ */
+ public void makeTarget(Object o) {
+ target = o;
+ }
/**
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** View.java 16 Sep 2005 12:09:07 -0000 1.12
--- View.java 21 Oct 2005 11:57:09 -0000 1.13
***************
*** 53,56 ****
--- 53,59 ----
public static final float[] SELECTED_COLOR = new float[] {1.0f, 0.4f, 1.0f};
+ /** Used for target objects */
+ public static final float[] TARGET_COLOR = new float[] {0.1f, 0.8f, 0.1f};
+
/** Can be used for setting wireframe mode */
public static final int WIREFRAME_MODE = 0;
***************
*** 148,151 ****
--- 151,160 ----
*/
public Vertex getAlignVertex();
+
+ /**
+ * Setter for target
+ * @param o The object to be target
+ */
+ public void makeTarget(Object o);
/**
|
