[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java,1.39,1.40

[Nikolaj B. <nbr...@us...>]

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

Modified Files:
	View.java 
Log Message:
Updated so materials color now will be shown if a surface has a materil

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** View.java	10 Jan 2006 08:23:59 -0000	1.39
--- View.java	10 Jan 2006 13:38:54 -0000	1.40
***************
*** 1387,1397 ****
            if (side == FRONT) {
              // TODO Check the color of the front material of the Surface
!             Space back = s.getFrontDomain();
!             gl.glColor3fv(getSpaceColor(back));
            }
            if (side == BACK) {
              // TODO Check the color of the back material of the Surface
!             Space front = s.getBackDomain();
!             gl.glColor3fv(getSpaceColor(front));
            }
          }
--- 1387,1405 ----
            if (side == FRONT) {
              // TODO Check the color of the front material of the Surface
!             if (s.getFrontMaterial() == null) {            
!               Space back = s.getFrontDomain();
!               gl.glColor3fv(getSpaceColor(back));
!             } else {
!               gl.glColor3fv(s.getFrontMaterial().getColor().getRGBComponents(null));
!             }
            }
            if (side == BACK) {
              // TODO Check the color of the back material of the Surface
!             if (s.getBackMaterial() == null) {            
!               Space front = s.getBackDomain();
!               gl.glColor3fv(getSpaceColor(front));
!             } else {
!               gl.glColor3fv(s.getBackMaterial().getColor().getRGBComponents(null));
!             }
            }
          }