Apophysis

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

Modified Files:
	Main.pas ControlPoint.pas Global.pas FormExport.pas 
	FormExport.dfm 
Log Message:
Density estimator controls for flam3 renderer added.

Index: Global.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Global.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Global.pas	2 Mar 2006 17:27:20 -0000	1.15
--- Global.pas	19 Mar 2006 22:36:16 -0000	1.16
***************
*** 128,131 ****
--- 128,132 ----
    ExportBatches, ExportOversample, ExportWidth, ExportHeight, ExportFileFormat: Integer;
    ExportFilter, ExportDensity: Double;
+   ExportEstimator, ExportEstimatorMin, ExportEstimatorCurve, ExportJitters: double;
    OpenFileType: TFileType;
    ResizeOnLoad: Boolean;

Index: FormExport.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/FormExport.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FormExport.dfm	29 Apr 2005 23:02:04 -0000	1.2
--- FormExport.dfm	19 Mar 2006 22:36:16 -0000	1.3
***************
*** 4,9 ****
    BorderStyle = bsDialog
    Caption = 'Export Flame'
!   ClientHeight = 270
!   ClientWidth = 424
    Color = clBtnFace
    Font.Charset = DEFAULT_CHARSET
--- 4,9 ----
    BorderStyle = bsDialog
    Caption = 'Export Flame'
!   ClientHeight = 325
!   ClientWidth = 419
    Color = clBtnFace
    Font.Charset = DEFAULT_CHARSET
***************
*** 18,24 ****
    TextHeight = 13
    object btnOK: TButton
!     Left = 336
!     Top = 178
!     Width = 75
      Height = 25
      Caption = '&OK'
--- 18,24 ----
    TextHeight = 13
    object btnOK: TButton
!     Left = 326
!     Top = 182
!     Width = 89
      Height = 25
      Caption = '&OK'
***************
*** 29,35 ****
    end
    object btnCancel: TButton
!     Left = 336
      Top = 210
!     Width = 75
      Height = 25
      Caption = 'Cancel'
--- 29,35 ----
    end
    object btnCancel: TButton
!     Left = 326
      Top = 210
!     Width = 89
      Height = 25
      Caption = 'Cancel'
***************
*** 42,46 ****
      Width = 408
      Height = 57
!     Caption = 'Destination'
      TabOrder = 2
      object btnBrowse: TSpeedButton
--- 42,46 ----
      Width = 408
      Height = 57
!     Caption = '  Destination  '
      TabOrder = 2
      object btnBrowse: TSpeedButton
***************
*** 109,113 ****
      Width = 200
      Height = 105
!     Caption = 'Rendering'
      TabOrder = 3
      object Label3: TLabel
--- 109,113 ----
      Width = 200
      Height = 105
!     Caption = '  Quality  '
      TabOrder = 3
      object Label3: TLabel
***************
*** 175,179 ****
      Width = 200
      Height = 105
!     Caption = 'Size'
      TabOrder = 4
      object Label1: TLabel
--- 175,179 ----
      Width = 200
      Height = 105
!     Caption = '  Size  '
      TabOrder = 4
      object Label1: TLabel
***************
*** 242,247 ****
      Top = 176
      Width = 313
!     Height = 89
!     Caption = 'hqi/flam3'
      TabOrder = 5
      object Label6: TLabel
--- 242,247 ----
      Top = 176
      Width = 313
!     Height = 145
!     Caption = '  flam3 parameters  '
      TabOrder = 5
      object Label6: TLabel
***************
*** 266,269 ****
--- 266,300 ----
        Caption = 'Strips:'
      end
+     object Label9: TLabel
+       Left = 8
+       Top = 88
+       Width = 43
+       Height = 13
+       Caption = 'Estimator'
+     end
+     object Label11: TLabel
+       Left = 8
+       Top = 112
+       Width = 49
+       Height = 25
+       Caption = 'Estimator min.'
+       WordWrap = True
+     end
+     object Label12: TLabel
+       Left = 160
+       Top = 80
+       Width = 57
+       Height = 25
+       Caption = 'Estimator curve'
+       WordWrap = True
+     end
+     object Label13: TLabel
+       Left = 160
+       Top = 112
+       Width = 57
+       Height = 25
+       Caption = 'Temporal samples'
+       WordWrap = True
+     end
      object txtBatches: TEdit
        Left = 64
***************
*** 330,333 ****
--- 361,400 ----
        TabOrder = 5
      end
+     object txtJitters: TEdit
+       Left = 224
+       Top = 116
+       Width = 57
+       Height = 21
+       TabOrder = 6
+       Text = '1'
+       OnChange = txtJittersChange
+     end
+     object txtEstimator: TEdit
+       Left = 64
+       Top = 84
+       Width = 57
+       Height = 21
+       TabOrder = 7
+       Text = '5'
+       OnChange = txtEstimatorChange
+     end
+     object txtEstimatorMin: TEdit
+       Left = 64
+       Top = 116
+       Width = 57
+       Height = 21
+       TabOrder = 8
+       Text = '0'
+       OnChange = txtEstimatorMinChange
+     end
+     object txtEstimatorCurve: TEdit
+       Left = 224
+       Top = 84
+       Width = 57
+       Height = 21
+       TabOrder = 9
+       Text = '0.6'
+       OnChange = txtEstimatorCurveChange
+     end
    end
    object SaveDialog: TSaveDialog

Index: FormExport.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/FormExport.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FormExport.pas	25 Mar 2005 08:35:39 -0000	1.1
--- FormExport.pas	19 Mar 2006 22:36:16 -0000	1.2
***************
*** 57,60 ****
--- 57,68 ----
      txtStrips: TEdit;
      udStrips: TUpDown;
+     Label9: TLabel;
+     Label11: TLabel;
+     Label12: TLabel;
+     Label13: TLabel;
+     txtJitters: TEdit;
+     txtEstimator: TEdit;
+     txtEstimatorMin: TEdit;
+     txtEstimatorCurve: TEdit;
      procedure btnBrowseClick(Sender: TObject);
      procedure FormShow(Sender: TObject);
***************
*** 68,78 ****
      procedure txtBatchesChange(Sender: TObject);
      procedure cmbDepthChange(Sender: TObject);
    private
!     { Private declarations }
    public
      Filename: string;
      ImageWidth, ImageHeight, Oversample, Batches, Strips: Integer;
      Sample_Density, Filter_Radius: double;
!     { Public declarations }
    end;
  
--- 76,90 ----
      procedure txtBatchesChange(Sender: TObject);
      procedure cmbDepthChange(Sender: TObject);
+     procedure txtEstimatorChange(Sender: TObject);
+     procedure txtEstimatorMinChange(Sender: TObject);
+     procedure txtEstimatorCurveChange(Sender: TObject);
+     procedure txtJittersChange(Sender: TObject);
    private
!     FloatFormatSettings: TFormatSettings;
    public
      Filename: string;
      ImageWidth, ImageHeight, Oversample, Batches, Strips: Integer;
      Sample_Density, Filter_Radius: double;
!     Estimator, EstimatorMin, EstimatorCurve, Jitters: double;
    end;
  
***************
*** 123,126 ****
--- 135,148 ----
    udOversample.Position := Oversample;
    Ratio := ImageWidth / ImageHeight;
+   Estimator := 5.0;
+   EstimatorMin := 0.0;
+   EstimatorCurve := 0.6;
+   Jitters := 1;
+   txtEstimator.Text := '5.0';
+   txtEstimatorMin.Text := '0.0';
+   txtEstimatorCurve.Text := '0.6';
+   txtJitters.Text := '1';
+ 
+   GetLocaleFormatSettings(LOCALE_SYSTEM_DEFAULT, FloatFormatSettings);
  end;
  
***************
*** 213,216 ****
--- 235,274 ----
  end;
  
+ procedure TExportDialog.txtEstimatorChange(Sender: TObject);
+ begin
+   Estimator := 0;
+   try
+     Estimator := StrToFloat(txtEstimator.Text, FloatFormatSettings);
+   except
+   end;
+ end;
+ 
+ procedure TExportDialog.txtEstimatorMinChange(Sender: TObject);
+ begin
+   EstimatorMin := 0;
+   try
+     EstimatorMin := StrToFloat(txtEstimatorMin.Text, FloatFormatSettings);
+   except
+   end;
+ end;
+ 
+ procedure TExportDialog.txtEstimatorCurveChange(Sender: TObject);
+ begin
+   EstimatorCurve := 0;
+   try
+     EstimatorCurve := StrToFloat(txtEstimatorCurve.Text, FloatFormatSettings);
+   except
+   end;
+ end;
+ 
+ procedure TExportDialog.txtJittersChange(Sender: TObject);
+ begin
+   Jitters := 0;
+   try
+     Jitters := StrToFloat(txtJitters.Text, FloatFormatSettings);
+   except
+   end;
+ end;
+ 
  end.
  

Index: Main.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Main.pas	18 Mar 2006 18:12:59 -0000	1.36
--- Main.pas	19 Mar 2006 22:36:16 -0000	1.37
***************
*** 1330,1334 ****
        format('brightness="%g" ', [cp1.brightness]) +
        format('gamma="%g" ', [cp1.gamma]) +
!       format('vibrancy="%g" ', [cp1.vibrancy]) + hue + url + nick + '>');
  
     { Write transform parameters }
--- 1330,1339 ----
        format('brightness="%g" ', [cp1.brightness]) +
        format('gamma="%g" ', [cp1.gamma]) +
!       format('vibrancy="%g" ', [cp1.vibrancy]) +
!       format('estimator="%g" ', [cp1.estimator]) +
!       format('estimator_minimum="%g" ', [cp1.estimator_min]) +
!       format('estimator_curve="%g" ', [cp1.estimator_curve]) +
!       format('temporal_samples="%g" ', [cp1.jitters]) +
!       hue + url + nick + '>');
  
     { Write transform parameters }
***************
*** 3619,3623 ****
    if (MainCp.NumXForms > 12) or
       (MainCP.HasNewVariants) then begin
!     showMessage('This flame will not be correctly rendered this way. Please use the internal renderer.');
    end;
  
--- 3624,3631 ----
    if (MainCp.NumXForms > 12) or
       (MainCP.HasNewVariants) then begin
!     showMessage('WARNING: This flame will not be correctly rendered '#10#13+
!                 'by the flam3 version < 2.7b4.'#10#13+
!                 'Please use the 2.7b4 version or newer '#10#13+
!                 'or use the internal renderer.');
    end;
  
***************
*** 3662,3665 ****
--- 3670,3677 ----
        ExportOversample := ExportDialog.Oversample;
        ExportBatches := ExportDialog.Batches;
+       ExportEstimator := ExportDialog.Estimator;
+       ExportEstimatorMin := ExportDialog.EstimatorMin;
+       ExportEstimatorCurve := ExportDialog.EstimatorCurve;
+       ExportJitters := ExportDialog.Jitters;
        cp1.sample_density := ExportDensity;
        cp1.spatial_oversample := ExportOversample;
***************
*** 3668,3671 ****
--- 3680,3687 ----
        if (cp1.width <> ExportWidth) or (cp1.Height <> ExportHeight) then
          cp1.AdjustScale(ExportWidth, ExportHeight);
+       cp1.estimator := ExportEstimator;
+       cp1.estimator_min := ExportEstimatorMin;
+       cp1.estimator_curve := ExportEstimatorCurve;
+       cp1.jitters := ExportJitters;
        FileList.Text := FlameToXML(cp1, false);
        FileList.SaveToFile(ChangeFileExt(ExportDialog.Filename, '.flame'));

Index: ControlPoint.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ControlPoint.pas,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ControlPoint.pas	18 Mar 2006 18:12:59 -0000	1.24
--- ControlPoint.pas	19 Mar 2006 22:36:16 -0000	1.25
***************
*** 125,128 ****
--- 125,130 ----
      wiggle: array[0..1, 0..1] of double; // frequency is /minute, assuming 30 frames/s */
  
+     estimator, estimator_min, estimator_curve, jitters: double; // density estimator.
+ 
      PropTable: array of TXForm;//Integer;
      FAngle: Double;