Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4394/src/net/sourceforge/bprocessor/gl/view
Modified Files:
AbstractView.java
Log Message:
Removed some usage of Domain
Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** AbstractView.java 11 Dec 2005 13:06:41 -0000 1.72
--- AbstractView.java 11 Dec 2005 17:58:32 -0000 1.73
***************
*** 17,21 ****
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Project;
- import net.sourceforge.bprocessor.model.Domain;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Vertex;
--- 17,20 ----
***************
*** 528,533 ****
Vertex from = surface.center();
Vertex front = transformation.project(from);
! Domain frontDomain = surface.getFrontDomain();
! Domain backDomain = surface.getBackDomain();
String frontName;
String backName;
--- 527,532 ----
Vertex from = surface.center();
Vertex front = transformation.project(from);
! Space frontDomain = surface.getFrontDomain();
! Space backDomain = surface.getBackDomain();
String frontName;
String backName;
***************
*** 1217,1222 ****
*/
private boolean isVisible(Surface surface) {
! Domain back = surface.getBackDomain();
! Domain front = surface.getFrontDomain();
if ((front instanceof FunctionalSpace) && (back instanceof FunctionalSpace)) {
return false;
--- 1216,1221 ----
*/
private boolean isVisible(Surface surface) {
! Space back = surface.getBackDomain();
! Space front = surface.getFrontDomain();
if ((front instanceof FunctionalSpace) && (back instanceof FunctionalSpace)) {
return false;
***************
*** 1234,1238 ****
* @return The color
*/
! private float[] getSpaceColor(Domain space) {
if (space == null) {
return noneColor;
--- 1233,1237 ----
* @return The color
*/
! private float[] getSpaceColor(Space space) {
if (space == null) {
return noneColor;
***************
*** 1266,1274 ****
if (isVisible(s)) {
if (side == FRONT) {
! Domain back = s.getBackDomain();
gl.glColor3fv(getSpaceColor(back));
}
if (side == BACK) {
! Domain front = s.getFrontDomain();
gl.glColor3fv(getSpaceColor(front));
}
--- 1265,1273 ----
if (isVisible(s)) {
if (side == FRONT) {
! Space back = s.getBackDomain();
gl.glColor3fv(getSpaceColor(back));
}
if (side == BACK) {
! Space front = s.getFrontDomain();
gl.glColor3fv(getSpaceColor(front));
}
|