Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8835/src/net/sourceforge/bprocessor/gl/view
Modified Files:
AbstractView.java View.java View3D.java
Log Message:
Clicking at the XY plane works
Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AbstractView.java 30 Aug 2005 13:05:54 -0000 1.14
--- AbstractView.java 30 Aug 2005 13:20:08 -0000 1.15
***************
*** 109,112 ****
--- 109,118 ----
protected IntBuffer selectBuffer;
+ /** The last used near value */
+ protected double near;
+
+ /** The last used far value */
+ protected double far;
+
/** The modelview matrix used for rendering the scene */
protected double[] modelMatrix = new double[16];
***************
*** 189,193 ****
int[] mode = new int[1];
gl.glViewport(0, 0, (int)width, (int)height);
!
if (picking > 0) {
selectBuffer = BufferUtils.newIntBuffer(512);
--- 195,200 ----
int[] mode = new int[1];
gl.glViewport(0, 0, (int)width, (int)height);
! AbstractView.height = height;
! AbstractView.width = width;
if (picking > 0) {
selectBuffer = BufferUtils.newIntBuffer(512);
***************
*** 978,980 ****
--- 985,1011 ----
return null;
}
+
+ /**
+ * Return the near plane
+ * @return The near plane
+ */
+ public double getNear() {
+ return near;
+ }
+
+ /**
+ * Return the far plane
+ * @return The far plane
+ */
+ public double getFar() {
+ return far;
+ }
+
+ /**
+ * Return the view height
+ * @return The view height
+ */
+ public static double getHeight() {
+ return height;
+ }
}
Index: View3D.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View3D.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** View3D.java 30 Aug 2005 08:22:35 -0000 1.9
--- View3D.java 30 Aug 2005 13:20:08 -0000 1.10
***************
*** 57,65 ****
}
double aspect = width / height;
if (aspect < 1.0) {
// fovy, aspect, near, far (relative to camera position)
! glu.gluPerspective(aspect * 60.0, 1.0, 2.0 / getZoomFactor(), 100.0 * getZoomFactor());
} else {
! glu.gluPerspective(60.0, aspect, 2.0 / getZoomFactor(), 100.0 * getZoomFactor());
}
--- 57,67 ----
}
double aspect = width / height;
+ near = 2.0 / getZoomFactor();
+ far = 100.0 * getZoomFactor();
if (aspect < 1.0) {
// fovy, aspect, near, far (relative to camera position)
! glu.gluPerspective(aspect * 60.0, 1.0, near, far);
} else {
! glu.gluPerspective(60.0, aspect, near, far);
}
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** View.java 26 Aug 2005 14:48:15 -0000 1.7
--- View.java 30 Aug 2005 13:20:08 -0000 1.8
***************
*** 174,176 ****
--- 174,188 ----
*/
public void changeDrawMode(int mode);
+
+ /**
+ * Return the near plane
+ * @return The near plane
+ */
+ public double getNear();
+
+ /**
+ * Return the far plane
+ * @return The far plane
+ */
+ public double getFar();
}
|
