Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32397/src/net/sourceforge/bprocessor/model
Modified Files:
Camera.java Space.java Project.java
Log Message:
Fixed a couple of minor problems
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** Space.java 16 Nov 2006 23:29:10 -0000 1.102
--- Space.java 17 Nov 2006 15:47:28 -0000 1.103
***************
*** 1609,1622 ****
switch (level) {
case ELEMENT_LEVEL:
! res = "EL" + res;
break;
case PART_LEVEL:
! res = "PT" + res;
break;
case SPACE_LEVEL:
! res = "SP" + res;
break;
case NET_LEVEL:
! res = "NET" + res;
break;
}
--- 1609,1622 ----
switch (level) {
case ELEMENT_LEVEL:
! res = "Elm" + res;
break;
case PART_LEVEL:
! res = "Prt" + res;
break;
case SPACE_LEVEL:
! res = "Spc" + res;
break;
case NET_LEVEL:
! res = "Net" + res;
break;
}
Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Camera.java 13 Nov 2006 13:23:33 -0000 1.28
--- Camera.java 17 Nov 2006 15:47:28 -0000 1.29
***************
*** 105,108 ****
--- 105,126 ----
}
}
+
+ /**
+ *
+ * @param other Camera
+ */
+ public void copyfrom(Camera other) {
+ this.setCenter(new double[]{other.center[0], other.center[1], other.center[2]});
+ this.setCamera(new double[]{other.camera[0], other.camera[1], other.camera[2]});
+ this.setRoll(new double[]{other.roll[0], other.roll[1], other.roll[2]});
+ this.setType(other.getType());
+ this.setFocalwidth(other.getFocalwidth());
+ Iterator clips = other.getClipplanes().iterator();
+ this.clipplanes.clear();
+ while (clips.hasNext()) {
+ ClippingPlane clip = (ClippingPlane)clips.next();
+ this.addClipplane(clip);
+ }
+ }
/**
Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Project.java 17 Nov 2006 15:04:28 -0000 1.93
--- Project.java 17 Nov 2006 15:47:28 -0000 1.94
***************
*** 491,495 ****
*/
public void setCurrentCamera(Camera camera) {
! currentCamera = camera;
changed(this);
}
--- 491,495 ----
*/
public void setCurrentCamera(Camera camera) {
! currentCamera.copyfrom(camera);
changed(this);
}
|
