[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.241, 1.242 Display.java, 1.19, 1.20

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

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

Modified Files:
	View.java Display.java 
Log Message:
glos

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Display.java	3 Oct 2007 10:14:20 -0000	1.19
--- Display.java	3 Oct 2007 11:18:56 -0000	1.20
***************
*** 23,26 ****
--- 23,27 ----
  import javax.media.opengl.glu.GLUtessellatorCallbackAdapter;
  
+ import net.sourceforge.bprocessor.gl.model.GlObject;
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.ClippingPlane;
***************
*** 53,56 ****
--- 54,58 ----
    private static Geometric target;
    private static Collection<? extends Geometric> extras;
+   private static Collection<GlObject> glos;
    private static Grid grid;
    private static boolean intersecting;
***************
*** 216,219 ****
--- 218,229 ----
    
    /**
+    * Sets the glos
+    * @param value glos
+    */
+   public static void glos(Collection<GlObject> value) {
+     glos = value;
+   }
+   
+   /**
     * Sets the extras geometry
     * @param value Collection of geometrics
***************
*** 497,500 ****
--- 507,524 ----
    }
    
+   private static void drawGlos(Collection<GlObject> glos) {
+     for (GlObject current : glos) {
+       current.draw(gl);
+     }
+   }
+   
+   private static void selectGlos(Collection<GlObject> glos) {
+     for (GlObject current : glos) {
+       push(current);
+       current.draw(gl);
+       pop();
+     }
+   }
+   
    private static boolean transparent(Space space) {
      Project project = Project.getInstance();
***************
*** 769,772 ****
--- 793,802 ----
        
        if (selecting()) {
+         selectGlos(glos);
+       } else {
+         drawGlos(glos);
+       }
+       
+       if (selecting()) {
          selectClips(clips);
        }

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** View.java	3 Oct 2007 10:14:20 -0000	1.241
--- View.java	3 Oct 2007 11:18:56 -0000	1.242
***************
*** 713,716 ****
--- 713,717 ----
          extras.addAll(tempVertices);
          Display.extras(extras);
+         Display.glos(glObjects3D);
          Display.draw(gld);
          Display.selecting(false);