diff --git a/2.10/Source/Editor.dfm b/2.10/Source/Editor.dfm index 05c9ad9..e647a0e 100644 --- a/2.10/Source/Editor.dfm +++ b/2.10/Source/Editor.dfm @@ -390,7 +390,7 @@ object EditForm: TEditForm Top = 24 Width = 170 Height = 344 - ActivePage = TriangleTab + ActivePage = tabColors Align = alBottom Anchors = [akLeft, akTop, akRight, akBottom] MultiLine = True @@ -1486,30 +1486,28 @@ object EditForm: TEditForm Top = 184 Width = 129 Height = 25 - Hint = 'Variation preview density' Min = 1 ParentShowHint = False - Position = 10 + Position = 2 ShowHint = True TabOrder = 7 TabStop = False ThumbLength = 15 - OnChange = tbVarPreviewClick + OnChange = trkVarPreviewDensityChange end object trkVarPreviewRange: TTrackBar Left = 8 Top = 152 Width = 129 Height = 25 - Hint = 'Variation preview range' Min = 1 ParentShowHint = False - Position = 1 + Position = 2 ShowHint = True TabOrder = 8 TabStop = False ThumbLength = 15 - OnChange = tbVarPreviewClick + OnChange = trkVarPreviewRangeChange end end end @@ -1631,7 +1629,7 @@ object EditForm: TEditForm Left = 353 Top = 80 Bitmap = { - 494C01010F001300040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600 + 494C01010F001300040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600 0000000000003600000028000000400000005000000001002000000000000050 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2295,6 +2293,7 @@ object EditForm: TEditForm C003E001E001E001C003F1F9F1F9F1F9C003F8F90009D8D9C003FC7980098C09 C003F239C609C619C003F319E309E219C003F389F189F009C003F3C1F8C1F8C1 C0030021FC41F061C0070031FE01E231C00FF3F9FF09C719C01FF3FDFF8D8F8D - C03FF3FFFFCFDFDFFFFFF3FFFFEFFFFF} + C03FF3FFFFCFDFDFFFFFF3FFFFEFFFFF00000000000000000000000000000000 + 000000000000} end end diff --git a/2.10/Source/Editor.pas b/2.10/Source/Editor.pas index d4ad279..af03c2b 100644 --- a/2.10/Source/Editor.pas +++ b/2.10/Source/Editor.pas @@ -282,6 +282,8 @@ type procedure btnOcoefsClick(Sender: TObject); procedure btnCoefsModeClick(Sender: TObject); procedure tbVarPreviewClick(Sender: TObject); + procedure trkVarPreviewRangeChange(Sender: TObject); + procedure trkVarPreviewDensityChange(Sender: TObject); private TriangleView: TCustomDrawControl; @@ -953,7 +955,7 @@ var end; end; var - i: integer; + i, tc: integer; d, d1: double; tx, ty: double; @@ -1070,8 +1072,9 @@ begin cp.xform[SelectedTriangle].prepare; //for i := 0 to Transforms-1 do cp.xform[i].prepare; - i := trkVarPreviewRange.position * trkVarPreviewDensity.position; - d1 := trkVarPreviewDensity.position; + i := trkVarPreviewRange.position * trkVarPreviewDensity.position * 5; + d1 := trkVarPreviewDensity.position * 5; + tc := GetTriangleColor(SelectedTriangle); for ax := -i to i do for ay := -i to i do begin @@ -1080,7 +1083,7 @@ begin //cp.xform[random(Transforms)].nextpoint(tx,ty,d); cp.xform[SelectedTriangle].NextPoint(tx, ty, d); // d used as dummy var a := toscreen(tx,-ty); - Pixels[a.x, a.Y] := GetTriangleColor(SelectedTriangle);//$ffffff; + Pixels[a.x, a.Y] := {Pixels[a.x, a.Y] xor} tc;//$ffffff; end; end; @@ -3505,5 +3508,17 @@ begin TriangleView.Invalidate; end; +procedure TEditForm.trkVarPreviewRangeChange(Sender: TObject); +begin + trkVarPreviewRange.Hint := Format('Range: %d', [trkVarPreviewRange.position]); + TriangleView.Invalidate; +end; + +procedure TEditForm.trkVarPreviewDensityChange(Sender: TObject); +begin + trkVarPreviewDensity.Hint := Format('Density: %d', [trkVarPreviewDensity.position]); + TriangleView.Invalidate; +end; + end.