Apophysis

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

Modified Files:
	ScriptForm.dfm ScriptForm.pas 
Log Message:
more parameter strings,
pivot is now an "object"

Index: ScriptForm.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.dfm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ScriptForm.dfm	9 Dec 2006 23:21:41 -0000	1.11
--- ScriptForm.dfm	12 Dec 2006 11:33:50 -0000	1.12
***************
*** 21,25 ****
    object Splitter1: TSplitter
      Left = 0
!     Top = 244
      Width = 531
      Height = 4
--- 21,25 ----
    object Splitter1: TSplitter
      Left = 0
!     Top = 250
      Width = 531
      Height = 4
***************
*** 31,35 ****
      Top = 0
      Width = 23
!     Height = 244
      Align = alRight
      AutoSize = True
--- 31,35 ----
      Top = 0
      Width = 23
!     Height = 250
      Align = alRight
      AutoSize = True
***************
*** 97,101 ****
    object StatusBar: TStatusBar
      Left = 0
!     Top = 337
      Width = 531
      Height = 19
--- 97,101 ----
    object StatusBar: TStatusBar
      Left = 0
!     Top = 343
      Width = 531
      Height = 19
***************
*** 107,111 ****
      Top = 0
      Width = 508
!     Height = 244
      Align = alClient
      BevelInner = bvLowered
--- 107,111 ----
      Top = 0
      Width = 508
!     Height = 250
      Align = alClient
      BevelInner = bvLowered
***************
*** 117,121 ****
        Top = 2
        Width = 504
!       Height = 240
        Cursor = crIBeam
        PopupMenu = PopupMenu
--- 117,121 ----
        Top = 2
        Width = 504
!       Height = 246
        Cursor = crIBeam
        PopupMenu = PopupMenu
***************
*** 137,142 ****
        BkColor = clWindow
        BorderStyle = bsNone
-       CodeFolding.Enabled = False
-       CodeFolding.LineColor = clGray
        Ctl3D = False
        DelErase = True
--- 137,140 ----
***************
*** 148,151 ****
--- 146,154 ----
        Gutter.Font.Name = 'Courier New'
        Gutter.Font.Style = []
+       Gutter.LineNumberStart = 1
+       Gutter.LineNumberTextColor = clBlack
+       Gutter.ShowLineNumbers = True
+       Gutter.Visible = True
+       Gutter.ShowLeadingZeros = False
        Font.Charset = DEFAULT_CHARSET
        Font.Color = clBlack
***************
*** 189,193 ****
        UrlStyle.Style = [fsUnderline]
        UseStyler = True
!       Version = '2.0.0.1'
        WordWrap = wwNone
        OnChange = EditorChange
--- 192,196 ----
        UrlStyle.Style = [fsUnderline]
        UseStyler = True
!       Version = '1.6.0.17'
        WordWrap = wwNone
        OnChange = EditorChange
***************
*** 196,200 ****
    object Console: TMemo
      Left = 0
!     Top = 248
      Width = 531
      Height = 89
--- 199,203 ----
    object Console: TMemo
      Left = 0
!     Top = 254
      Width = 531
      Height = 89
***************
*** 360,363 ****
--- 363,367 ----
      AutoCompletion.Strings = (
        'ShowMessage'
+       'InputQuery'
        ''
        'RotateFlame'
***************
*** 397,406 ****
        'VariationIndex'
        'VariationName'
-       'GetPivotMode'
-       'SetPivotMode'
-       'GetPivotX'
-       'GetPivotY'
-       'SetPivot'
-       'ResetPivot'
        'CalculateScale'
        'CalculateBounds'
--- 401,404 ----
***************
*** 499,502 ****
--- 497,506 ----
        'ExportRenderer'
        ''
+       'Pivot'
+       ''
+       'Mode'
+       'Set'
+       'Reset'
+       ''
        'PI'
        'NVARS'
***************
*** 558,572 ****
          'InputQuery(const Caption: string; const Prompt: string; var Valu' +
          'e: string)'
-       'Translate(X: integer, Y: integer)'
-       'Rotate(Angle: double)'
-       'SetActiveTransform(TransformNumber: integer);'
-       'ListFile(const filename: string)'
        'DeleteFile(const filename: string)'
        'LoadFlame(FlameNumber: integer)'
        'SetActiveTransform(TransformNumber: integer)'
        'ShowStatus(const Text: string)'
!       'RotateReference(Angle: double)'
!       'Scale(Scale: double)'
!       'SaveFlame(const filename: string)')
      HexIdentifier = '$'
      Description = 'Pascal'
--- 562,591 ----
          'InputQuery(const Caption: string; const Prompt: string; var Valu' +
          'e: string)'
        'DeleteFile(const filename: string)'
+       'RotateFlame(Angle: double)'
+       'RotateReference(Angle: double)'
+       'Rotate(Angle: double)'
+       'Multiply(a00: double, a01: double, a10: double, a11: double)'
+       'StoreFlame(FlameNumber: integer)'
+       'GetFlame(FlameNumber: integer)'
        'LoadFlame(FlameNumber: integer)'
+       'Scale(Scale: double)'
+       'Translate(X: double, Y: double)'
        'SetActiveTransform(TransformNumber: integer)'
+       'Print(something_printable)'
+       'AddSymmetry(symmetry_type: integer)'
+       
+         'Morph(FlameNumber1: integer, FlameNumber2: integer, Time: double' +
+         ')'
+       'SetFlameFile(const filename: string)'
+       'ListFile(const filename: string)'
+       'SaveFlame(const filename: string)'
        'ShowStatus(const Text: string)'
!       'RandomFlame(randomness_type: integer)'
!       'SaveGradient(Title: string, FileName: string)'
!       'SetVariation(Number: integer)'
!       'VariationIndex(var_name: string): integer'
!       'VariationName(var_index: integer): string'
!       'CopyFile(Source: string, Destination: string)')
      HexIdentifier = '$'
      Description = 'Pascal'
***************
*** 575,625 ****
      StylerName = 'Pascal'
      Extensions = 'pas;dpr;dpk;inc'
-     RegionDefinitions = <
-       item
-         Identifier = 'procedure'
-         RegionStart = 'begin'
-         RegionEnd = 'end'
-         RegionType = rtClosed
-         ShowComments = False
-       end
-       item
-         Identifier = 'interface'
-         RegionStart = 'interface'
-         RegionType = rtOpen
-         ShowComments = False
-       end
-       item
-         Identifier = 'unit'
-         RegionStart = 'unit'
-         RegionType = rtFile
-         ShowComments = False
-       end
-       item
-         Identifier = 'implementation'
-         RegionStart = 'implementation'
-         RegionType = rtOpen
-         ShowComments = False
-       end
-       item
-         Identifier = 'case'
-         RegionStart = 'case'
-         RegionEnd = 'end'
-         RegionType = rtIgnore
-         ShowComments = False
-       end
-       item
-         Identifier = 'function'
-         RegionStart = 'begin'
-         RegionEnd = 'end'
-         RegionType = rtClosed
-         ShowComments = False
-       end
-       item
-         Identifier = '{$region'
-         RegionStart = '{$region'
-         RegionEnd = '{$endregion'
-         RegionType = rtClosed
-         ShowComments = False
-       end>
      Left = 328
      Top = 32
--- 594,597 ----

Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ScriptForm.pas	9 Dec 2006 23:09:36 -0000	1.30
--- ScriptForm.pas	12 Dec 2006 11:33:50 -0000	1.31
***************
*** 57,60 ****
--- 57,63 ----
      Filename: string;
    end;
+   TPivot = class
+   public
+   end;
    TScriptEditor = class(TForm)
      MainOpenDialog: TOpenDialog;
***************
*** 107,110 ****
--- 110,114 ----
      Flame: TFlame;
      Options: TOptions;
+     Pivot: TPivot;
      Renderer: TScriptRender;
      Another: TScriptRender;
***************
*** 205,208 ****
--- 209,213 ----
      procedure SetRenderMaxMemoryProc(AMachine: TatVirtualMachine);
      procedure FillFileList;
+ 
      { Options interface }
      procedure GetJPEGQuality(AMachine: TatVirtualMachine);
***************
*** 300,303 ****
--- 305,319 ----
      procedure GetExportPath(AMachine: TatVirtualMachine);
      procedure SetExportPath(AMachine: TatVirtualMachine);
+ 
+     { Pivot interface }
+     procedure GetPivotModeProc(AMachine: TatVirtualMachine);
+     procedure SetPivotModeProc(AMachine: TatVirtualMachine);
+     procedure GetPivotXProc(AMachine: TatVirtualMachine);
+     procedure SetPivotXProc(AMachine: TatVirtualMachine);
+     procedure GetPivotYProc(AMachine: TatVirtualMachine);
+     procedure SetPivotYProc(AMachine: TatVirtualMachine);
+     procedure SetPivotProc(AMachine: TatVirtualMachine);
+     procedure ResetPivotProc(AMachine: TatVirtualMachine);
+ 
    end;
    TTransform = class
***************
*** 372,376 ****
      procedure MulProc(AMachine: TatVirtualMachine);
      procedure TranslateProc(AMachine: TatVirtualMachine);
!     procedure ActiveTransformProc(AMachine: TatVirtualMachine);
      procedure SetActiveTransformProc(AMachine: TatVirtualMachine);
      procedure TransformsProc(AMachine: TatVirtualMachine);
--- 388,392 ----
      procedure MulProc(AMachine: TatVirtualMachine);
      procedure TranslateProc(AMachine: TatVirtualMachine);
!     procedure GetActiveTransformProc(AMachine: TatVirtualMachine);
      procedure SetActiveTransformProc(AMachine: TatVirtualMachine);
      procedure TransformsProc(AMachine: TatVirtualMachine);
***************
*** 399,416 ****
      procedure GetVariation(AMachine: TatVirtualMachine);
      procedure SetVariation(AMachine: TatVirtualMachine);
! {
!     procedure GetVariable(AMachine: TatVirtualMachine);
!     procedure SetVariable(AMachine: TatVirtualMachine);
!     procedure GetVariableStr(AMachine: TatVirtualMachine);
!     procedure SetVariableStr(AMachine: TatVirtualMachine);
! }
      procedure VariationIndexProc(AMachine: TatVirtualMachine);
      procedure VariationNameProc(AMachine: TatVirtualMachine);
-     procedure GetPivotModeProc(AMachine: TatVirtualMachine);
-     procedure SetPivotModeProc(AMachine: TatVirtualMachine);
-     procedure GetPivotXProc(AMachine: TatVirtualMachine);
-     procedure GetPivotYProc(AMachine: TatVirtualMachine);
-     procedure SetPivotProc(AMachine: TatVirtualMachine);
-     procedure ResetPivotProc(AMachine: TatVirtualMachine);
  
      procedure CalculateScale(AMachine: TatVirtualMachine);
--- 415,421 ----
      procedure GetVariation(AMachine: TatVirtualMachine);
      procedure SetVariation(AMachine: TatVirtualMachine);
! 
      procedure VariationIndexProc(AMachine: TatVirtualMachine);
      procedure VariationNameProc(AMachine: TatVirtualMachine);
  
      procedure CalculateScale(AMachine: TatVirtualMachine);
***************
*** 1195,1199 ****
    Scripter.DefineMethod('Scale', 1, tkNone, nil, ScaleProc);
    Scripter.DefineMethod('Translate', 2, tkNone, nil, TranslateProc);
!   Scripter.DefineMethod('ActiveTransform', 0, tkInteger, nil, ActiveTransformProc);
    Scripter.DefineMethod('SetActiveTransform', 1, tkInteger, nil, SetActiveTransformProc);
    Scripter.DefineMethod('Transforms', 0, tkInteger, nil, TransformsProc);
--- 1200,1205 ----
    Scripter.DefineMethod('Scale', 1, tkNone, nil, ScaleProc);
    Scripter.DefineMethod('Translate', 2, tkNone, nil, TranslateProc);
! //  Scripter.DefineMethod('ActiveTransform', 0, tkInteger, nil, GetActiveTransformProc);
!   Scripter.DefineProp('ActiveTransform', tkInteger, GetActiveTransformProc, SetActiveTransformProc);
    Scripter.DefineMethod('SetActiveTransform', 1, tkInteger, nil, SetActiveTransformProc);
    Scripter.DefineMethod('Transforms', 0, tkInteger, nil, TransformsProc);
***************
*** 1219,1239 ****
    Scripter.DefineMethod('Variation', 0, tkInteger, nil, GetVariation);
    Scripter.DefineMethod('SetVariation', 1, tkInteger, nil, SetVariation);
! {
!   Scripter.DefineMethod('GetVariable', 1, tkFloat, nil, GetVariable);
!   Scripter.DefineMethod('SetVariable', 2, tkNone, nil, SetVariable);
!   Scripter.DefineMethod('GetVariableStr', 1, tkFloat, nil, GetVariableStr);
!   Scripter.DefineMethod('SetVariableStr', 2, tkNone, nil, SetVariableStr);
! }
    Scripter.AddConstant('ProgramVersionString', AppVersionString);
    Scripter.DefineMethod('VariationIndex', 1, tkInteger, nil, VariationIndexProc);
    Scripter.DefineMethod('VariationName', 1, tkString, nil, VariationNameProc);
  
-   Scripter.DefineMethod('GetPivotMode', 0, tkInteger, nil, GetPivotModeProc);
-   Scripter.DefineMethod('SetPivotMode', 1, tkNone, nil, SetPivotModeProc);
-   Scripter.DefineMethod('GetPivotX', 0, tkFloat, nil, GetPivotXProc);
-   Scripter.DefineMethod('GetPivotY', 0, tkFloat, nil, GetPivotYProc);
-   Scripter.DefineMethod('SetPivot', 2, tkNone, nil, SetPivotProc);
-   Scripter.DefineMethod('ResetPivot', 0, tkNone, nil, ResetPivotProc);
- 
    Scripter.DefineMethod('CalculateScale', 0, tkNone, nil, CalculateScale);
    Scripter.DefineMethod('CalculateBounds', 0, tkNone, nil, CalculateBounds);
--- 1225,1233 ----
    Scripter.DefineMethod('Variation', 0, tkInteger, nil, GetVariation);
    Scripter.DefineMethod('SetVariation', 1, tkInteger, nil, SetVariation);
! 
    Scripter.AddConstant('ProgramVersionString', AppVersionString);
    Scripter.DefineMethod('VariationIndex', 1, tkInteger, nil, VariationIndexProc);
    Scripter.DefineMethod('VariationName', 1, tkString, nil, VariationNameProc);
  
    Scripter.DefineMethod('CalculateScale', 0, tkNone, nil, CalculateScale);
    Scripter.DefineMethod('CalculateBounds', 0, tkNone, nil, CalculateBounds);
***************
*** 1743,1747 ****
  end;
  
! procedure TOperationLibrary.ActiveTransformProc(AMachine: TatVirtualMachine);
  begin
    with AMachine do
--- 1737,1741 ----
  end;
  
! procedure TOperationLibrary.GetActiveTransformProc(AMachine: TatVirtualMachine);
  begin
    with AMachine do
***************
*** 1785,1848 ****
  end;
  
- (*
- procedure TOperationLibrary.SetVariable(AMachine: TatVirtualMachine);
- var
-   vb: double;
-   v: Variant;
- begin
-   with AMachine do
-   begin
-     v := GetInputArg(0);
-     vb := GetInputArgAsFloat(1);
-     if varType(v) and varTypeMask = varByte then begin
-       ScriptEditor.cp.xform[ActiveTransform].SetVariable(GetVariableNameAt(Integer(v)), vb);
-     end
-     else if varType(v) and varTypeMask = varString then begin
-       ScriptEditor.cp.xform[ActiveTransform].SetVariable(String(v), vb);
-     end;
-     // else error...?
-   end
- end;
- 
- procedure TOperationLibrary.GetVariable(AMachine: TatVirtualMachine);
- var
-   i: integer;
-   vb: double;
- begin
-   with AMachine do
-   begin
-     i := GetInputArgAsInteger(0);
-     ScriptEditor.cp.xform[ActiveTransform].GetVariable(GetVariableNameAt(i), vb);
-     ReturnOutputArg(vb);
-   end
- end;
- 
- procedure TOperationLibrary.GetVariableStr(AMachine: TatVirtualMachine);
- var
-   variable: string;
-   vb: double;
- begin
-   with AMachine do
-   begin
-     variable := GetInputArgAsString(0);
-     ScriptEditor.cp.xform[ActiveTransform].GetVariable(variable, vb);
-     ReturnOutputArg(vb);
-   end
- end;
- 
- procedure TOperationLibrary.SetVariableStr(AMachine: TatVirtualMachine);
- var
-   variable: string;
-   vb: double;
- begin
-   with AMachine do
-   begin
-     variable := GetInputArgAsString(0);
-     vb := GetInputArgAsFloat(1);
-     ScriptEditor.cp.xform[ActiveTransform].SetVariable(variable, vb);
-   end
- end;
- *)
- 
  procedure TOperationLibrary.VariationIndexProc(AMachine: TatVirtualMachine);
  var
--- 1779,1782 ----
***************
*** 2093,2155 ****
  end;
  
- procedure TOperationLibrary.GetPivotModeProc(AMachine: TatVirtualMachine);
- begin
-   AMachine.ReturnOutputArg(Integer(EditForm.PivotMode));
- end;
- 
- procedure TOperationLibrary.SetPivotModeProc(AMachine: TatVirtualMachine);
- var
-   n: integer;
- begin
-   n := AMachine.GetInputArgAsInteger(0);
-   if n = 0 then
-     EditForm.PivotMode := pivotLocal
-   else
-     EditForm.PivotMode := pivotWorld;
- end;
- 
- procedure TOperationLibrary.GetPivotXProc(AMachine: TatVirtualMachine);
- var
-   px, py: double;
- begin
- //  EditForm.ScriptGetPivot(px, py);
- //  AMachine.ReturnOutputArg(px);
-   if EditForm.PivotMode = pivotLocal then
-     AMachine.ReturnOutputArg(EditForm.LocalPivot.x)
-   else
-     AMachine.ReturnOutputArg(EditForm.WorldPivot.x);
- end;
- 
- procedure TOperationLibrary.GetPivotYProc(AMachine: TatVirtualMachine);
- var
-   px, py: double;
- begin
- //  EditForm.ScriptGetPivot(px, py);
- //  AMachine.ReturnOutputArg(py);
-   if EditForm.PivotMode = pivotLocal then
-     AMachine.ReturnOutputArg(EditForm.LocalPivot.y)
-   else
-     AMachine.ReturnOutputArg(EditForm.WorldPivot.y);
- end;
- 
- procedure TOperationLibrary.SetPivotProc(AMachine: TatVirtualMachine);
- begin
-   with AMachine do begin
-     if EditForm.PivotMode = pivotLocal then begin
-       EditForm.LocalPivot.x := GetInputArgAsFloat(0);
-       EditForm.LocalPivot.y := GetInputArgAsFloat(1);
-     end
-     else begin
-       EditForm.WorldPivot.x := GetInputArgAsFloat(0);
-       EditForm.WorldPivot.y := GetInputArgAsFloat(1);
-     end;  
-   end;
- end;
- 
- procedure TOperationLibrary.ResetPivotProc(AMachine: TatVirtualMachine);
- begin
-   EditForm.btnResetPivotClick(nil);
- end;
- 
  { ******************************** Math Library ****************************** }
  
--- 2027,2030 ----
***************
*** 2226,2229 ****
--- 2101,2105 ----
    Flame := TFlame.Create;
    Options := TOptions.Create;
+   Pivot := TPivot.Create;
    Renderer := TScriptRender.create;
    Another := TScriptRender.create;
***************
*** 2247,2250 ****
--- 2123,2127 ----
    Transform.Free;
    Options.Free;
+   Pivot.Free;
  end;
  
***************
*** 3097,3100 ****
--- 2974,3050 ----
  end;
  
+ { **************************************************************************** }
+ 
+ procedure TScriptEditor.GetPivotModeProc(AMachine: TatVirtualMachine);
+ begin
+   AMachine.ReturnOutputArg(Integer(EditForm.PivotMode));
+ end;
+ 
+ procedure TScriptEditor.SetPivotModeProc(AMachine: TatVirtualMachine);
+ var
+   n: integer;
+ begin
+   n := AMachine.GetInputArgAsInteger(0);
+   if n = 0 then
+     EditForm.PivotMode := pivotLocal
+   else
+     EditForm.PivotMode := pivotWorld;
+ end;
+ 
+ procedure TScriptEditor.GetPivotXProc(AMachine: TatVirtualMachine);
+ begin
+ //  EditForm.ScriptGetPivot(px, py);
+ //  AMachine.ReturnOutputArg(px);
+   if EditForm.PivotMode = pivotLocal then
+     AMachine.ReturnOutputArg(EditForm.LocalPivot.x)
+   else
+     AMachine.ReturnOutputArg(EditForm.WorldPivot.x);
+ end;
+ 
+ procedure TScriptEditor.SetPivotXProc(AMachine: TatVirtualMachine);
+ begin
+   if EditForm.PivotMode = pivotLocal then
+     EditForm.LocalPivot.x := AMachine.GetInputArgAsFloat(0)
+   else
+     EditForm.WorldPivot.x := AMachine.GetInputArgAsFloat(0);
+ end;
+ 
+ procedure TScriptEditor.GetPivotYProc(AMachine: TatVirtualMachine);
+ begin
+ //  EditForm.ScriptGetPivot(px, py);
+ //  AMachine.ReturnOutputArg(py);
+   if EditForm.PivotMode = pivotLocal then
+     AMachine.ReturnOutputArg(EditForm.LocalPivot.y)
+   else
+     AMachine.ReturnOutputArg(EditForm.WorldPivot.y);
+ end;
+ 
+ procedure TScriptEditor.SetPivotYProc(AMachine: TatVirtualMachine);
+ begin
+   if EditForm.PivotMode = pivotLocal then
+     EditForm.LocalPivot.y := AMachine.GetInputArgAsFloat(0)
+   else
+     EditForm.WorldPivot.y := AMachine.GetInputArgAsFloat(0);
+ end;
+ 
+ procedure TScriptEditor.SetPivotProc(AMachine: TatVirtualMachine);
+ begin
+   with AMachine do begin
+     if EditForm.PivotMode = pivotLocal then begin
+       EditForm.LocalPivot.x := GetInputArgAsFloat(0);
+       EditForm.LocalPivot.y := GetInputArgAsFloat(1);
+     end
+     else begin
+       EditForm.WorldPivot.x := GetInputArgAsFloat(0);
+       EditForm.WorldPivot.y := GetInputArgAsFloat(1);
+     end;
+   end;
+ end;
+ 
+ procedure TScriptEditor.ResetPivotProc(AMachine: TatVirtualMachine);
+ begin
+   EditForm.btnResetPivotClick(nil);
+ end;
+ 
  { ********************************* Scripter ********************************* }
  
***************
*** 3226,3231 ****
      DefineProp('ExportRenderer', tkInteger, GetExportPath, SetExportPath);
    end;
-   Scripter.AddComponent(OpenDialog);
    Scripter.AddObject('Options', Options);
    Scripter.AddLibrary(TOperationLibrary);
    Scripter.AddLibrary(TatClassesLibrary);
--- 3176,3192 ----
      DefineProp('ExportRenderer', tkInteger, GetExportPath, SetExportPath);
    end;
    Scripter.AddObject('Options', Options);
+ 
+   with Scripter.defineClass(TPivot) do
+   begin
+     DefineProp('Mode', tkInteger, GetPivotModeProc, SetPivotModeProc);
+     DefineProp('X', tkFloat, GetPivotXProc, SetPivotXProc);
+     DefineProp('Y', tkFloat, GetPivotYProc, SetPivotYProc);
+     DefineMethod('Set', 2, tkNone, nil, SetPivotProc);
+     DefineMethod('Reset', 0, tkNone, nil, ResetPivotProc);
+   end;
+   Scripter.AddObject('Pivot', Pivot);
+ 
+   Scripter.AddComponent(OpenDialog);
    Scripter.AddLibrary(TOperationLibrary);
    Scripter.AddLibrary(TatClassesLibrary);