jrman-commit

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

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

Modified Files:
	RendererHidden.java 
Log Message:
Small changes...

Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** RendererHidden.java	7 Jun 2003 13:25:32 -0000	1.31
--- RendererHidden.java	7 Jun 2003 18:38:44 -0000	1.32
***************
*** 103,107 ****
          Transform cameraToScreen = Global.getTransform("screen");
          Transform screenToRaster = Global.getTransform("raster");
-         // cameraToRaster = screenToRaster.concat(cameraToScreen);
          if (cameraToScreen instanceof PerspectiveTransform)
              cameraToRaster = ((PerspectiveTransform) cameraToScreen).preConcat(screenToRaster);
--- 103,106 ----
***************
*** 182,186 ****
              cameraToRaster.transformPoint(ptmp2, ptmp2);
              vtmp.sub(ptmp1, ptmp2);
!             bounds = bv.toBounds2f(vtmp.length());
          } else {
              bounds = bv.toBounds2f();
--- 181,187 ----
              cameraToRaster.transformPoint(ptmp2, ptmp2);
              vtmp.sub(ptmp1, ptmp2);
!             float screenDisplacement = vtmp.length();
!             bounds = bv.toBounds2f(screenDisplacement);
!             primitive.setScreenDisplacement(screenDisplacement);
          } else {
              bounds = bv.toBounds2f();
***************
*** 204,208 ****
          if (check && row <= curRow) {
              float maxY = bounds.getMaxY() - rasterWindow.getMinY();
!             int maxRow = Calc.clamp((int) (maxY / bucketHeight), 0, bucketRows - 1);
              if (maxRow < curRow)
                  return;
--- 205,209 ----
          if (check && row <= curRow) {
              float maxY = bounds.getMaxY() - rasterWindow.getMinY();
!             int maxRow = Calc.clamp((int) Math.ceil(maxY / bucketHeight), 0, bucketRows - 1);
              if (maxRow < curRow)
                  return;
***************
*** 210,214 ****
              float maxX = bounds.getMaxX() - rasterWindow.getMinX();
              int maxColumn =
!                 Calc.clamp((int) (maxX / bucketWidth), 0, bucketColumns - 1);
              if (column <= curColumn && curColumn <= maxColumn) {
                  getBucket(curColumn, curRow).addPrimitive(primitive);
--- 211,215 ----
              float maxX = bounds.getMaxX() - rasterWindow.getMinX();
              int maxColumn =
!                 Calc.clamp((int) Math.ceil(maxX / bucketWidth), 0, bucketColumns - 1);
              if (column <= curColumn && curColumn <= maxColumn) {
                  getBucket(curColumn, curRow).addPrimitive(primitive);