final preparations for the 2.03c
This commit is contained in:
zueuk
parent
e3d705bd3d
commit
3325cac7de
@ -1748,8 +1748,8 @@ function TControlPoint.HasNewVariants: boolean;
|
||||
var
|
||||
i,v: integer;
|
||||
begin
|
||||
Result := false;
|
||||
|
||||
Result := false; // flam3 will be updated anyway :-)
|
||||
{
|
||||
for i:= 0 to NXFORMS - 1 do begin
|
||||
if xform[i].density = 0 then
|
||||
break;
|
||||
@ -1760,6 +1760,7 @@ begin
|
||||
if result then
|
||||
break;
|
||||
end;
|
||||
}
|
||||
end;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -1220,8 +1220,10 @@ object EditForm: TEditForm
|
||||
Height = 21
|
||||
Hint = 'Reset vector X'
|
||||
Caption = 'X'
|
||||
Enabled = False
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
Visible = False
|
||||
OnClick = btnXpostClick
|
||||
end
|
||||
object btnYpost: TSpeedButton
|
||||
@ -1231,8 +1233,10 @@ object EditForm: TEditForm
|
||||
Height = 21
|
||||
Hint = 'Reset vector Y'
|
||||
Caption = 'Y'
|
||||
Enabled = False
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
Visible = False
|
||||
OnClick = btnYpostClick
|
||||
end
|
||||
object btnOpost: TSpeedButton
|
||||
@ -1242,8 +1246,10 @@ object EditForm: TEditForm
|
||||
Height = 21
|
||||
Hint = 'Reset vector O'
|
||||
Caption = 'O'
|
||||
Enabled = False
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
Visible = False
|
||||
OnClick = btnOpostClick
|
||||
end
|
||||
object btnResetPostXForm: TSpeedButton
|
||||
@ -1253,8 +1259,10 @@ object EditForm: TEditForm
|
||||
Height = 22
|
||||
Hint = 'Reset post-transform vectors to defaults'
|
||||
Caption = 'Reset post-transform'
|
||||
Enabled = False
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
Visible = False
|
||||
OnClick = btnResetPostXFormClick
|
||||
end
|
||||
object btnSwapXforms: TSpeedButton
|
||||
@ -1264,6 +1272,7 @@ object EditForm: TEditForm
|
||||
Height = 22
|
||||
Hint = 'Swap Xform with PostXform'
|
||||
Caption = '[ Xform <-> PostXform ]'
|
||||
Enabled = False
|
||||
Flat = True
|
||||
Font.Charset = ANSI_CHARSET
|
||||
Font.Color = clWindowText
|
||||
@ -1273,6 +1282,7 @@ object EditForm: TEditForm
|
||||
ParentFont = False
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
Visible = False
|
||||
OnClick = btnSwapXformsClick
|
||||
end
|
||||
object txtA: TEdit
|
||||
@ -1366,8 +1376,10 @@ object EditForm: TEditForm
|
||||
Top = 188
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 8
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
@ -1376,8 +1388,10 @@ object EditForm: TEditForm
|
||||
Top = 188
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 9
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
@ -1386,8 +1400,10 @@ object EditForm: TEditForm
|
||||
Top = 212
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 10
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
@ -1396,8 +1412,10 @@ object EditForm: TEditForm
|
||||
Top = 212
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 11
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
@ -1406,8 +1424,10 @@ object EditForm: TEditForm
|
||||
Top = 236
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 12
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
@ -1416,8 +1436,10 @@ object EditForm: TEditForm
|
||||
Top = 236
|
||||
Width = 57
|
||||
Height = 21
|
||||
Enabled = False
|
||||
TabOrder = 13
|
||||
Text = '0'
|
||||
Visible = False
|
||||
OnExit = PostCoefValidate
|
||||
OnKeyPress = PostCoefKeypress
|
||||
end
|
||||
|
||||
@ -1009,7 +1009,7 @@ begin
|
||||
try
|
||||
with Bitmap.Canvas do
|
||||
begin
|
||||
brush.Color := EditorBkgColor; //pnlBackColor.Color;
|
||||
brush.Color := EditorBkgColor;
|
||||
FillRect(Rect(0, 0, Width, Height));
|
||||
|
||||
Pen.Style := psSolid;
|
||||
@ -1056,14 +1056,14 @@ begin
|
||||
|
||||
{Reference Triangle}
|
||||
Pen.Style := psDot;
|
||||
Pen.color := ReferenceTriangleColor; //pnlReference.Color;
|
||||
Pen.color := ReferenceTriangleColor;
|
||||
brush.Color := gridColor1 shr 1 and $7f7f7f;
|
||||
a := ToScreen(MainTriangles[-1].x[0], MainTriangles[-1].y[0]);
|
||||
b := ToScreen(MainTriangles[-1].x[1], MainTriangles[-1].y[1]);
|
||||
c := ToScreen(MainTriangles[-1].x[2], MainTriangles[-1].y[2]);
|
||||
Polyline([a, b, c, a]);
|
||||
|
||||
brush.Color := EditorBkgColor; //pnlBackColor.Color;
|
||||
brush.Color := EditorBkgColor;
|
||||
Font.color := Pen.color;
|
||||
TextOut(c.x-9, c.y-12, 'Y');
|
||||
TextOut(b.x-8, b.y+1, 'O');
|
||||
@ -1251,7 +1251,7 @@ end;
|
||||
Pen.Mode:=pmMerge;
|
||||
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])
|
||||
else
|
||||
PolyLine([a, b, c, a]);
|
||||
@ -1288,11 +1288,9 @@ end;
|
||||
end
|
||||
else if (mouseOverTriangle>=0) and (mouseOverCorner >= 0) then // highlight corner under cursor
|
||||
begin
|
||||
// brush.Color:=clSilver;
|
||||
|
||||
case mouseOverCorner of
|
||||
0: brush.Color:=clRed;
|
||||
2: brush.Color:=clGreen;
|
||||
2: brush.Color:=clBlue;
|
||||
else brush.Color:=clSilver;
|
||||
end;
|
||||
|
||||
@ -1532,6 +1530,8 @@ FoundCorner:
|
||||
TriangleView.Cursor := crEditRotate;
|
||||
modeScale:
|
||||
TriangleView.Cursor := crEditScale;
|
||||
modePick:
|
||||
TriangleView.Cursor := crEditArrow;
|
||||
end
|
||||
else
|
||||
TriangleView.Cursor := crEditArrow; //crDefault;
|
||||
@ -3778,6 +3778,7 @@ begin
|
||||
if editMode = modePick then begin
|
||||
editMode := oldMode;
|
||||
oldMode := modeNone;
|
||||
TriangleView.Invalidate;
|
||||
// hack: to generate MouseMove event
|
||||
GetCursorPos(MousePos);
|
||||
SetCursorPos(MousePos.x, MousePos.y);
|
||||
@ -3787,7 +3788,7 @@ begin
|
||||
if oldMode <> modeNone then exit;
|
||||
oldMode := editMode;
|
||||
editMode := modePick;
|
||||
//TriangleView.Cursor := crCross; //...
|
||||
TriangleView.Invalidate;
|
||||
btnPickPivot.Down := true;
|
||||
end;
|
||||
|
||||
|
||||
@ -2115,7 +2115,7 @@ function TMainForm.UPRString(cp1: TControlPoint; Entry: string): string;
|
||||
{ Returns a string containing an Ultra Fractal parameter set for copying
|
||||
or saving to file }
|
||||
var
|
||||
IterDensity, m, j: integer;
|
||||
IterDensity, m, i, j: integer;
|
||||
scale, a, b, c, d, e, f, p: double;
|
||||
GradStrings, Strings: TStringList;
|
||||
rept, cby, smap, sol: string;
|
||||
@ -4054,7 +4054,7 @@ begin
|
||||
if TagName = 'color' then
|
||||
begin
|
||||
// diable generating pallete
|
||||
if Parsecp.cmapindex = -2 then
|
||||
//if Parsecp.cmapindex = -2 then
|
||||
Parsecp.cmapindex := -1;
|
||||
|
||||
i := StrToInt(Attributes.value('index'));
|
||||
@ -4067,6 +4067,7 @@ begin
|
||||
if TagName = 'colors' then
|
||||
begin
|
||||
ParseCompactcolors(Parsecp, StrToInt(Attributes.value('count')), Attributes.value('data'));
|
||||
Parsecp.cmapindex := -1;
|
||||
end;
|
||||
if TagName = 'symmetry' then
|
||||
begin
|
||||
|
||||
@ -6,7 +6,7 @@ uses
|
||||
BaseVariation;
|
||||
|
||||
const
|
||||
NRLOCVAR = 27;
|
||||
NRLOCVAR = 26;
|
||||
|
||||
function NrVar: integer;
|
||||
function Varnames(const index: integer): String;
|
||||
@ -60,8 +60,8 @@ const
|
||||
'fan',
|
||||
'eyefish',
|
||||
'bubble',
|
||||
'cylinder',
|
||||
'smoke'
|
||||
'cylinder'
|
||||
// 'smoke' - variation disabled... for now :)
|
||||
);
|
||||
begin
|
||||
if Index < NRLOCVAR then
|
||||
|
||||
@ -31,7 +31,7 @@ implementation
|
||||
uses
|
||||
Math;
|
||||
|
||||
{ TVariationTest }
|
||||
{ TVariationFan2 }
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
procedure TVariationFan2.Prepare;
|
||||
@ -89,11 +89,8 @@ end;
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
constructor TVariationFan2.Create;
|
||||
begin
|
||||
// randomization removed to please mutator users ;-)
|
||||
// FX := 2 * Random - 1;
|
||||
// FY := 2 * Random - 1;
|
||||
FX := 1;
|
||||
FY := 1;
|
||||
FX := 2 * Random - 1;
|
||||
FY := 2 * Random - 1;
|
||||
end;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -30,7 +30,7 @@ implementation
|
||||
uses
|
||||
Math;
|
||||
|
||||
{ TVariationTest }
|
||||
{ TVariationRings2 }
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
procedure TVariationRings2.Prepare;
|
||||
@ -56,7 +56,7 @@ begin
|
||||
|
||||
// dx := sqr(FVal) + EPS; - we can precalc it!!!
|
||||
// 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));
|
||||
|
||||
FPx^ := FPx^ + r * FTx^;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user