mirror-github-bspeice/apophysis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final preparations for the 2.03c

Browse Source
This commit is contained in:
zueuk
2006-01-06 16:29:02 +00:00
parent e3d705bd3d
commit 3325cac7de
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
2.10/Source/ControlPoint.pas
View File

@ -1748,8 +1748,8 @@ function TControlPoint.HasNewVariants: boolean;
var var
i,v: integer; i,v: integer;
begin begin
Result := false; Result := false; // flam3 will be updated anyway :-)
{
for i:= 0 to NXFORMS - 1 do begin for i:= 0 to NXFORMS - 1 do begin
if xform[i].density = 0 then if xform[i].density = 0 then
break; break;
@ -1760,6 +1760,7 @@ begin
if result then if result then
break; break;
end; end;
}
end; end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

22
2.10/Source/Editor.dfm
View File

@ -1220,8 +1220,10 @@ object EditForm: TEditForm
Height = 21 Height = 21
Hint = 'Reset vector X' Hint = 'Reset vector X'
Caption = 'X' Caption = 'X'
Enabled = False
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Visible = False
OnClick = btnXpostClick OnClick = btnXpostClick
end end
object btnYpost: TSpeedButton object btnYpost: TSpeedButton
@ -1231,8 +1233,10 @@ object EditForm: TEditForm
Height = 21 Height = 21
Hint = 'Reset vector Y' Hint = 'Reset vector Y'
Caption = 'Y' Caption = 'Y'
Enabled = False
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Visible = False
OnClick = btnYpostClick OnClick = btnYpostClick
end end
object btnOpost: TSpeedButton object btnOpost: TSpeedButton
@ -1242,8 +1246,10 @@ object EditForm: TEditForm
Height = 21 Height = 21
Hint = 'Reset vector O' Hint = 'Reset vector O'
Caption = 'O' Caption = 'O'
Enabled = False
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Visible = False
OnClick = btnOpostClick OnClick = btnOpostClick
end end
object btnResetPostXForm: TSpeedButton object btnResetPostXForm: TSpeedButton
@ -1253,8 +1259,10 @@ object EditForm: TEditForm
Height = 22 Height = 22
Hint = 'Reset post-transform vectors to defaults' Hint = 'Reset post-transform vectors to defaults'
Caption = 'Reset post-transform' Caption = 'Reset post-transform'
Enabled = False
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Visible = False
OnClick = btnResetPostXFormClick OnClick = btnResetPostXFormClick
end end
object btnSwapXforms: TSpeedButton object btnSwapXforms: TSpeedButton
@ -1264,6 +1272,7 @@ object EditForm: TEditForm
Height = 22 Height = 22
Hint = 'Swap Xform with PostXform' Hint = 'Swap Xform with PostXform'
Caption = '[ Xform <-> PostXform ]' Caption = '[ Xform <-> PostXform ]'
Enabled = False
Flat = True Flat = True
Font.Charset = ANSI_CHARSET Font.Charset = ANSI_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -1273,6 +1282,7 @@ object EditForm: TEditForm
ParentFont = False ParentFont = False
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Visible = False
OnClick = btnSwapXformsClick OnClick = btnSwapXformsClick
end end
object txtA: TEdit object txtA: TEdit
@ -1366,8 +1376,10 @@ object EditForm: TEditForm
Top = 188 Top = 188
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 8 TabOrder = 8
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end
@ -1376,8 +1388,10 @@ object EditForm: TEditForm
Top = 188 Top = 188
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 9 TabOrder = 9
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end
@ -1386,8 +1400,10 @@ object EditForm: TEditForm
Top = 212 Top = 212
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 10 TabOrder = 10
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end
@ -1396,8 +1412,10 @@ object EditForm: TEditForm
Top = 212 Top = 212
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 11 TabOrder = 11
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end
@ -1406,8 +1424,10 @@ object EditForm: TEditForm
Top = 236 Top = 236
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 12 TabOrder = 12
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end
@ -1416,8 +1436,10 @@ object EditForm: TEditForm
Top = 236 Top = 236
Width = 57 Width = 57
Height = 21 Height = 21
Enabled = False
TabOrder = 13 TabOrder = 13
Text = '0' Text = '0'
Visible = False
OnExit = PostCoefValidate OnExit = PostCoefValidate
OnKeyPress = PostCoefKeypress OnKeyPress = PostCoefKeypress
end end

17
2.10/Source/Editor.pas
View File

@ -1009,7 +1009,7 @@ begin
try try
with Bitmap.Canvas do with Bitmap.Canvas do
begin begin
brush.Color := EditorBkgColor; //pnlBackColor.Color; brush.Color := EditorBkgColor;
FillRect(Rect(0, 0, Width, Height)); FillRect(Rect(0, 0, Width, Height));
Pen.Style := psSolid; Pen.Style := psSolid;
@ -1056,14 +1056,14 @@ begin
{Reference Triangle} {Reference Triangle}
Pen.Style := psDot; Pen.Style := psDot;
Pen.color := ReferenceTriangleColor; //pnlReference.Color; Pen.color := ReferenceTriangleColor;
brush.Color := gridColor1 shr 1 and $7f7f7f; brush.Color := gridColor1 shr 1 and $7f7f7f;
a := ToScreen(MainTriangles[-1].x[0], MainTriangles[-1].y[0]); a := ToScreen(MainTriangles[-1].x[0], MainTriangles[-1].y[0]);
b := ToScreen(MainTriangles[-1].x[1], MainTriangles[-1].y[1]); b := ToScreen(MainTriangles[-1].x[1], MainTriangles[-1].y[1]);
c := ToScreen(MainTriangles[-1].x[2], MainTriangles[-1].y[2]); c := ToScreen(MainTriangles[-1].x[2], MainTriangles[-1].y[2]);
Polyline([a, b, c, a]); Polyline([a, b, c, a]);
brush.Color := EditorBkgColor; //pnlBackColor.Color; brush.Color := EditorBkgColor;
Font.color := Pen.color; Font.color := Pen.color;
TextOut(c.x-9, c.y-12, 'Y'); TextOut(c.x-9, c.y-12, 'Y');
TextOut(b.x-8, b.y+1, 'O'); TextOut(b.x-8, b.y+1, 'O');
@ -1251,7 +1251,7 @@ end;
Pen.Mode:=pmMerge; Pen.Mode:=pmMerge;
brush.Color:=Pen.Color shr 1 and $7f7f7f; brush.Color:=Pen.Color shr 1 and $7f7f7f;
if SelectMode or (mouseOverTriangle = SelectedTriangle) then if (SelectMode and (editMode <> modePick)) or (mouseOverTriangle = SelectedTriangle) then
Polygon([a, b, c]) Polygon([a, b, c])
else else
PolyLine([a, b, c, a]); PolyLine([a, b, c, a]);
@ -1288,11 +1288,9 @@ end;
end end
else if (mouseOverTriangle>=0) and (mouseOverCorner >= 0) then // highlight corner under cursor else if (mouseOverTriangle>=0) and (mouseOverCorner >= 0) then // highlight corner under cursor
begin begin
// brush.Color:=clSilver;
case mouseOverCorner of case mouseOverCorner of
0: brush.Color:=clRed; 0: brush.Color:=clRed;
2: brush.Color:=clGreen; 2: brush.Color:=clBlue;
else brush.Color:=clSilver; else brush.Color:=clSilver;
end; end;
@ -1532,6 +1530,8 @@ FoundCorner:
TriangleView.Cursor := crEditRotate; TriangleView.Cursor := crEditRotate;
modeScale: modeScale:
TriangleView.Cursor := crEditScale; TriangleView.Cursor := crEditScale;
modePick:
TriangleView.Cursor := crEditArrow;
end end
else else
TriangleView.Cursor := crEditArrow; //crDefault; TriangleView.Cursor := crEditArrow; //crDefault;
@ -3778,6 +3778,7 @@ begin
if editMode = modePick then begin if editMode = modePick then begin
editMode := oldMode; editMode := oldMode;
oldMode := modeNone; oldMode := modeNone;
TriangleView.Invalidate;
// hack: to generate MouseMove event // hack: to generate MouseMove event
GetCursorPos(MousePos); GetCursorPos(MousePos);
SetCursorPos(MousePos.x, MousePos.y); SetCursorPos(MousePos.x, MousePos.y);
@ -3787,7 +3788,7 @@ begin
if oldMode <> modeNone then exit; if oldMode <> modeNone then exit;
oldMode := editMode; oldMode := editMode;
editMode := modePick; editMode := modePick;
//TriangleView.Cursor := crCross; //... TriangleView.Invalidate;
btnPickPivot.Down := true; btnPickPivot.Down := true;
end; end;

5
2.10/Source/Main.pas
View File

@ -2115,7 +2115,7 @@ function TMainForm.UPRString(cp1: TControlPoint; Entry: string): string;
{ Returns a string containing an Ultra Fractal parameter set for copying { Returns a string containing an Ultra Fractal parameter set for copying
or saving to file } or saving to file }
var var
IterDensity, m, j: integer; IterDensity, m, i, j: integer;
scale, a, b, c, d, e, f, p: double; scale, a, b, c, d, e, f, p: double;
GradStrings, Strings: TStringList; GradStrings, Strings: TStringList;
rept, cby, smap, sol: string; rept, cby, smap, sol: string;
@ -4054,7 +4054,7 @@ begin
if TagName = 'color' then if TagName = 'color' then
begin begin
// diable generating pallete // diable generating pallete
if Parsecp.cmapindex = -2 then //if Parsecp.cmapindex = -2 then
Parsecp.cmapindex := -1; Parsecp.cmapindex := -1;
i := StrToInt(Attributes.value('index')); i := StrToInt(Attributes.value('index'));
@ -4067,6 +4067,7 @@ begin
if TagName = 'colors' then if TagName = 'colors' then
begin begin
ParseCompactcolors(Parsecp, StrToInt(Attributes.value('count')), Attributes.value('data')); ParseCompactcolors(Parsecp, StrToInt(Attributes.value('count')), Attributes.value('data'));
Parsecp.cmapindex := -1;
end; end;
if TagName = 'symmetry' then if TagName = 'symmetry' then
begin begin

6
2.10/Source/XFormMan.pas
View File

@ -6,7 +6,7 @@ uses
BaseVariation; BaseVariation;
const const
NRLOCVAR = 27; NRLOCVAR = 26;
function NrVar: integer; function NrVar: integer;
function Varnames(const index: integer): String; function Varnames(const index: integer): String;
@ -60,8 +60,8 @@ const
'fan', 'fan',
'eyefish', 'eyefish',
'bubble', 'bubble',
'cylinder', 'cylinder'
'smoke' // 'smoke' - variation disabled... for now :)
); );
begin begin
if Index < NRLOCVAR then if Index < NRLOCVAR then

9
2.10/Source/varFan2.pas
View File

@ -31,7 +31,7 @@ implementation
uses uses
Math; Math;
{ TVariationTest } { TVariationFan2 }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
procedure TVariationFan2.Prepare; procedure TVariationFan2.Prepare;
@ -89,11 +89,8 @@ end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
constructor TVariationFan2.Create; constructor TVariationFan2.Create;
begin begin
// randomization removed to please mutator users ;-) FX := 2 * Random - 1;
// FX := 2 * Random - 1; FY := 2 * Random - 1;
// FY := 2 * Random - 1;
FX := 1;
FY := 1;
end; end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

4
2.10/Source/varRings2.pas
View File

@ -30,7 +30,7 @@ implementation
uses uses
Math; Math;
{ TVariationTest } { TVariationRings2 }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
procedure TVariationRings2.Prepare; procedure TVariationRings2.Prepare;
@ -56,7 +56,7 @@ begin
// dx := sqr(FVal) + EPS; - we can precalc it!!! // dx := sqr(FVal) + EPS; - we can precalc it!!!
// r := Length + dx - System.Int((Length + dx)/(2 * dx)) * 2 * dx - dx + Length * (1-dx); // r := Length + dx - System.Int((Length + dx)/(2 * dx)) * 2 * dx - dx + Length * (1-dx);
// ^^^^......he he, lots of useless calculation.......^^^^ // ^^^^......he he, lots of useless calculations......^^^^
r := vvar * (2 - dx * (System.Int((Length/dx + 1)/2) * 2 / Length + 1)); r := vvar * (2 - dx * (System.Int((Length/dx + 1)/2) * 2 / Length + 1));
FPx^ := FPx^ + r * FTx^; FPx^ := FPx^ + r * FTx^;