[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.58, 1.59

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31125

Modified Files:
	Project.java 
Log Message:
added default cameras

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Project.java	24 May 2006 13:43:36 -0000	1.58
--- Project.java	16 Jun 2006 09:42:08 -0000	1.59
***************
*** 43,46 ****
--- 43,49 ----
    /** The cameras */
    private HashMap cameras = new HashMap();
+ 
+   /** The default un-changeable cameras */
+   private HashMap defaultCams = new HashMap();
    
    /** The domain id */
***************
*** 182,197 ****
      Camera cam0 = Camera.create(Camera.VIEW_3D); // The starting cam (copy of 3d cam)
      cam0.setId(new Long(cameraId++));
!     cam0.setName("default");
      cameras.put(cam0.getId(), cam0);
      Camera cam2 = Camera.create(Camera.VIEW_XY); // Reset to 2D position XY with ortho
      cam2.setId(new Long(cameraId++));
      cameras.put(cam2.getId(), cam2);
      Camera cam3 = Camera.create(Camera.VIEW_XZ); // Reset to 2D position XZ with ortho
      cam3.setId(new Long(cameraId++));
      cameras.put(cam3.getId(), cam3);
      Camera cam4 = Camera.create(Camera.VIEW_YZ); // Reset to 2D position YZ with ortho
      cam4.setId(new Long(cameraId++));
      cameras.put(cam4.getId(), cam4);
!     currentCamera = cam0;
    }
    
--- 185,204 ----
      Camera cam0 = Camera.create(Camera.VIEW_3D); // The starting cam (copy of 3d cam)
      cam0.setId(new Long(cameraId++));
!     cam0.setName("Main view");
      cameras.put(cam0.getId(), cam0);
+     defaultCams.put(cam0.getId(), cam0);
      Camera cam2 = Camera.create(Camera.VIEW_XY); // Reset to 2D position XY with ortho
      cam2.setId(new Long(cameraId++));
      cameras.put(cam2.getId(), cam2);
+     defaultCams.put(cam2.getId(), cam2);
      Camera cam3 = Camera.create(Camera.VIEW_XZ); // Reset to 2D position XZ with ortho
      cam3.setId(new Long(cameraId++));
      cameras.put(cam3.getId(), cam3);
+     defaultCams.put(cam3.getId(), cam3);
      Camera cam4 = Camera.create(Camera.VIEW_YZ); // Reset to 2D position YZ with ortho
      cam4.setId(new Long(cameraId++));
      cameras.put(cam4.getId(), cam4);
!     defaultCams.put(cam4.getId(), cam4);
!     currentCamera = new Camera(cam0, "Current");
    }
    
***************
*** 407,410 ****
--- 414,418 ----
    }
    
+   
    /**
     * Find all functional spaces
***************
*** 574,577 ****
--- 582,593 ----
      return new HashSet(cameras.values());
    }
+   
+   /**
+    * Get all default cameras
+    * @return The cameras
+    */
+   public Collection getDefaultCameras() {
+     return new HashSet(defaultCams.values());
+   }
  
   /**