[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractPencil.java,1.26,1.27

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

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

Modified Files:
	AbstractPencil.java 
Log Message:
Coloring intersection-points

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AbstractPencil.java	3 May 2006 10:04:38 -0000	1.26
--- AbstractPencil.java	3 May 2006 11:01:27 -0000	1.27
***************
*** 23,26 ****
--- 23,27 ----
  import net.sourceforge.bprocessor.gl.GLView;
  import net.sourceforge.bprocessor.gl.model.Intersection;
+ import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
***************
*** 31,36 ****
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.Camera;
- import net.sourceforge.bprocessor.model.Entity;
- 
  
  import org.apache.log4j.Logger;
--- 32,35 ----
***************
*** 542,545 ****
--- 541,546 ----
      if (intersection != null) {
        Object target = null;
+       float[] targetColor = View.TARGET_COLOR;
+       
        Vertex current = intersection.vertex();
        switch (intersection.type()) {
***************
*** 551,557 ****
--- 552,560 ----
          if (edge.getConstructor()) {
            target = current;
+           targetColor = View.CONSTRUCTOR_COLOR;
          } else {
            target = intersection.object();
          }
+         
          break;
        case Intersection.SURFACE:
***************
*** 561,579 ****
        case Intersection.EDGE_MIDPOINT:
          target = current;
!         glv.getView().changeColor((Entity)target, new float[] {255.0f / 255.0f, 
!                                                                99.0f / 255.0f, 
!                                                                71.0f / 255.0f});
          break;
        case Intersection.EDGE_INTERSECTION:
          target = current;
!         glv.getView().changeColor((Entity)target, new float[] {118.0f / 255.0f, 
!                                                                238.0f / 255.0f, 
!                                                                0.0f});
          break;
        case Intersection.SURFACE_INTERSECTION:
          target = current;
!         glv.getView().changeColor((Entity)target, new float[] {30.0f / 255.0f,
!                                                                144.0f / 255.0f, 
!                                                                255.0f / 255.0f});
          break;
        case Intersection.PLANE_INTERSECTION:
--- 564,576 ----
        case Intersection.EDGE_MIDPOINT:
          target = current;
!         targetColor = View.EDGE_MIDPOINT_COLOR;
          break;
        case Intersection.EDGE_INTERSECTION:
          target = current;
!         targetColor = View.EDGE_INTERSECTION_COLOR;
          break;
        case Intersection.SURFACE_INTERSECTION:
          target = current;
!         targetColor = View.EDGE_INTERSECTION_COLOR;
          break;
        case Intersection.PLANE_INTERSECTION:
***************
*** 582,586 ****
          break;
        }
!       glv.getView().makeTarget(target);
      }
    }
--- 579,583 ----
          break;
        }
!       glv.getView().makeTarget(target, targetColor);
      }
    }