[Apophysis-cvs-commits] 2.10/Source Render64MT.pas, 1.8, 1.9 RenderMM_MT.pas, 1.7, 1.8

[Peter S. <zu...@us...>]

Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29877/Source

Modified Files:
	Render64MT.pas RenderMM_MT.pas 
Log Message:
fixed bugs in memory-limited rendering

Index: Render64MT.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Render64MT.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Render64MT.pas	5 Apr 2006 11:01:07 -0000	1.8
--- Render64MT.pas	3 Jun 2006 02:14:50 -0000	1.9
***************
*** 238,242 ****
    bc : integer;
  begin
!   nsamples := Round(sample_density * bucketSize / (oversample * oversample));
    FNrBatches := Round(nsamples / (fcp.nbatches * SUB_BATCH_SIZE));
    batchcounter := 0;
--- 238,242 ----
    bc : integer;
  begin
!   nsamples := Round(sample_density * NrSlices * bucketSize / (oversample * oversample));
    FNrBatches := Round(nsamples / (fcp.nbatches * SUB_BATCH_SIZE));
    batchcounter := 0;

Index: RenderMM_MT.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/RenderMM_MT.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RenderMM_MT.pas	5 Apr 2006 11:01:07 -0000	1.7
--- RenderMM_MT.pas	3 Jun 2006 02:14:50 -0000	1.8
***************
*** 98,103 ****
      cosa := cos(FCP.FAngle);
      sina := sin(FCP.FAngle);
!     rcX := image_Center_X*(1 - cosa) - image_Center_X*sina - camX0;
!     rcY := image_Center_Y*(1 - cosa) + image_Center_Y*sina - camY0;
    end;
  end;
--- 98,103 ----
      cosa := cos(FCP.FAngle);
      sina := sin(FCP.FAngle);
!     rcX := image_Center_X*(1 - cosa) - image_Center_Y*sina - camX0;
!     rcY := image_Center_Y*(1 - cosa) + image_Center_X*sina - camY0;
    end;
  end;
***************
*** 208,212 ****
    FImageMaker.Init;
  
!   fcp.sample_density := fcp.sample_density * nrslices;
    fcp.height := fcp.height div nrslices;
    center_y := fcp.center[1];
--- 208,212 ----
    FImageMaker.Init;
  
!   //fcp.sample_density := fcp.sample_density * nrslices;
    fcp.height := fcp.height div nrslices;
    center_y := fcp.center[1];
***************
*** 237,241 ****
    end;
  
!   fcp.sample_density := fcp.sample_density / nrslices;
    fcp.height := fcp.height * nrslices;
  end;
--- 237,241 ----
    end;
  
!   //fcp.sample_density := fcp.sample_density / nrslices;
    fcp.height := fcp.height * nrslices;
  end;