Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
(27) |
Jul
(15) |
Aug
(1) |
Sep
(63) |
Oct
(50) |
Nov
(3) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(5) |
Feb
|
Mar
(24) |
Apr
(29) |
May
(1) |
Jun
(5) |
Jul
|
Aug
(4) |
Sep
(18) |
Oct
(3) |
Nov
(10) |
Dec
(13) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
(27) |
Jul
(8) |
Aug
|
Sep
|
Oct
(8) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
(18) |
Sep
(10) |
Oct
(13) |
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(22) |
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(3) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
(1) |
2
(1) |
|
3
|
4
(1) |
5
|
6
|
7
|
8
|
9
(7) |
|
10
|
11
|
12
(2) |
13
|
14
|
15
|
16
|
|
17
|
18
|
19
|
20
|
21
|
22
|
23
|
|
24
|
25
|
26
|
27
|
28
|
29
|
30
|
|
31
(1) |
|
|
|
|
|
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-31 08:37:48
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8304/Source
Modified Files:
ScriptForm.pas
Log Message:
fixed FX-related bug in CopyTransform and DeleteTransform
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ScriptForm.pas 12 Dec 2006 11:33:50 -0000 1.31
--- ScriptForm.pas 31 Dec 2006 08:37:45 -0000 1.32
***************
*** 1914,1918 ****
ScriptEditor.cp.xform[ActiveTransform].vars[i] := 0;}
scriptEditor.cp.xform[ActiveTransform].Clear;
! ScriptEditor.cp.xform[ActiveTransform].density := 1 / NumTransforms;
end
else raise EFormatInvalid.Create('Too many transforms.');
--- 1914,1918 ----
ScriptEditor.cp.xform[ActiveTransform].vars[i] := 0;}
scriptEditor.cp.xform[ActiveTransform].Clear;
! ScriptEditor.cp.xform[ActiveTransform].density := 0.5;
end
else raise EFormatInvalid.Create('Too many transforms.');
***************
*** 1933,1941 ****
try
// I'm not sure, but *maybe* this will help scripts not to screw up finalXform
! if ActiveTransform = NumTransforms then // final xform (?)
scriptEditor.cp.xform[NumTransforms].Clear;
scriptEditor.cp.xform[NumTransforms].symmetry := 1;
scriptEditor.cp.finalXformEnabled := false;
! begin
end;
if ActiveTransform = (NumTransforms - 1) then
--- 1933,1943 ----
try
// I'm not sure, but *maybe* this will help scripts not to screw up finalXform
! if ActiveTransform = NumTransforms then
! // final xform - just clear it
! begin
scriptEditor.cp.xform[NumTransforms].Clear;
scriptEditor.cp.xform[NumTransforms].symmetry := 1;
scriptEditor.cp.finalXformEnabled := false;
! exit;
end;
if ActiveTransform = (NumTransforms - 1) then
***************
*** 1980,1986 ****
if NumTransforms < NXFORMS then
begin
- inc(NumTransforms);
old := ActiveTransform;
! ActiveTransform := NumTransforms - 1;
ScriptEditor.cp.xform[ActiveTransform].Assign(ScriptEditor.cp.xform[old]);
{
--- 1982,1989 ----
if NumTransforms < NXFORMS then
begin
old := ActiveTransform;
! ActiveTransform := NumTransforms;
! inc(NumTransforms);
! ScriptEditor.cp.xform[NumTransforms].Assign(ScriptEditor.cp.xform[ActiveTransform]); // final xform
ScriptEditor.cp.xform[ActiveTransform].Assign(ScriptEditor.cp.xform[old]);
{
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-12 11:33:54
|
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);
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-12 11:22:45
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15323/Source
Modified Files:
Main.dfm Main.pas
Log Message:
some small fixes (like "break" button image for scripter)
Index: Main.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Main.pas 24 Nov 2006 13:16:38 -0000 1.55
--- Main.pas 12 Dec 2006 11:22:41 -0000 1.56
***************
*** 42,46 ****
RS_VO = 3;
! AppVersionString = 'Apophysis 2.05 beta 2 rc3';
type
--- 42,46 ----
RS_VO = 3;
! AppVersionString = 'Apophysis 2.05 beta 2 rc4';
type
***************
*** 1329,1345 ****
y := cp1.center[1];
- { // not supported by flam3 any more
- pal := ''; hue := '';
- if sheep then begin
- if cp1.cmapindex >= 0 then pal := 'palette="' + IntToStr(cp1.cmapindex) + '" ';
- hue := 'hue="' + format('%g', [cp1.hue_rotation]) + '" ';
- end;
- }
// if cp1.cmapindex >= 0 then pal := pal + 'gradient="' + IntToStr(cp1.cmapindex) + '" ';
- { // not supported by flam3 any more
- if Trim(SheepNick) <> '' then nick := 'nick="' + Trim(SheepNick) + '"';
- if Trim(SheepURL) <> '' then url := 'url="' + Trim(SheepURL) + '" ';
- }
try
parameters := 'version="' + AppVersionString + '" ';
--- 1329,1334 ----
***************
*** 1386,1399 ****
if cp1.HasFinalXForm then
begin
-
- {$if false} // new file format - how about this?
- FileList.Add(Format(' <xformset enabled="%d">', [IfThen(cp1.finalXformEnabled, 1, 0)]));
- FileList.Add(' ' + cp1.xform[t].ToXMLString);
- Filelist.Add(' </xformset>');
- {$else}
// 'enabled' flag disabled in this release
FileList.Add(cp1.xform[t].FinalToXMLString(cp1.finalXformEnabled));
- {$ifend}
-
end;
--- 1375,1380 ----
Index: Main.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Main.dfm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Main.dfm 29 Oct 2006 16:39:27 -0000 1.38
--- Main.dfm 12 Dec 2006 11:22:41 -0000 1.39
***************
*** 240,244 ****
Hint = 'Show transparency'
Caption = 'tbShowAlpha'
! ImageIndex = 37
Style = tbsCheck
OnClick = tbShowAlphaClick
--- 240,244 ----
Hint = 'Show transparency'
Caption = 'tbShowAlpha'
! ImageIndex = 53
Style = tbsCheck
OnClick = tbShowAlphaClick
***************
*** 378,383 ****
Top = 56
Bitmap = {
! 494C010135003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
! 000000000000360000002800000040000000E0000000010020000000000000E0
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000292B2F00000000002F3236000000
--- 378,511 ----
Top = 56
Bitmap = {
! 494C010136003B00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
! 000000000000360000002800000040000000F0000000010020000000000000F0
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000292B2F00000000002F3236000000
***************
*** 398,404 ****
0000000000000000000000000000000000000000000000000000000000000A2D
620001000000081144001543900000000000000000000D437000192D4E000613
! 420001020C0002050D0000000000171A65000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 526,532 ----
0000000000000000000000000000000000000000000000000000000000000A2D
620001000000081144001543900000000000000000000D437000192D4E000613
! 420001020C0002050D0000000000171A65000000000000000000FFFFFF00FFFF
! FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 406,412 ****
0000000000000000000000000000000000000000000000000000000000000927
5500030816000D2C7E003264A60000000000000000002257A3004998D7001D3D
! 6B000000190001020E00000000001B1A69000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 534,540 ----
0000000000000000000000000000000000000000000000000000000000000927
5500030816000D2C7E003264A60000000000000000002257A3004998D7001D3D
! 6B000000190001020E00000000001B1A69000000000000000000FFFFFF00FFFF
! FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 414,420 ****
000000000000000000000000000000000000000000000000000000000000081E
480001192500226EC2000000000000000000145D7F002E71A8001B569E00244F
! 95001031570009182F0000000A001B1A67000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 542,548 ----
000000000000000000000000000000000000000000000000000000000000081E
480001192500226EC2000000000000000000145D7F002E71A8001B569E00244F
! 95001031570009182F0000000A001B1A67000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 422,428 ****
0000000000000000000000000000000000000000000000000000000000003415
0200180902001B0B01000000000000000000000000002763A0001D4D97003067
! B0002766B4003F77C0000B11200016135B000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 550,556 ----
0000000000000000000000000000000000000000000000000000000000003415
0200180902001B0B01000000000000000000000000002763A0001D4D97003067
! B0002766B4003F77C0000B11200016135B000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 430,436 ****
0000000000000000000000000000000000000000000086685A002A080000B57E
5D00EFE4DF00E0CFC500AD7150002D0F02006F7571000E4293001C4E9A002A69
! AC000B2F7500204A8B00122353001A1668000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 558,564 ----
0000000000000000000000000000000000000000000086685A002A080000B57E
5D00EFE4DF00E0CFC500AD7150002D0F02006F7571000E4293001C4E9A002A69
! AC000B2F7500204A8B00122353001A1668000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 438,444 ****
00000000000000000000000000000000000000000000350B0500E9DAC900EDE5
D600F9EEE300F6ECE300F8F2EA00E2D1C8003A150B00627D9100092871002469
! A8007CB3D7003453890003135B001E1D74000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 566,572 ----
00000000000000000000000000000000000000000000350B0500E9DAC900EDE5
D600F9EEE300F6ECE300F8F2EA00E2D1C8003A150B00627D9100092871002469
! A8007CB3D7003453890003135B001E1D74000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A00000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 446,452 ****
0000000000000000000000000000000000003C2D2400D0AB9600F8E8D600CAAE
9900ECD6C500ECD8C900F4E2D100EAE1D200D2B4A1001A191700558BC200457E
! B2006CADD8002C488900050336001D1B6D000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 574,580 ----
0000000000000000000000000000000000003C2D2400D0AB9600F8E8D600CAAE
9900ECD6C500ECD8C900F4E2D100EAE1D200D2B4A1001A191700558BC200457E
! B2006CADD8002C488900050336001D1B6D000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 454,460 ****
00000000000000000000000000000000000001010100F6E3D300F0C9B600A979
6000A3725800A77D6300B6937E00D8C0AB00F9F7DD00000000005090C4003A69
! AE0078AFD2003A7CAC00041B57001D1A6F000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 582,588 ----
00000000000000000000000000000000000001010100F6E3D300F0C9B600A979
6000A3725800A77D6300B6937E00D8C0AB00F9F7DD00000000005090C4003A69
! AE0078AFD2003A7CAC00041B57001D1A6F000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 462,468 ****
00000000000000000000000000000000000000000000FDEAD900EBB198009B5A
4000E6A48D00E9AB9300ECB99E00CBA48E00FFEED3000A0805002F75AE008BBC
! DF00A9E0FF001A367500011B51001B2377000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 590,596 ----
00000000000000000000000000000000000000000000FDEAD900EBB198009B5A
4000E6A48D00E9AB9300ECB99E00CBA48E00FFEED3000A0805002F75AE008BBC
! DF00A9E0FF001A367500011B51001B2377000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 470,476 ****
00000000000000000000000000000000000000000000FBE2D300F1B69F00A354
3600E6978000E79D8400ECAD8D00D19E8200EBCAB0000E0B0900437EBC007389
! B5003E52900005116300091149001B1B6E000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 598,604 ----
00000000000000000000000000000000000000000000FBE2D300F1B69F00A354
3600E6978000E79D8400ECAD8D00D19E8200EBCAB0000E0B0900437EBC007389
! B5003E52900005116300091149001B1B6E000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 478,484 ****
00000000000000000000000000000000000067565100B57C5F00FBCFB900CF87
6E00F19B7E00F09D8200F6B29500EBB592009250390051444000121E54000000
! 120000001400070E370006143B001C1A6A000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 606,612 ----
00000000000000000000000000000000000067565100B57C5F00FBCFB900CF87
6E00F19B7E00F09D8200F6B29500EBB592009250390051444000121E54000000
! 120000001400070E370006143B001C1A6A000000000000000000A0A0A000A0A0
! A000A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 486,492 ****
0000000000000000000000000000000000000000000061473800BD8B7100F8D8
C600F6CAB700EEB29B00F6BFA1008E4C36000D0600000F327D000A286C000A31
! 67000932710009306D00092F64000F3580000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 614,620 ----
0000000000000000000000000000000000000000000061473800BD8B7100F8D8
C600F6CAB700EEB29B00F6BFA1008E4C36000D0600000F327D000A286C000A31
! 67000932710009306D00092F64000F3580000000000000000000A0A0A000A0A0
! A000A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 910,916 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000A0A0A000A0A0A0000000000000000000CC66000066666600666666006666
6600666666006666660066666600666666006666660066666600666666006666
6600666666009999990000000000000000000000000000000000FFF0E700FFEA
--- 1038,1044 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 000000000000000000000000000000000000CC66000066666600666666006666
6600666666006666660066666600666666006666660066666600666666006666
6600666666009999990000000000000000000000000000000000FFF0E700FFEA
***************
*** 918,924 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000A0A0A000A0A0A0000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FEEBE000FFE4
--- 1046,1052 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B00FFFF
! FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00FFFFFF00FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FEEBE000FFE4
***************
*** 926,932 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A0000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FEE7D900FFDD
--- 1054,1060 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 000000000000FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FEE7D900FFDD
***************
*** 934,940 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A0000000000000000000CC6600000000000000FF00000000
000000FF000000FF00000000000000FF00000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFE4D300FFD6
--- 1062,1068 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC6600000000000000FF00000000
000000FF000000FF00000000000000FF00000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFE4D300FFD6
***************
*** 942,948 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A0000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFDFCD00FFD0
--- 1070,1076 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FFFFFF00FF000000FF000000FFFFFF00FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFDFCD00FFD0
***************
*** 950,956 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
! FF00A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00A0A0A000A0A0A0000000000000000000CC6600000000000000FF000000FF
00000000000000FF000000FF000000FF00000000000000FF0000000000000000
0000000000006666660000000000000000000000000000000000FFDBC700FFCA
--- 1078,1084 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FF000000FFFFFF00FFFFFF00FF000000FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC6600000000000000FF000000FF
00000000000000FF000000FF000000FF00000000000000FF0000000000000000
0000000000006666660000000000000000000000000000000000FFDBC700FFCA
***************
*** 958,964 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFDAC500FFCB
--- 1086,1092 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FF000000FFFFFF00FFFFFF00FF000000FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000FFDAC500FFCB
***************
*** 966,972 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF000000000000000000CC6600000000000000FF00000000
000000FF000000FF00000000000000FF000000FF000000000000000000000000
0000000000006666660000000000000000000000000000000000FDE2D300FEDC
--- 1094,1100 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FF000000FFFFFF00FFFFFF00FF000000FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC6600000000000000FF00000000
000000FF000000FF00000000000000FF000000FF000000000000000000000000
0000000000006666660000000000000000000000000000000000FDE2D300FEDC
***************
*** 974,980 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000000000000000
--- 1102,1108 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FFFFFF00FF000000FF000000FFFFFF00FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000000000000000
***************
*** 982,988 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000FFFFFF00FFFFFF00FFFFFF00FFFFFF00A0A0A000A0A0A000A0A0A000A0A0
! A000FFFFFF00FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000000000000000
--- 1110,1116 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
! FF0000000000FFFFFF000000000000000000CC66000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000006666660000000000000000000000000000000000000000000000
***************
*** 990,996 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00FFFFFF00FFFFFF000000000000000000CC660000CC660000CC660000CC66
0000CC660000CC660000CC660000CC660000CC660000CC660000CC660000CC66
0000CC660000CC66000000000000000000000000000000000000000000000000
--- 1118,1124 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 000000000000FFFFFF000000000000000000CC660000CC660000CC660000CC66
0000CC660000CC660000CC660000CC660000CC660000CC660000CC660000CC66
0000CC660000CC66000000000000000000000000000000000000000000000000
***************
*** 998,1004 ****
34000B0C0D002D3134002D3134004F565B000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000A0A0A000A0A0
! A000A0A0A000A0A0A000A0A0A000A0A0A000FFFFFF00FFFFFF00FFFFFF00FFFF
! FF00FFFFFF00FFFFFF000000000000000000CC66000000000000FFCC9900FFCC
9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC99000000
0000CC6600000000000000000000000000000000000000000000000000000000
--- 1126,1132 ----
34000B0C0D002D3134002D3134004F565B000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000000000000000007B7B7B007B7B
! 7B007B7B7B007B7B7B007B7B7B007B7B7B007B7B7B007B7B7B007B7B7B007B7B
! 7B007B7B7B007B7B7B000000000000000000CC66000000000000FFCC9900FFCC
9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC9900FFCC99000000
0000CC6600000000000000000000000000000000000000000000000000000000
***************
*** 2173,2182 ****
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000424D3E000000000000003E000000
! 2800000040000000E00000000100010000000000000700000000000000000000
! 000000000000000000000000FFFFFF00FF1F000000000000E000000000000000
! E000000000000000E000000000000000E000000000000000E000000000000000
! 8000000000000000800000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000008000000000000000
! C0FF000000000000FFFF000000000000FBF7FFC7FFC7800FFBF7FFCFFFCF800F
F7F7FF8FFF8F800FEFFBFF9FFF9F8000DFFBFF1FFF1F8000DFFDF83FF83F8000
BFFDE01FE01F800077FDE00FE00F800067FEC00FC00F800097F6C00FC00F8000
--- 2301,2314 ----
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000424D3E000000000000003E000000
! 2800000040000000F00000000100010000000000800700000000000000000000
! 000000000000000000000000FFFFFF0000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000FF1FFFFF00000000E000800100000000
! E000800100000000E000800100000000E000800100000000E000800100000000
! 8000800100000000800080010000000000008001000000000000800100000000
! 0000800100000000000080010000000000008001000000008000800100000000
! C0FF800100000000FFFFFFFF00000000FBF7FFC7FFC7800FFBF7FFCFFFCF800F
F7F7FF8FFF8F800FEFFBFF9FFF9F8000DFFBFF1FFF1F8000DFFDF83FF83F8000
BFFDE01FE01F800077FDE00FE00F800067FEC00FC00F800097F6C00FC00F8000
***************
*** 2190,2198 ****
E5E7DFFF8007E007E6E7DFFF8003E003E767DFFF8001E007E7A7DFC38040E01F
E7C7CFE380E0E07F0007EFE381E0E1FF0007F39BFFF0E7FFE7FBF83FFFF8FFFF
! E7FDFFFFFFFCFFFFE7FFFFFFFFFEFFFFFFFFFFFFFFFF803FFFFF80010001803F
! FFFF80010001803FE00780010001803FE00780010001803FE00780010001803F
! E00780010001803FE00780010001803FE00780010001807FE0078001000180FF
! E0078001000181FFE00780010001FFFFE00780010001FF80FFFF80014015FFFF
! FFFF80010001FFFFFFFFFFFFFFFFFFFFFFFFDFFFFFFFFFFFF001DFFBC000FFFF
F80187FBC000FE7FFC0103FBC000E667BE0103E1C000E0079F0103C0C000C003
8F0103C0C000C003860187C0C000C0038061EFC0C000C00380F1EFE1C000E007
--- 2322,2330 ----
E5E7DFFF8007E007E6E7DFFF8003E003E767DFFF8001E007E7A7DFC38040E01F
E7C7CFE380E0E07F0007EFE381E0E1FF0007F39BFFF0E7FFE7FBF83FFFF8FFFF
! E7FDFFFFFFFCFFFFE7FFFFFFFFFEFFFFFFFFFFFFFFFF803FFFFFFFFF0001803F
! FFFFFFFF0001803FE007C0030001803FE007CFFB0001803FE007C00B0001803F
! E007C00B0001803FE007C00B0001803FE007C00B0001807FE007C00B000180FF
! E007C00B000181FFE007C00B0001FFFFE007C0030001FF80FFFFC0034015FFFF
! FFFFFFFF0001FFFFFFFFFFFFFFFFFFFFFFFFDFFFFFFFFFFFF001DFFBC000FFFF
F80187FBC000FE7FFC0103FBC000E667BE0103E1C000E0079F0103C0C000C003
8F0103C0C000C003860187C0C000C0038061EFC0C000C00380F1EFE1C000E007
***************
*** 2230,2235 ****
C003000180018000C003001F80018000C003001F80018001C003001F80018001
C0038FF180018001C007FFF980018001C00FFF7580018001C01FFF8F80018001
! C03FFFFF80018001FFFFFFFFFFFFFFFF00000000000000000000000000000000
! 000000000000}
end
object SmallImages: TImageList
--- 2362,2366 ----
C003000180018000C003001F80018000C003001F80018001C003001F80018001
C0038FF180018001C007FFF980018001C00FFF7580018001C01FFF8F80018001
! C03FFFFF80018001FFFFFFFFFFFFFFFF}
end
object SmallImages: TImageList
|
|
From: Piotr Borys <utak3r@us...> - 2006-12-09 23:21:46
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24905
Modified Files:
ScriptForm.dfm
Log Message:
Some function parameters hints and changed error message.
Index: ScriptForm.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.dfm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScriptForm.dfm 9 Dec 2006 20:55:17 -0000 1.10
--- ScriptForm.dfm 9 Dec 2006 23:21:41 -0000 1.11
***************
*** 21,25 ****
object Splitter1: TSplitter
Left = 0
! Top = 250
Width = 531
Height = 4
--- 21,25 ----
object Splitter1: TSplitter
Left = 0
! Top = 244
Width = 531
Height = 4
***************
*** 31,35 ****
Top = 0
Width = 23
! Height = 250
Align = alRight
AutoSize = True
--- 31,35 ----
Top = 0
Width = 23
! Height = 244
Align = alRight
AutoSize = True
***************
*** 97,101 ****
object StatusBar: TStatusBar
Left = 0
! Top = 343
Width = 531
Height = 19
--- 97,101 ----
object StatusBar: TStatusBar
Left = 0
! Top = 337
Width = 531
Height = 19
***************
*** 107,111 ****
Top = 0
Width = 508
! Height = 250
Align = alClient
BevelInner = bvLowered
--- 107,111 ----
Top = 0
Width = 508
! Height = 244
Align = alClient
BevelInner = bvLowered
***************
*** 117,121 ****
Top = 2
Width = 504
! Height = 246
Cursor = crIBeam
PopupMenu = PopupMenu
--- 117,121 ----
Top = 2
Width = 504
! Height = 240
Cursor = crIBeam
PopupMenu = PopupMenu
***************
*** 137,140 ****
--- 137,142 ----
BkColor = clWindow
BorderStyle = bsNone
+ CodeFolding.Enabled = False
+ CodeFolding.LineColor = clGray
Ctl3D = False
DelErase = True
***************
*** 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
--- 148,151 ----
***************
*** 192,196 ****
UrlStyle.Style = [fsUnderline]
UseStyler = True
! Version = '1.6.0.17'
WordWrap = wwNone
OnChange = EditorChange
--- 189,193 ----
UrlStyle.Style = [fsUnderline]
UseStyler = True
! Version = '2.0.0.1'
WordWrap = wwNone
OnChange = EditorChange
***************
*** 199,203 ****
object Console: TMemo
Left = 0
! Top = 254
Width = 531
Height = 89
--- 196,200 ----
object Console: TMemo
Left = 0
! Top = 248
Width = 531
Height = 89
***************
*** 557,561 ****
HintParameter.HintCharWriteDelimiter = ','
HintParameter.Parameters.Strings = (
! 'ShowMessage(const Msg: string);')
HexIdentifier = '$'
Description = 'Pascal'
--- 554,572 ----
HintParameter.HintCharWriteDelimiter = ','
HintParameter.Parameters.Strings = (
! 'ShowMessage(const Msg: string);'
!
! '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'
***************
*** 564,567 ****
--- 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
|
|
From: Piotr Borys <utak3r@us...> - 2006-12-09 23:09:45
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20208
Modified Files:
ScriptForm.pas
Log Message:
Some function parameters hints and changed error message.
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ScriptForm.pas 9 Dec 2006 20:51:31 -0000 1.29
--- ScriptForm.pas 9 Dec 2006 23:09:36 -0000 1.30
***************
*** 3604,3608 ****
begin
Editor.ActiveLine := row - 1;
! Console.Lines.Add(msg);
ScriptRenderForm.Close;
btnRun.Enabled := True;
--- 3604,3608 ----
begin
Editor.ActiveLine := row - 1;
! Console.Lines.Add('Line '+IntToStr(row)+' : '+msg);
ScriptRenderForm.Close;
btnRun.Enabled := True;
***************
*** 3613,3616 ****
--- 3613,3617 ----
MainForm.mnuStop.Enabled := False;
btnBreak.Enabled := False;
+ ShowException := true;
Application.ProcessMessages;
end;
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-09 20:55:19
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4904/Source
Modified Files:
ScriptForm.dfm
Log Message:
syntax highlighting & autocomplete
Index: ScriptForm.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.dfm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ScriptForm.dfm 22 Aug 2006 13:35:52 -0000 1.9
--- ScriptForm.dfm 9 Dec 2006 20:55:17 -0000 1.10
***************
*** 91,95 ****
Hint = 'Break'
Enabled = False
! ImageIndex = 38
OnClick = btnBreakClick
end
--- 91,95 ----
Hint = 'Break'
Enabled = False
! ImageIndex = 37
OnClick = btnBreakClick
end
***************
*** 123,127 ****
ActiveLineSettings.ShowActiveLineIndicator = False
Align = alClient
- AutoCompletion.Active = False
AutoCompletion.Font.Charset = DEFAULT_CHARSET
AutoCompletion.Font.Color = clWindowText
--- 123,126 ----
***************
*** 129,132 ****
--- 128,133 ----
AutoCompletion.Font.Name = 'MS Sans Serif'
AutoCompletion.Font.Style = []
+ AutoCompletion.Height = 120
+ AutoCompletion.Width = 400
AutoCorrect.Active = True
AutoHintParameterPosition = hpBelowCode
***************
*** 259,263 ****
CommentStyle.BkColor = clWindow
CommentStyle.Style = [fsItalic]
! NumberStyle.TextColor = clWindowText
NumberStyle.BkColor = clWindow
NumberStyle.Style = []
--- 260,264 ----
CommentStyle.BkColor = clWindow
CommentStyle.Style = [fsItalic]
! NumberStyle.TextColor = clNavy
NumberStyle.BkColor = clWindow
NumberStyle.Style = []
***************
*** 349,353 ****
item
Font.Charset = DEFAULT_CHARSET
! Font.Color = clBlack
Font.Height = -11
Font.Name = 'Courier New'
--- 350,354 ----
item
Font.Charset = DEFAULT_CHARSET
! Font.Color = clTeal
Font.Height = -11
Font.Name = 'Courier New'
***************
*** 362,366 ****
AutoCompletion.Strings = (
'ShowMessage'
! 'MessageDlg')
HintParameter.TextColor = clBlack
HintParameter.BkColor = clInfoBk
--- 363,553 ----
AutoCompletion.Strings = (
'ShowMessage'
! ''
! 'RotateFlame'
! 'RotateReference'
! 'Rotate'
! 'Multiply'
! 'StoreFlame'
! 'GetFlame'
! 'LoadFlame'
! 'Scale'
! 'Translate'
! 'ActiveTransform'
! 'SetActiveTransform'
! 'Transforms'
! 'FileCount'
! 'AddTransform'
! 'DeleteTransform'
! 'CopyTransform'
! 'Clear'
! 'Preview'
! 'Render'
! 'Print'
! 'AddSymmetry'
! 'Morph'
! 'SetRenderBounds'
! 'SetFlameFile'
! 'ListFile'
! 'SaveFlame'
! 'GetFileName'
! 'ShowStatus'
! 'RandomFlame'
! 'RandomGradient'
! 'SaveGradient'
! 'Variation'
! 'SetVariation'
! 'ProgramVersionString'
! 'VariationIndex'
! 'VariationName'
! 'GetPivotMode'
! 'SetPivotMode'
! 'GetPivotX'
! 'GetPivotY'
! 'SetPivot'
! 'ResetPivot'
! 'CalculateScale'
! 'CalculateBounds'
! 'NormalizeVars'
! 'GetSaveFileName'
! 'CopyFile'
! ''
! 'Renderer'
! ''
! 'Filename'
! 'Width'
! 'Height'
! 'MaxMemory'
! ''
! 'Flame'
! ''
! 'Gamma'
! 'Brightness'
! 'Vibrancy'
! 'Time'
! 'Zoom'
! 'Width'
! 'Height'
! 'SampleDensity'
! 'Quality'
! 'Oversample'
! 'FilterRadius'
! 'Scale'
! 'Gradient'
! 'Background'
! 'Name'
! 'Batches'
! 'FinalXformEnabled'
! ''
! 'Transform'
! ''
! 'coefs'
! 'post'
! 'Color'
! 'Weight'
! 'Symmetry'
! 'Clear'
! 'Rotate'
! 'Scale'
! 'RotateOrigin'
! 'Variation'
! ''
! 'Options'
! ''
! 'JPEGQuality'
! 'BatchSize'
! 'ParameterFile'
! 'SmoothPaletteFile'
! 'NumTries'
! 'TryLength'
! 'ConfirmDelete'
! 'FixedReference'
! 'SampleDensity'
! 'Gamma'
! 'Brightness'
! 'Vibrancy'
! 'Oversample'
! 'FilterRadius'
! 'Transparency'
! 'PreviewLowQuality'
! 'PreviewMediumQuality'
! 'PreviewHighQuality'
! 'MinTransforms'
! 'MaxTransforms'
! 'MutateMinTransforms'
! 'MutateMaxTransforms'
! 'RandomPrefix'
! 'KeepBackground'
! 'SymmetryType'
! 'SymmetryOrder'
! 'Variations'
! 'GradientOnRandom'
! 'MinNodes'
! 'MaxNodes'
! 'MinHue'
! 'MaxHue'
! 'MinSaturation'
! 'MaxSaturation'
! 'MinLuminance'
! 'MaxLuminance'
! 'UPRSampleDensity'
! 'UPRFilterRadius'
! 'UPROversample'
! 'UPRAdjustDensity'
! 'UPRColoringIdent'
! 'UPRColoringFile'
! 'UPRFormulaFile'
! 'UPRFormulaIdent'
! 'UPRWidth'
! 'UPRHeight'
! 'ExportRenderer'
! ''
! 'PI'
! 'NVARS'
! 'NXFORMS'
! 'INSTALLPATH'
! 'SYM_NONE'
! 'SYM_BILATERAL'
! 'SYM_ROTATIONAL'
! ''
! 'V_LINEAR'
! 'V_SINUSOIDAL'
! 'V_SPHERICAL'
! 'V_SWIRL'
! 'V_HORSESHOE'
! 'V_POLAR'
! 'V_HANDKERCHIEF'
! 'V_HEART'
! 'V_DISC'
! 'V_SPIRAL'
! 'V_HYPERBOLIC'
! 'V_DIAMOND'
! 'V_EX'
! 'V_JULIA'
! 'V_BENT'
! 'V_WAVES'
! 'V_FISHEYE'
! 'V_POPCORN'
! 'V_EXPONENTIAL'
! 'V_POWER'
! 'V_COSINE'
! 'V_RINGS'
! 'V_FAN'
! 'V_EYEFISH'
! 'V_BUBBLE'
! 'V_CYLINDER'
! 'V_NOISE'
! 'V_BLUR'
! 'V_GAUSSIANBLUR'
! 'V_RADIALBLUR'
! 'V_RINGS2'
! 'V_FAN2'
! 'V_BLOB'
! 'V_PDJ'
! 'V_PERSPECTIVE'
! 'V_JULIAN'
! 'V_JULIASCOPE'
! 'V_CURL'
! 'V_RANDOM'
! '')
HintParameter.TextColor = clBlack
HintParameter.BkColor = clInfoBk
***************
*** 370,377 ****
HintParameter.HintCharWriteDelimiter = ','
HintParameter.Parameters.Strings = (
! 'ShowMessage(const Msg: string);'
!
! 'MessageDlg(const Msg: string; DlgType: TMsgDlgType; Buttons: TMs' +
! 'gDlgButtons; HelpCtx: Longint): Integer);')
HexIdentifier = '$'
Description = 'Pascal'
--- 557,561 ----
HintParameter.HintCharWriteDelimiter = ','
HintParameter.Parameters.Strings = (
! 'ShowMessage(const Msg: string);')
HexIdentifier = '$'
Description = 'Pascal'
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-09 20:51:37
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3325/Source
Modified Files:
ScriptForm.pas
Log Message:
added some error-checking & syntax-highlighting
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ScriptForm.pas 9 Dec 2006 13:37:51 -0000 1.28
--- ScriptForm.pas 9 Dec 2006 20:51:31 -0000 1.29
***************
*** 192,195 ****
--- 192,196 ----
procedure TransformClearProc(AMachine: TatVirtualMachine);
procedure TransformRotateProc(AMachine: TatVirtualMachine);
+ procedure TransformScaleProc(AMachine: TatVirtualMachine);
procedure TransformRotateOriginProc(AMachine: TatVirtualMachine);
***************
*** 351,354 ****
--- 352,358 ----
{$R *.DFM}
+ const
+ ErrorOutOfRange = 'Transform out of range!';
+
type
{ Library for math functions }
***************
*** 1389,1393 ****
begin
try
! if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Rotate(GetInputArgAsFloat(0));
--- 1393,1397 ----
begin
try
! if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then raise EFormatInvalid.Create(ErrorOutOfRange);
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Rotate(GetInputArgAsFloat(0));
***************
*** 1404,1408 ****
begin
try
! if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Multiply(GetInputArgAsFloat(0), GetInputArgAsFloat(1), GetInputArgAsFloat(2), GetInputArgAsFloat(3));
--- 1408,1412 ----
begin
try
! if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then raise EFormatInvalid.Create(ErrorOutOfRange);
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Multiply(GetInputArgAsFloat(0), GetInputArgAsFloat(1), GetInputArgAsFloat(2), GetInputArgAsFloat(3));
***************
*** 1727,1731 ****
begin
try
! if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Scale(GetInputArgAsFloat(0));
--- 1731,1735 ----
begin
try
! if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create(ErrorOutOfRange);
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Scale(GetInputArgAsFloat(0));
***************
*** 1880,1885 ****
--- 1884,1893 ----
NumTransforms := 0;
ActiveTransform := -1;
+ {
for i := 0 to NXFORMS - 1 do
ScriptEditor.cp.xform[i].density := 0;
+ }
+ ScriptEditor.cp.Clear;
+ ScriptEditor.cp.xform[0].symmetry := 1;
end;
***************
*** 1940,1944 ****
if (i >= 0) and (i < NXFORMS) then
ActiveTransform := i
! else raise EFormatInvalid.Create('Transform out of range.');
except on E: EFormatInvalid do
begin
--- 1948,1952 ----
if (i >= 0) and (i < NXFORMS) then
ActiveTransform := i
! else raise EFormatInvalid.Create(ErrorOutOfRange);
except on E: EFormatInvalid do
begin
***************
*** 2068,2072 ****
try
if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then // was: NXFORMS-1
! raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Translate(GetInputArgAsFloat(0), GetInputArgAsFloat(1));
--- 2076,2080 ----
try
if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then // was: NXFORMS-1
! raise EFormatInvalid.Create(ErrorOutOfRange);
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Translate(GetInputArgAsFloat(0), GetInputArgAsFloat(1));
***************
*** 2767,2776 ****
v: double;
begin
with AMachine do
begin
i := 0;
while (i < NRVAR) and (varnames(i) <> CurrentPropertyName) do Inc(i);
! // if (i >= NRVAR) then error
! ReturnOutPutArg(cp.xform[ActiveTransform].vars[i]);
end;
end;
--- 2775,2796 ----
v: double;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
i := 0;
while (i < NRVAR) and (varnames(i) <> CurrentPropertyName) do Inc(i);
! if (i < NRVAR) then
! ReturnOutPutArg(cp.xform[ActiveTransform].vars[i])
! else begin // shouldn't happen
! LastError := 'Oops!';
! ScriptEditor.Console.Lines.Add(LastError);
! Scripter.Halt;
! end;
end;
end;
***************
*** 2781,2784 ****
--- 2801,2811 ----
v: double;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
***************
*** 2786,2791 ****
while (i < NRVAR) and (varnames(i) <> CurrentPropertyName) do Inc(i);
if (i < NRVAR) then
! cp.xform[ActiveTransform].vars[i] := GetInputArgAsFloat(0);
! //else error
end;
end;
--- 2813,2822 ----
while (i < NRVAR) and (varnames(i) <> CurrentPropertyName) do Inc(i);
if (i < NRVAR) then
! cp.xform[ActiveTransform].vars[i] := GetInputArgAsFloat(0)
! else begin // shouldn't happen
! LastError := 'Oops!';
! ScriptEditor.Console.Lines.Add(LastError);
! Scripter.Halt;
! end;
end;
end;
***************
*** 2795,2798 ****
--- 2826,2836 ----
v: double;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
***************
*** 2806,2809 ****
--- 2844,2854 ----
v: double;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
***************
*** 2820,2823 ****
--- 2865,2875 ----
i, j: integer;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do begin
i := GetArrayIndex(0);
***************
*** 2836,2839 ****
--- 2888,2898 ----
i, j: integer;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
***************
*** 2853,2856 ****
--- 2912,2922 ----
i, j: integer;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do begin
i := GetArrayIndex(0);
***************
*** 2869,2872 ****
--- 2935,2945 ----
i, j: integer;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
with AMachine do
begin
***************
*** 2894,2897 ****
--- 2967,2977 ----
tx, ty, rad: double;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
rad := AMachine.GetInputArgAsFloat(0) * pi / 180;
with EditForm.WorldPivot do
***************
*** 2904,2908 ****
end;
! // -- pivot-aware rotating --
procedure TScriptEditor.TransformRotateProc(AMachine: TatVirtualMachine);
--- 2984,2988 ----
end;
! // -- pivot-aware rotating & scaling --
procedure TScriptEditor.TransformRotateProc(AMachine: TatVirtualMachine);
***************
*** 2913,2916 ****
--- 2993,3003 ----
tx: TXForm;
begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
tx := TXForm.Create;
tx.Assign(scripteditor.cp.xform[NumTransforms]); // just in case (?)
***************
*** 2926,2929 ****
--- 3013,3043 ----
end;
+ procedure TScriptEditor.TransformScaleProc(AMachine: TatVirtualMachine);
+ var
+ Triangles: TTriangles;
+ px, py: double;
+
+ tx: TXForm;
+ begin
+ if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then begin
+ ScriptEditor.Console.Lines.Add(ErrorOutOfRange);
+ LastError := ErrorOutOfRange;
+ Scripter.Halt;
+ exit;
+ end;
+
+ tx := TXForm.Create;
+ tx.Assign(scripteditor.cp.xform[NumTransforms]); // just in case (?)
+
+ EditForm.ScriptGetPivot(px, py);
+ cp.TrianglesFromCp(Triangles); // it's ugly but it works...
+ Triangles[ActiveTransform] :=
+ ScaleTrianglePoint(Triangles[ActiveTransform], px, py, AMachine.GetInputArgAsFloat(0));
+ cp.GetFromTriangles(Triangles, NumTransforms);
+
+ cp.xform[NumTransforms].Assign(tx);
+ tx.Free;
+ end;
+
{ *************************** Render interface ****************************** }
***************
*** 2998,3001 ****
--- 3112,3116 ----
end;
Scripter.AddObject('Renderer', Renderer);
+
{ Flame interface }
with Scripter.defineClass(TFlame) do
***************
*** 3025,3028 ****
--- 3140,3144 ----
end;
Scripter.AddObject('Flame', Flame);
+
{ Transform interface }
with Scripter.defineClass(TTransform) do
***************
*** 3033,3043 ****
DefineProp('Weight', tkFloat, GetTransformWeightProc, SetTransformWeightProc);
DefineProp('Symmetry', tkFloat, GetTransformSymProc, SetTransformSymProc);
! for i:= 0 to NRVAR - 1 do
DefineProp(Varnames(i), tkFloat, GetTransformVariationProc, SetTransformVariationProc);
! for i:= 0 to GetNrVariableNames - 1 do
DefineProp(GetVariableNameAt(i), tkFloat, GetTransformVariableProc, SetTransformVariableProc);
DefineMethod('Clear', 0, tkNone, nil, TransformClearProc);
DefineMethod('Rotate', 1, tkNone, nil, TransformRotateProc);
DefineMethod('RotateOrigin', 1, tkNone, nil, TransformRotateOriginProc);
--- 3149,3166 ----
DefineProp('Weight', tkFloat, GetTransformWeightProc, SetTransformWeightProc);
DefineProp('Symmetry', tkFloat, GetTransformSymProc, SetTransformSymProc);
! for i:= 0 to NRVAR - 1 do begin
DefineProp(Varnames(i), tkFloat, GetTransformVariationProc, SetTransformVariationProc);
! Editor.SyntaxStyles.AutoCompletion.Add(Varnames(i));
! end;
! for i:= 0 to GetNrVariableNames - 1 do begin
DefineProp(GetVariableNameAt(i), tkFloat, GetTransformVariableProc, SetTransformVariableProc);
+ Editor.SyntaxStyles.AutoCompletion.Add(GetVariableNameAt(i));
+ end;
+ Editor.SyntaxStyles.AutoCompletion.Sort;
+ while Editor.SyntaxStyles.AutoCompletion.Strings[0] = '' do Editor.SyntaxStyles.AutoCompletion.Delete(0);
DefineMethod('Clear', 0, tkNone, nil, TransformClearProc);
DefineMethod('Rotate', 1, tkNone, nil, TransformRotateProc);
+ DefineMethod('Scale', 1, tkNone, nil, TransformScaleProc);
DefineMethod('RotateOrigin', 1, tkNone, nil, TransformRotateOriginProc);
***************
*** 3051,3054 ****
--- 3174,3178 ----
end;
Scripter.AddObject('Transform', Transform);
+
{ Options interface }
with Scripter.defineClass(TOptions) do
***************
*** 3106,3109 ****
--- 3230,3234 ----
Scripter.AddLibrary(TOperationLibrary);
Scripter.AddLibrary(TatClassesLibrary);
+
{ Variables and constants }
Scripter.AddConstant('PI', pi);
***************
*** 3178,3182 ****
{ Variables }
Scripter.AddVariable('SelectedTransform', EditForm.SelectedTriangle);
! Scripter.AddVariable('Compatibility', Compatibility);
Scripter.AddVariable('ActiveTransform', ActiveTransform);
Scripter.AddVariable('UpdateFlame', UpdateIt);
--- 3303,3307 ----
{ Variables }
Scripter.AddVariable('SelectedTransform', EditForm.SelectedTriangle);
! Scripter.AddVariable('Compatibility', Compatibility); // obsolete
Scripter.AddVariable('ActiveTransform', ActiveTransform);
Scripter.AddVariable('UpdateFlame', UpdateIt);
***************
*** 3188,3191 ****
--- 3313,3317 ----
Scripter.AddVariable('CurrentFile', OpenFile);
Scripter.AddVariable('LimitVibrancy', LimitVibrancy);
+
Scripter.AddLibrary(TMathLibrary);
Scripter.AddLibrary(TatMathLibrary);
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-09 14:42:06
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25724/Source
Modified Files:
Editor.dfm Editor.pas XForm.pas
Log Message:
added new constant MAX_WEIGHT
Index: Editor.dfm
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Editor.dfm,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Editor.dfm 24 Nov 2006 13:16:37 -0000 1.47
--- Editor.dfm 9 Dec 2006 14:42:00 -0000 1.48
***************
*** 707,711 ****
Width = 23
Height = 24
! Hint = 'Scale triangle'
Flat = True
Glyph.Data = {
--- 707,711 ----
Width = 23
Height = 24
! Hint = 'Scale triangle up'
Flat = True
Glyph.Data = {
***************
*** 727,731 ****
Width = 23
Height = 24
! Hint = 'UnScale triangle'
Flat = True
Glyph.Data = {
--- 727,731 ----
Width = 23
Height = 24
! Hint = 'Scale triangle down'
Flat = True
Glyph.Data = {
Index: XForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/XForm.pas,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** XForm.pas 16 Oct 2006 16:20:01 -0000 1.35
--- XForm.pas 9 Dec 2006 14:42:02 -0000 1.36
***************
*** 6,9 ****
--- 6,12 ----
XFormMan, BaseVariation;
+ const
+ MAX_WEIGHT = 1000.0;
+
type
TCPpoint = record
Index: Editor.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** Editor.pas 1 Dec 2006 16:52:43 -0000 1.56
--- Editor.pas 9 Dec 2006 14:42:02 -0000 1.57
***************
*** 2433,2437 ****
begin
cp.xform[SelectedTriangle].density := StrToFloat(TEdit(Sender).Text);
- //ReadjustWeights(cp);
TEdit(Sender).Text := Format('%.6g', [cp.xform[SelectedTriangle].density]);
end;
--- 2433,2436 ----
***************
*** 2495,2499 ****
begin
cp.xform[SelectedTriangle].density := StrToFloat(TEdit(Sender).Text);
- //ReadjustWeights(cp);
TEdit(Sender).Text := Format('%.6g', [cp.xform[SelectedTriangle].density]);
end;
--- 2494,2497 ----
***************
*** 2530,2534 ****
NewVal := Round6(StrToFloat(TEdit(Sender).Text));
if NewVal < 0.000001 then NewVal := 0.000001;
! if NewVal > 100 then NewVal := 100;
{ If it's not the same as the old value and it was valid }
TEdit(Sender).Text := Format('%.6g', [NewVal]);
--- 2528,2532 ----
NewVal := Round6(StrToFloat(TEdit(Sender).Text));
if NewVal < 0.000001 then NewVal := 0.000001;
! if NewVal > MAX_WEIGHT then NewVal := MAX_WEIGHT;
{ If it's not the same as the old value and it was valid }
TEdit(Sender).Text := Format('%.6g', [NewVal]);
***************
*** 2562,2566 ****
NewVal := Round6(StrToFloat(TEdit(Sender).Text));
if NewVal < 0.000001 then NewVal := 0.000001;
! if NewVal > 100 then NewVal := 100;
{ If it's not the same as the old value and it was valid }
TEdit(Sender).Text := Format('%.6g', [NewVal]);
--- 2560,2564 ----
NewVal := Round6(StrToFloat(TEdit(Sender).Text));
if NewVal < 0.000001 then NewVal := 0.000001;
! if NewVal > MAX_WEIGHT then NewVal := MAX_WEIGHT;
{ If it's not the same as the old value and it was valid }
TEdit(Sender).Text := Format('%.6g', [NewVal]);
***************
*** 4343,4347 ****
if (Sender = pnlWeight) then
begin
! if v <= 0.000001 then v := 0.000001;
cp.xform[SelectedTriangle].density := v;
pEdit := @txtP;
--- 4341,4346 ----
if (Sender = pnlWeight) then
begin
! if v <= 0.000001 then v := 0.000001
! else if v > MAX_WEIGHT then v := MAX_WEIGHT;
cp.xform[SelectedTriangle].density := v;
pEdit := @txtP;
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-09 13:37:55
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3435/Source
Modified Files:
ScriptForm.pas
Log Message:
new function: VariationName(index)
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ScriptForm.pas 4 Dec 2006 16:23:14 -0000 1.27
--- ScriptForm.pas 9 Dec 2006 13:37:51 -0000 1.28
***************
*** 402,405 ****
--- 402,406 ----
}
procedure VariationIndexProc(AMachine: TatVirtualMachine);
+ procedure VariationNameProc(AMachine: TatVirtualMachine);
procedure GetPivotModeProc(AMachine: TatVirtualMachine);
procedure SetPivotModeProc(AMachine: TatVirtualMachine);
***************
*** 1222,1225 ****
--- 1223,1227 ----
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);
***************
*** 1852,1855 ****
--- 1854,1871 ----
end;
+ procedure TOperationLibrary.VariationNameProc(AMachine: TatVirtualMachine);
+ var
+ i: integer;
+ str: string;
+ begin
+ with AMachine do begin
+ i := GetInputArgAsInteger(0);
+ if (i >= 0) and (i < NRVAR) then
+ ReturnOutputArg(varnames(i))
+ else
+ ReturnOutputArg('');
+ end;
+ end;
+
procedure TOperationLibrary.FileCountProc(AMachine: TatVirtualMachine);
begin
***************
*** 2701,2705 ****
begin
v := GetInputArgAsFloat(0);
! if (v > 0) and (v < 256) then
cp.xform[ActiveTransform].density := v;
end;
--- 2717,2721 ----
begin
v := GetInputArgAsFloat(0);
! if (v > 0) and (v <= MAX_WEIGHT) then
cp.xform[ActiveTransform].density := v;
end;
***************
*** 2868,2872 ****
begin
cp.xform[ActiveTransform].Clear;
! cp.xform[ActiveTransform].density := 0.5;
end;
--- 2884,2891 ----
begin
cp.xform[ActiveTransform].Clear;
! if ActiveTransform < Transforms then
! cp.xform[ActiveTransform].density := 0.5
! else
! cp.xform[ActiveTransform].symmetry := 1;
end;
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-09 08:39:25
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20732/Source
Modified Files:
RenderST.pas
Log Message:
oops!
Index: RenderST.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/RenderST.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RenderST.pas 6 Sep 2006 12:34:00 -0000 1.2
--- RenderST.pas 9 Dec 2006 08:39:22 -0000 1.3
***************
*** 14,18 ****
protected
! PropTable: array[0..SUB_BATCH_SIZE] of TXform;
finalXform: TXform;
UseFinalXform: boolean;
--- 14,18 ----
protected
! PropTable: array[0..PROP_TABLE_SIZE] of TXform;
finalXform: TXform;
UseFinalXform: boolean;
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-04 16:23:17
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18467/Source
Modified Files:
ScriptForm.pas
Log Message:
VariationSupported changed to VariationIndex
added RotateOrigin
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ScriptForm.pas 2 Dec 2006 13:07:11 -0000 1.26
--- ScriptForm.pas 4 Dec 2006 16:23:14 -0000 1.27
***************
*** 192,195 ****
--- 192,196 ----
procedure TransformClearProc(AMachine: TatVirtualMachine);
procedure TransformRotateProc(AMachine: TatVirtualMachine);
+ procedure TransformRotateOriginProc(AMachine: TatVirtualMachine);
{ Render interface }
***************
*** 400,404 ****
procedure SetVariableStr(AMachine: TatVirtualMachine);
}
! procedure VariationSupportedProc(AMachine: TatVirtualMachine);
procedure GetPivotModeProc(AMachine: TatVirtualMachine);
procedure SetPivotModeProc(AMachine: TatVirtualMachine);
--- 401,405 ----
procedure SetVariableStr(AMachine: TatVirtualMachine);
}
! procedure VariationIndexProc(AMachine: TatVirtualMachine);
procedure GetPivotModeProc(AMachine: TatVirtualMachine);
procedure SetPivotModeProc(AMachine: TatVirtualMachine);
***************
*** 1220,1224 ****
}
Scripter.AddConstant('ProgramVersionString', AppVersionString);
! Scripter.DefineMethod('VariationSupported', 1, tkInteger, nil, VariationSupportedProc);
Scripter.DefineMethod('GetPivotMode', 0, tkInteger, nil, GetPivotModeProc);
--- 1221,1225 ----
}
Scripter.AddConstant('ProgramVersionString', AppVersionString);
! Scripter.DefineMethod('VariationIndex', 1, tkInteger, nil, VariationIndexProc);
Scripter.DefineMethod('GetPivotMode', 0, tkInteger, nil, GetPivotModeProc);
***************
*** 1838,1842 ****
*)
! procedure TOperationLibrary.VariationSupportedProc(AMachine: TatVirtualMachine);
var
i: integer;
--- 1839,1843 ----
*)
! procedure TOperationLibrary.VariationIndexProc(AMachine: TatVirtualMachine);
var
i: integer;
***************
*** 1844,1851 ****
begin
with AMachine do begin
! str := GetInputArgAsString(0);
! i := 0;
! while (i < NRVAR) and (varnames(i) <> str) do Inc(i);
! ReturnOutputArg(i < NRVAR);
end;
end;
--- 1845,1852 ----
begin
with AMachine do begin
! str := LowerCase(GetInputArgAsString(0));
! i := NRVAR-1;
! while (i >= 0) and (varnames(i) <> str) do Dec(i);
! ReturnOutputArg(i);
end;
end;
***************
*** 2870,2873 ****
--- 2871,2888 ----
end;
+ procedure TScriptEditor.TransformRotateOriginProc(AMachine: TatVirtualMachine);
+ var
+ tx, ty, rad: double;
+ begin
+ rad := AMachine.GetInputArgAsFloat(0) * pi / 180;
+ with EditForm.WorldPivot do
+ with cp.xform[ActiveTransform] do begin
+ tx := x + (c[2,0] - x) * cos(rad) - (-c[2,1] - y) * sin(rad);
+ ty := y + (c[2,0] - x) * sin(rad) + (-c[2,1] - y) * cos(rad);
+ c[2,0] := tx;
+ c[2,1] := -ty;
+ end;
+ end;
+
// -- pivot-aware rotating --
***************
*** 3006,3009 ****
--- 3021,3025 ----
DefineMethod('Clear', 0, tkNone, nil, TransformClearProc);
DefineMethod('Rotate', 1, tkNone, nil, TransformRotateProc);
+ DefineMethod('RotateOrigin', 1, tkNone, nil, TransformRotateOriginProc);
DefineProp('a', tkFloat, GetTransformAProc, SetTransformAProc);
***************
*** 3013,3017 ****
DefineProp('e', tkFloat, GetTransformEProc, SetTransformEProc);
DefineProp('f', tkFloat, GetTransformFProc, SetTransformFProc);
! DefineProp('Variation', tkFloat, GetTransformVarProc, SetTransformVarProc, nil, false, 1); // obsolete
end;
Scripter.AddObject('Transform', Transform);
--- 3029,3033 ----
DefineProp('e', tkFloat, GetTransformEProc, SetTransformEProc);
DefineProp('f', tkFloat, GetTransformFProc, SetTransformFProc);
! DefineProp('Variation', tkFloat, GetTransformVarProc, SetTransformVarProc, nil, false, 1);
end;
Scripter.AddObject('Transform', Transform);
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-02 13:07:13
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8947/Source
Modified Files:
ScriptForm.pas
Log Message:
more things accessible from scripter...
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ScriptForm.pas 1 Dec 2006 16:52:43 -0000 1.25
--- ScriptForm.pas 2 Dec 2006 13:07:11 -0000 1.26
***************
*** 154,157 ****
--- 154,159 ----
procedure SetFlameBatchesProc(AMachine: TatVirtualMachine);
procedure GetFlameBatchesProc(AMachine: TatVirtualMachine);
+ procedure GetFlameFinalxformEnabledProc(AMachine: TatVirtualMachine);
+ procedure SetFlameFinalxformEnabledProc(AMachine: TatVirtualMachine);
{ Transform interface }
***************
*** 1540,1544 ****
for i := nxform to NXFORMS - 1 do
cp1.xform[i].density := 0;
- // --?-- cp1.NormalizeWeights;
// Check for symmetry parameter
if cp1.symmetry <> 0 then
--- 1542,1545 ----
***************
*** 1583,1587 ****
if ScriptEditor.cp.xform[i].density = 0 then break;
NumTransforms := i;
- // --?-- ScriptEditor.cp.NormalizeWeights;
// FlameName := FileList[index];
finally
--- 1584,1587 ----
***************
*** 1655,1659 ****
if ScriptEditor.cp.xform[i].density = 0 then break;
NumTransforms := i;
- // --?-- ScriptEditor.cp.NormalizeWeights;
if SavedPal then ScriptEditor.cp.cmap := Palette;
ScriptEditor.cp.name := FileList[index];
--- 1655,1658 ----
***************
*** 1893,1897 ****
begin
AMachine.Paused := True;
- // --?-- ScriptEditor.cp.NormalizeWeights;
PreviewForm.cp.Copy(ScriptEditor.cp);
PreviewForm.cp.AdjustScale(PreviewForm.Image.Width, PreviewForm.Image.Height);
--- 1892,1895 ----
***************
*** 1908,1912 ****
if NumTransforms > 1 then
begin
- // --?-- ScriptEditor.cp.NormalizeWeights;
ScriptRenderForm.cp.Copy(ScriptEditor.cp);
ScriptRenderForm.Caption := 'Rendering ' + ScriptEditor.Renderer.Filename; ;
--- 1906,1909 ----
***************
*** 2053,2057 ****
begin
try
! if (ActiveTransform < 0) or (ActiveTransform > NXFORMS - 1) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Translate(GetInputArgAsFloat(0), GetInputArgAsFloat(1));
--- 2050,2055 ----
begin
try
! if (ActiveTransform < 0) or (ActiveTransform > NXFORMS) then // was: NXFORMS-1
! raise EFormatInvalid.Create('Transform out of range.');
with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Translate(GetInputArgAsFloat(0), GetInputArgAsFloat(1));
***************
*** 2438,2441 ****
--- 2436,2451 ----
end;
+ procedure TScriptEditor.GetFlameFinalxformEnabledProc(AMachine: TatVirtualMachine);
+ begin
+ with AMachine do
+ ReturnOutPutArg(cp.finalXformEnabled);
+ end;
+
+ procedure TScriptEditor.SetFlameFinalxformEnabledProc(AMachine: TatVirtualMachine);
+ begin
+ with AMachine do
+ cp.finalXformEnabled := (GetInputArgAsInteger(0) <> 0);
+ end;
+
procedure TScriptEditor.GetFlameWidthProc(AMachine: TatVirtualMachine);
begin
***************
*** 2475,2479 ****
begin
with AMachine do
! ReturnOutPutArg(cp.pixels_per_unit);
end;
--- 2485,2490 ----
begin
with AMachine do
! // ReturnOutPutArg(cp.pixels_per_unit);
! ReturnOutPutArg(100*cp.pixels_per_unit/cp.Width);
end;
***************
*** 2481,2485 ****
begin
with AMachine do
! cp.pixels_per_unit := GetInputArgAsInteger(0);
end;
--- 2492,2497 ----
begin
with AMachine do
! // cp.pixels_per_unit := GetInputArgAsInteger(0); <<--- hmm, ppu isn't integer :-\
! cp.pixels_per_unit := GetInputArgAsFloat(0) * cp.Width / 100.0;
end;
***************
*** 2976,2979 ****
--- 2988,2992 ----
DefineProp('Hue', tkFloat, GetFlameHueProc, SetFlameHueProc);
DefineProp('Batches', tkInteger, GetFlameBatchesProc, SetFlameBatchesProc);
+ DefineProp('FinalXformEnabled', tkInteger, GetFlameFinalxformEnabledProc, SetFlameFinalxformEnabledProc);
end;
Scripter.AddObject('Flame', Flame);
***************
*** 3327,3331 ****
if (LastError = '') and UpdateIt then
begin
- // --?-- cp.NormalizeWeights;
MainForm.UpdateUndo;
MainCp.Copy(cp);
--- 3340,3343 ----
***************
*** 3359,3363 ****
MainForm.StopThread;
MainForm.UpdateUndo;
- // --?-- cp.NormalizeWeights;
MainCp.Copy(cp);
// MainCp.name := FlameName;
--- 3371,3374 ----
|
|
From: Peter Sdobnov <zueuk@us...> - 2006-12-01 16:52:47
|
Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5679/Source
Modified Files:
Editor.pas ScriptForm.pas
Log Message:
pivot point control in scripter
Index: Editor.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Editor.pas 24 Nov 2006 13:16:37 -0000 1.55
--- Editor.pas 1 Dec 2006 16:52:43 -0000 1.56
***************
*** 359,363 ****
TriangleCaught, CornerCaught, EdgeCaught: boolean;
LocalAxisLocked: boolean;
! // SelectedTriangle: integer; // outside only for scripting (??)
oldSelected: integer;
SelectedCorner: integer;
--- 359,363 ----
TriangleCaught, CornerCaught, EdgeCaught: boolean;
LocalAxisLocked: boolean;
! // SelectedTriangle: integer; // outside only for scripting
oldSelected: integer;
SelectedCorner: integer;
***************
*** 371,376 ****
oldx, oldy, olddist: double;
! Pivot, LocalPivot, WorldPivot: TSPoint;
! PivotMode: (pivotLocal, pivotWorld);
VarsCache: array[0..64] of double; // hack: to prevent slow valuelist redraw
--- 371,376 ----
oldx, oldy, olddist: double;
! Pivot: TSPoint;
!
VarsCache: array[0..64] of double; // hack: to prevent slow valuelist redraw
***************
*** 399,403 ****
--- 399,406 ----
Render: TRenderer;
+ // Accessible from scripter
SelectedTriangle: integer;
+ PivotMode: (pivotLocal, pivotWorld);
+ LocalPivot, WorldPivot: TSPoint;
procedure UpdatePreview;
***************
*** 407,410 ****
--- 410,415 ----
function LastTriangle: integer;
function InsideTriangle(x, y: double): integer;
+
+ procedure ScriptGetPivot(var px, py: double);
end;
***************
*** 424,428 ****
function ScaleTriangle(t: TTriangle; scale: double): TTriangle;
function RotateTriangleCenter(t: TTriangle; rad: double): TTriangle;
! function RotateTrianglePoint(t: TTriangle; x, y, rad: double): TTriangle;
function Centroid(t: TTriangle): TSPoint;
function OffsetTriangleRandom(t: TTriangle): TTriangle;
--- 429,433 ----
function ScaleTriangle(t: TTriangle; scale: double): TTriangle;
function RotateTriangleCenter(t: TTriangle; rad: double): TTriangle;
! function RotateTrianglePoint(t: TTriangle; xr, yr: double; rad: double): TTriangle;
function Centroid(t: TTriangle): TSPoint;
function OffsetTriangleRandom(t: TTriangle): TTriangle;
***************
*** 546,569 ****
for i := 0 to 2 do
begin
! Result.x[i] := xr + (t.x[i] - xr) * cos(rad) -
! (t.y[i] - yr) * sin(rad);
! Result.y[i] := yr + (t.x[i] - xr) * sin(rad) +
! (t.y[i] - yr) * cos(rad);
end;
end;
! function RotateTrianglePoint(t: TTriangle; x, y, rad: double): TTriangle;
var
i: integer;
- xr, yr: double;
begin
- xr := x;
- yr := y;
for i := 0 to 2 do
begin
! Result.x[i] := xr + (t.x[i] - xr) * cos(rad) -
! (t.y[i] - yr) * sin(rad);
! Result.y[i] := yr + (t.x[i] - xr) * sin(rad) +
! (t.y[i] - yr) * cos(rad);
end;
end;
--- 551,567 ----
for i := 0 to 2 do
begin
! Result.x[i] := xr + (t.x[i] - xr) * cos(rad) - (t.y[i] - yr) * sin(rad);
! Result.y[i] := yr + (t.x[i] - xr) * sin(rad) + (t.y[i] - yr) * cos(rad);
end;
end;
! function RotateTrianglePoint(t: TTriangle; xr, yr: double; rad: double): TTriangle;
var
i: integer;
begin
for i := 0 to 2 do
begin
! Result.x[i] := xr + (t.x[i] - xr) * cos(rad) - (t.y[i] - yr) * sin(rad);
! Result.y[i] := yr + (t.x[i] - xr) * sin(rad) + (t.y[i] - yr) * cos(rad);
end;
end;
***************
*** 828,835 ****
--- 826,837 ----
editPivotX.Text := Format('%.6g', [LocalPivot.x]);
editPivotY.Text := Format('%.6g', [LocalPivot.y]);
+ btnPivotMode.Caption := 'Local Pivot';
+ tbPivotMode.Down := false;
end
else begin
editPivotX.Text := Format('%.6g', [WorldPivot.x]);
editPivotY.Text := Format('%.6g', [WorldPivot.y]);
+ btnPivotMode.Caption := 'World Pivot';
+ tbPivotMode.Down := true;
end;
***************
*** 3238,3241 ****
--- 3240,3256 ----
end;
+ procedure TEditForm.ScriptGetPivot(var px, py: double);
+ begin
+ if (PivotMode = pivotLocal) then
+ with MainTriangles[SelectedTriangle] do begin
+ px := x[1] + (x[0] - x[1])*LocalPivot.x + (x[2] - x[1])*LocalPivot.y;
+ py := y[1] + (y[0] - y[1])*LocalPivot.x + (y[2] - y[1])*LocalPivot.y;
+ end
+ else begin
+ px := WorldPivot.x;
+ py := WorldPivot.y;
+ end;
+ end;
+
procedure TEditForm.btTrgRotateLeftClick(Sender: TObject);
var
***************
*** 4141,4154 ****
begin
if PivotMode <> pivotLocal then
! with MainTriangles[SelectedTriangle] do begin
PivotMode := pivotLocal;
! btnPivotMode.Caption := 'Local Pivot';
! tbPivotMode.Down := false;
end
else
! with MainTriangles[SelectedTriangle] do begin
PivotMode := pivotWorld;
! btnPivotMode.Caption := 'World Pivot';
! tbPivotMode.Down := true;
end;
--- 4156,4171 ----
begin
if PivotMode <> pivotLocal then
! // with MainTriangles[SelectedTriangle] do
! begin
PivotMode := pivotLocal;
! // btnPivotMode.Caption := 'Local Pivot';
! // tbPivotMode.Down := false;
end
else
! // with MainTriangles[SelectedTriangle] do
! begin
PivotMode := pivotWorld;
! // btnPivotMode.Caption := 'World Pivot';
! // tbPivotMode.Down := true;
end;
Index: ScriptForm.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ScriptForm.pas 27 Nov 2006 06:14:14 -0000 1.24
--- ScriptForm.pas 1 Dec 2006 16:52:43 -0000 1.25
***************
*** 24,28 ****
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
ExtCtrls, StdCtrls, ControlPoint, Buttons, ComCtrls, ToolWin, Menus,
- // Variants,
atScript, atPascal, AdvMemo, Advmps, XFormMan, XForm, GradientHlpr, cmap;
--- 24,27 ----
***************
*** 169,188 ****
procedure GetTransformFProc(AMachine: TatVirtualMachine);
procedure SetTransformFProc(AMachine: TatVirtualMachine);
procedure GetTransformColorProc(AMachine: TatVirtualMachine);
procedure SetTransformColorProc(AMachine: TatVirtualMachine);
procedure GetTransformWeightProc(AMachine: TatVirtualMachine);
procedure SetTransformWeightProc(AMachine: TatVirtualMachine);
- procedure GetTransformVarProc(AMachine: TatVirtualMachine);
- procedure SetTransformVarProc(AMachine: TatVirtualMachine);
procedure GetTransformSymProc(AMachine: TatVirtualMachine);
procedure SetTransformSymProc(AMachine: TatVirtualMachine);
procedure GetTransformVariationProc(AMachine: TatVirtualMachine);
procedure SetTransformVariationProc(AMachine: TatVirtualMachine);
procedure GetTransformVariableProc(AMachine: TatVirtualMachine);
procedure SetTransformVariableProc(AMachine: TatVirtualMachine);
procedure GetTransformCoefsProc(AMachine: TatVirtualMachine);
procedure SetTransformCoefsProc(AMachine: TatVirtualMachine);
procedure GetTransformPostCoefsProc(AMachine: TatVirtualMachine);
procedure SetTransformPostCoefsProc(AMachine: TatVirtualMachine);
{ Render interface }
procedure GetRenderFilenameProc(AMachine: TatVirtualMachine);
--- 168,194 ----
procedure GetTransformFProc(AMachine: TatVirtualMachine);
procedure SetTransformFProc(AMachine: TatVirtualMachine);
+ procedure GetTransformVarProc(AMachine: TatVirtualMachine);
+ procedure SetTransformVarProc(AMachine: TatVirtualMachine);
+
procedure GetTransformColorProc(AMachine: TatVirtualMachine);
procedure SetTransformColorProc(AMachine: TatVirtualMachine);
procedure GetTransformWeightProc(AMachine: TatVirtualMachine);
procedure SetTransformWeightProc(AMachine: TatVirtualMachine);
procedure GetTransformSymProc(AMachine: TatVirtualMachine);
procedure SetTransformSymProc(AMachine: TatVirtualMachine);
+
procedure GetTransformVariationProc(AMachine: TatVirtualMachine);
procedure SetTransformVariationProc(AMachine: TatVirtualMachine);
procedure GetTransformVariableProc(AMachine: TatVirtualMachine);
procedure SetTransformVariableProc(AMachine: TatVirtualMachine);
+
procedure GetTransformCoefsProc(AMachine: TatVirtualMachine);
procedure SetTransformCoefsProc(AMachine: TatVirtualMachine);
procedure GetTransformPostCoefsProc(AMachine: TatVirtualMachine);
procedure SetTransformPostCoefsProc(AMachine: TatVirtualMachine);
+
+ procedure TransformClearProc(AMachine: TatVirtualMachine);
+ procedure TransformRotateProc(AMachine: TatVirtualMachine);
+
{ Render interface }
procedure GetRenderFilenameProc(AMachine: TatVirtualMachine);
***************
*** 224,227 ****
--- 230,235 ----
procedure GetFilterRadius(AMachine: TatVirtualMachine);
procedure SetFilterRadius(AMachine: TatVirtualMachine);
+ procedure GetTransparency(AMachine: TatVirtualMachine);
+ procedure SetTransparency(AMachine: TatVirtualMachine);
procedure GetLowQuality(AMachine: TatVirtualMachine);
procedure SetLowQuality(AMachine: TatVirtualMachine);
***************
*** 390,395 ****
procedure SetVariableStr(AMachine: TatVirtualMachine);
}
- procedure GetProgramVersionProc(AMachine: TatVirtualMachine);
procedure VariationSupportedProc(AMachine: TatVirtualMachine);
procedure CalculateScale(AMachine: TatVirtualMachine);
--- 398,408 ----
procedure SetVariableStr(AMachine: TatVirtualMachine);
}
procedure VariationSupportedProc(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);
***************
*** 624,627 ****
--- 637,655 ----
end;
+ procedure TScriptEditor.GetTransparency(AMachine: TatVirtualMachine);
+ begin
+ AMachine.ReturnOutPutArg(PNGTransparency);
+ end;
+
+ procedure TScriptEditor.SetTransparency(AMachine: TatVirtualMachine);
+ var
+ v: double;
+ begin
+ if AMachine.GetInputArgAsInteger(0) = 0 then
+ PNGTransparency := 0
+ else
+ PNGTransparency := 1;
+ end;
+
procedure TScriptEditor.GetLowQuality(AMachine: TatVirtualMachine);
begin
***************
*** 1189,1195 ****
Scripter.DefineMethod('SetVariableStr', 2, tkNone, nil, SetVariableStr);
}
! Scripter.DefineMethod('ProgramVersion', 0, tkString, nil, GetProgramVersionProc);
Scripter.DefineMethod('VariationSupported', 1, tkInteger, nil, VariationSupportedProc);
Scripter.DefineMethod('CalculateScale', 0, tkNone, nil, CalculateScale);
Scripter.DefineMethod('CalculateBounds', 0, tkNone, nil, CalculateBounds);
--- 1217,1230 ----
Scripter.DefineMethod('SetVariableStr', 2, tkNone, nil, SetVariableStr);
}
! Scripter.AddConstant('ProgramVersionString', AppVersionString);
Scripter.DefineMethod('VariationSupported', 1, tkInteger, nil, VariationSupportedProc);
+ 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);
***************
*** 1804,1812 ****
*)
- procedure TOperationLibrary.GetProgramVersionProc(AMachine: TatVirtualMachine);
- begin
- AMachine.ReturnOutputArg(AppVersionString);
- end;
-
procedure TOperationLibrary.VariationSupportedProc(AMachine: TatVirtualMachine);
var
--- 1839,1842 ----
***************
*** 2040,2043 ****
--- 2070,2131 ----
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 ****************************** }
***************
*** 2764,2767 ****
--- 2852,2883 ----
end;
+ procedure TScriptEditor.TransformClearProc(AMachine: TatVirtualMachine);
+ begin
+ cp.xform[ActiveTransform].Clear;
+ cp.xform[ActiveTransform].density := 0.5;
+ end;
+
+ // -- pivot-aware rotating --
+
+ procedure TScriptEditor.TransformRotateProc(AMachine: TatVirtualMachine);
+ var
+ Triangles: TTriangles;
+ px, py: double;
+
+ tx: TXForm;
+ begin
+ tx := TXForm.Create;
+ tx.Assign(scripteditor.cp.xform[NumTransforms]); // just in case (?)
+
+ EditForm.ScriptGetPivot(px, py);
+ cp.TrianglesFromCp(Triangles); // it's ugly but it works...
+ Triangles[ActiveTransform] :=
+ RotateTrianglePoint(Triangles[ActiveTransform], px, py, AMachine.GetInputArgAsFloat(0) * pi / 180);
+ cp.GetFromTriangles(Triangles, NumTransforms);
+
+ cp.xform[NumTransforms].Assign(tx);
+ tx.Free;
+ end;
+
{ *************************** Render interface ****************************** }
***************
*** 2867,2876 ****
DefineProp('coefs', tkFloat, GetTransformCoefsProc, SetTransformCoefsProc, nil, false, 2);
DefineProp('post', tkFloat, GetTransformPostCoefsProc, SetTransformPostCoefsProc, nil, false, 2);
- DefineProp('a', tkFloat, GetTransformAProc, SetTransformAProc);
- DefineProp('b', tkFloat, GetTransformBProc, SetTransformBProc);
- DefineProp('c', tkFloat, GetTransformCProc, SetTransformCProc);
- DefineProp('d', tkFloat, GetTransformDProc, SetTransformDProc);
- DefineProp('e', tkFloat, GetTransformEProc, SetTransformEProc);
- DefineProp('f', tkFloat, GetTransformFProc, SetTransformFProc);
DefineProp('Color', tkFloat, GetTransformColorProc, SetTransformColorProc);
DefineProp('Weight', tkFloat, GetTransformWeightProc, SetTransformWeightProc);
--- 2983,2986 ----
***************
*** 2881,2884 ****
--- 2991,3003 ----
DefineProp(GetVariableNameAt(i), tkFloat, GetTransformVariableProc, SetTransformVariableProc);
+ DefineMethod('Clear', 0, tkNone, nil, TransformClearProc);
+ DefineMethod('Rotate', 1, tkNone, nil, TransformRotateProc);
+
+ DefineProp('a', tkFloat, GetTransformAProc, SetTransformAProc);
+ DefineProp('b', tkFloat, GetTransformBProc, SetTransformBProc);
+ DefineProp('c', tkFloat, GetTransformCProc, SetTransformCProc);
+ DefineProp('d', tkFloat, GetTransformDProc, SetTransformDProc);
+ DefineProp('e', tkFloat, GetTransformEProc, SetTransformEProc);
+ DefineProp('f', tkFloat, GetTransformFProc, SetTransformFProc);
DefineProp('Variation', tkFloat, GetTransformVarProc, SetTransformVarProc, nil, false, 1); // obsolete
end;
***************
*** 2901,2904 ****
--- 3020,3024 ----
DefineProp('Oversample', tkInteger, GetOversample, SetOversample);
DefineProp('FilterRadius', tkFloat, GetFilterRadius, SetFilterRadius);
+ DefineProp('Transparency', tkInteger, GetTransparency, SetTransparency);
DefineProp('PreviewLowQuality', tkFloat, GetLowQuality, SetLowQuality);
DefineProp('PreviewMediumQuality', tkFloat, GetMediumQuality, SetMediumQuality);
***************
*** 2986,2989 ****
--- 3106,3110 ----
Scripter.AddConstant('V_CURL', 37);
Scripter.AddConstant('V_RANDOM', -1);
+ (*
{ Variation parameters }
Scripter.AddConstant('RADIALBLUR_ANGLE', 0);
***************
*** 3006,3009 ****
--- 3127,3131 ----
Scripter.AddConstant('CURL_C1', 17);
Scripter.AddConstant('CURL_C2', 18);
+ *)
{ Variables }
Scripter.AddVariable('SelectedTransform', EditForm.SelectedTriangle);
|