[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.274, 1.275 PopupMenu.java, 1.6, 1.7

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19472/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java PopupMenu.java 
Log Message:
renamed CONVETIONAL to STANDARD

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PopupMenu.java	30 Dec 2007 23:21:17 -0000	1.6
--- PopupMenu.java	7 Jan 2008 14:52:02 -0000	1.7
***************
*** 705,708 ****
--- 705,716 ----
        menu.add(action);
      }
+     { 
+       AbstractAction action = new AbstractAction("Bounding Sphere") {
+         public void actionPerformed(ActionEvent event) {
+           
+         }
+       };
+       menu.add(action);
+     }
      return menu;
    }

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** View.java	2 Jan 2008 11:31:09 -0000	1.274
--- View.java	7 Jan 2008 14:52:02 -0000	1.275
***************
*** 820,829 ****
      far = far < 20 ? 20 : far;
      double focalwidth = camera.getFocalwidth();
!     double d = View.height / Camera.CONVETIONAL_WINDOW_HEIGHT;
      if (camera.getType() == Camera.ORTHOGRAPHIC) {
        int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
        double relation = 2.54;
        double dpm = (dpi / relation) * 100;
!       double windowInMeters = 600 / dpm;
        double tal = d * camera.getFactor() * windowInMeters / 2;
        gl.glOrtho(-tal * aspect, tal * aspect, -tal, tal, near, far);
--- 820,829 ----
      far = far < 20 ? 20 : far;
      double focalwidth = camera.getFocalwidth();
!     double d = View.height / Camera.STANDARD_HEIGHT;
      if (camera.getType() == Camera.ORTHOGRAPHIC) {
        int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
        double relation = 2.54;
        double dpm = (dpi / relation) * 100;
!       double windowInMeters = Camera.STANDARD_HEIGHT / dpm;
        double tal = d * camera.getFactor() * windowInMeters / 2;
        gl.glOrtho(-tal * aspect, tal * aspect, -tal, tal, near, far);