[Jrman-commit] drafts/src/org/jrman/primitive Primitive.java,1.17,1.18

[<ma...@us...>]

Update of /cvsroot/jrman/drafts/src/org/jrman/primitive
In directory sc8-pr-cvs1:/tmp/cvs-serv5923/src/org/jrman/primitive

Modified Files:
	Primitive.java 
Log Message:
Fixed displacement bound bugs.

Index: Primitive.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Primitive.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Primitive.java	7 Jun 2003 18:38:43 -0000	1.17
--- Primitive.java	16 Jul 2003 07:20:49 -0000	1.18
***************
*** 57,61 ****
      protected Bounds2f rasterBounds;
  
!     protected float screenDisplacement;
  
      protected float distance;
--- 57,63 ----
      protected Bounds2f rasterBounds;
  
!     protected float screenDisplacementWidth;
! 
!     protected float screenDisplacementHeight;
  
      protected float distance;
***************
*** 88,97 ****
      }
  
!     public void setScreenDisplacement(float sd) {
!         screenDisplacement = sd;
      }
  
!     public float getScreenDisplacement() {
!         return screenDisplacement;
      }
  
--- 90,107 ----
      }
  
!     public void setScreenDisplacementWidth(float sd) {
!         screenDisplacementWidth = sd;
      }
  
!     public float getScreenDisplacementWidth() {
!         return screenDisplacementWidth;
!     }
! 
!     public void setScreenDisplacementHeight(float sd) {
!         screenDisplacementHeight = sd;
!     }
! 
!     public float getScreenDisplacementHeight() {
!         return screenDisplacementHeight;
      }
  
***************
*** 491,496 ****
  
      public boolean isReadyToBeDiced(int gridSize) {
!         float width = rasterBounds.getWidth() - screenDisplacement * 2;
!         float height = rasterBounds.getHeight() - screenDisplacement * 2;
          boolean ready = width * height <= gridSize * attributes.getShadingRate();
          if (!ready)
--- 501,506 ----
  
      public boolean isReadyToBeDiced(int gridSize) {
!         float width = rasterBounds.getWidth() - screenDisplacementWidth;
!         float height = rasterBounds.getHeight() - screenDisplacementHeight;
          boolean ready = width * height <= gridSize * attributes.getShadingRate();
          if (!ready)