Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7155/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Fixed small issues
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** View.java 19 Dec 2005 07:51:30 -0000 1.33
--- View.java 20 Dec 2005 12:24:09 -0000 1.34
***************
*** 92,95 ****
--- 92,98 ----
/** Used for clipping planes */
public static final float[] CLIP_PLANE_COLOR = new float[] {1.0f, 0.65f, 0.0f, 0.3f};
+
+ /** Used for clipping planes */
+ public static final float[] CLIP_PLANE_INTERIOR_COLOR = new float[] {0.9f, 0.9f, 0.9f, 0.3f};
/** Used for target objects */
***************
*** 100,104 ****
/** Front color for surfaces */
! protected static float[] frontCcolor = new float[] {0.96f, 0.87f, 0.70f};
/** NONE color for surfaces */
--- 103,107 ----
/** Front color for surfaces */
! protected static float[] frontColor = new float[] {0.96f, 0.87f, 0.70f};
/** NONE color for surfaces */
***************
*** 106,110 ****
/** Back color for surfaces */
! protected static float[] backColor = new float[] {0.94f, 0.97f, 1.00f};
/** Select mode for selecting edges */
--- 109,113 ----
/** Back color for surfaces */
! protected static float[] backColor = new float[] {0.40f, 0.58f, 0.93f};
/** Select mode for selecting edges */
***************
*** 828,832 ****
gl.glCullFace(GL.GL_BACK);
! gl.glColor3fv(frontCcolor);
drawSurfaces(gld, FRONT);
--- 831,835 ----
gl.glCullFace(GL.GL_BACK);
! gl.glColor3fv(frontColor);
drawSurfaces(gld, FRONT);
***************
*** 1023,1033 ****
}
if (selectMode == CLIPPLANES || selectMode == ALL) {
! Iterator it = clippingPlanes.iterator();
! while (it.hasNext()) {
! ClippingPlane cp = (ClippingPlane)it.next();
! gl.glDisable(GL.GL_CLIP_PLANE0 + cp.getNumber());
! pushName(gl, cp);
! drawClipplaneFrame(cp);
! popName(gl);
}
}
--- 1026,1044 ----
}
if (selectMode == CLIPPLANES || selectMode == ALL) {
! {
! Iterator it = clippingPlanes.iterator();
! while (it.hasNext()) {
! ClippingPlane cp = (ClippingPlane)it.next();
! gl.glDisable(GL.GL_CLIP_PLANE0 + cp.getNumber());
! }
! }
! {
! Iterator it = clippingPlanes.iterator();
! while (it.hasNext()) {
! ClippingPlane cp = (ClippingPlane)it.next();
! pushName(gl, cp);
! drawClipplaneFrame(cp);
! popName(gl);
! }
}
}
***************
*** 1068,1072 ****
Collection corners = clipplane.getCorners();
{
! gl.glColor4fv(CLIP_PLANE_COLOR);
gl.glBegin(GL.GL_QUADS);
gl.glNormal3d(d[0], d[1], d[2]);
--- 1079,1083 ----
Collection corners = clipplane.getCorners();
{
! gl.glColor4fv(CLIP_PLANE_INTERIOR_COLOR);
gl.glBegin(GL.GL_QUADS);
gl.glNormal3d(d[0], d[1], d[2]);
***************
*** 1327,1335 ****
// TODO check if the space space has a color
if (space.isConstructionSpace()) {
! // We are looking at a constructionspace
! return frontCcolor;
}
if (space.isFunctionalSpace()) {
! // We are looking at a constructionspace
return backColor;
}
--- 1338,1346 ----
// TODO check if the space space has a color
if (space.isConstructionSpace()) {
! // We are looking at a construction space
! return frontColor;
}
if (space.isFunctionalSpace()) {
! // We are looking at a functional space
return backColor;
}
***************
*** 2020,2023 ****
--- 2031,2035 ----
double aspect = width / height;
+
double[] eye = camera.getCamera();
double[] center = camera.getCenter();
|
