"reference triangle mode" option removed
This commit is contained in:
parent
c97708601c
commit
a78f3b6e9e
@ -1069,6 +1069,7 @@ begin
|
|||||||
if (nmin = nmax) and (nmin = t) then begin
|
if (nmin = nmax) and (nmin = t) then begin
|
||||||
for j := 0 to Transforms-1 do
|
for j := 0 to Transforms-1 do
|
||||||
modWeights[j] := cp.xform[t].modWeights[j];
|
modWeights[j] := cp.xform[t].modWeights[j];
|
||||||
|
if noPlot then noPlot := cp.xform[t].noPlot;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
// check for single "from" links
|
// check for single "from" links
|
||||||
|
@ -165,7 +165,7 @@ var
|
|||||||
{ For random gradients }
|
{ For random gradients }
|
||||||
|
|
||||||
MinNodes, MaxNodes, MinHue, MaxHue, MinSat, MaxSat, MinLum, MaxLum: integer;
|
MinNodes, MaxNodes, MinHue, MaxHue, MinSat, MaxSat, MinLum, MaxLum: integer;
|
||||||
ReferenceMode: integer;//FixedReference: boolean;
|
//ReferenceMode: integer;
|
||||||
BatchSize: Integer;
|
BatchSize: Integer;
|
||||||
Compatibility: integer; //0 = original, 1 = Drave's
|
Compatibility: integer; //0 = original, 1 = Drave's
|
||||||
Favorites: TStringList;
|
Favorites: TStringList;
|
||||||
|
@ -405,7 +405,7 @@ object OptionsForm: TOptionsForm
|
|||||||
end
|
end
|
||||||
object rgReferenceMode: TRadioGroup
|
object rgReferenceMode: TRadioGroup
|
||||||
Left = 160
|
Left = 160
|
||||||
Top = 4
|
Top = 76
|
||||||
Width = 145
|
Width = 145
|
||||||
Height = 69
|
Height = 69
|
||||||
Caption = 'Reference Triangle'
|
Caption = 'Reference Triangle'
|
||||||
@ -415,10 +415,11 @@ object OptionsForm: TOptionsForm
|
|||||||
'Proportional'
|
'Proportional'
|
||||||
'Wandering (old-style)')
|
'Wandering (old-style)')
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
|
Visible = False
|
||||||
end
|
end
|
||||||
object GroupBox21: TGroupBox
|
object GroupBox21: TGroupBox
|
||||||
Left = 160
|
Left = 160
|
||||||
Top = 77
|
Top = 4
|
||||||
Width = 145
|
Width = 145
|
||||||
Height = 65
|
Height = 65
|
||||||
Caption = 'Editor defaults'
|
Caption = 'Editor defaults'
|
||||||
@ -508,58 +509,58 @@ object OptionsForm: TOptionsForm
|
|||||||
Caption = 'Rendering'
|
Caption = 'Rendering'
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
object lblSampleDensity: TLabel
|
object lblSampleDensity: TLabel
|
||||||
Left = 56
|
Left = 59
|
||||||
Top = 19
|
Top = 19
|
||||||
Width = 41
|
Width = 38
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Quality:'
|
Caption = 'Quality:'
|
||||||
end
|
end
|
||||||
object lblGamma: TLabel
|
object lblGamma: TLabel
|
||||||
Left = 56
|
Left = 58
|
||||||
Top = 43
|
Top = 43
|
||||||
Width = 41
|
Width = 39
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Gamma:'
|
Caption = 'Gamma:'
|
||||||
end
|
end
|
||||||
object lblBrightness: TLabel
|
object lblBrightness: TLabel
|
||||||
Left = 40
|
Left = 43
|
||||||
Top = 67
|
Top = 67
|
||||||
Width = 57
|
Width = 54
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Brightness:'
|
Caption = 'Brightness:'
|
||||||
end
|
end
|
||||||
object lblVibrancy: TLabel
|
object lblVibrancy: TLabel
|
||||||
Left = 48
|
Left = 52
|
||||||
Top = 91
|
Top = 91
|
||||||
Width = 49
|
Width = 45
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Vibrancy:'
|
Caption = 'Vibrancy:'
|
||||||
end
|
end
|
||||||
object lblOversample: TLabel
|
object lblOversample: TLabel
|
||||||
Left = 32
|
Left = 36
|
||||||
Top = 139
|
Top = 139
|
||||||
Width = 65
|
Width = 61
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Oversample:'
|
Caption = 'Oversample:'
|
||||||
end
|
end
|
||||||
object lblFilterRadius: TLabel
|
object lblFilterRadius: TLabel
|
||||||
Left = 32
|
Left = 34
|
||||||
Top = 163
|
Top = 163
|
||||||
Width = 65
|
Width = 63
|
||||||
Height = 13
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Filter Radius:'
|
Caption = 'Filter Radius:'
|
||||||
end
|
end
|
||||||
object lblGammaThreshold: TLabel
|
object lblGammaThreshold: TLabel
|
||||||
Left = 8
|
Left = 10
|
||||||
Top = 115
|
Top = 115
|
||||||
Width = 89
|
Width = 87
|
||||||
Height = 14
|
Height = 13
|
||||||
Alignment = taRightJustify
|
Alignment = taRightJustify
|
||||||
Caption = 'Gamma threshold:'
|
Caption = 'Gamma threshold:'
|
||||||
WordWrap = True
|
WordWrap = True
|
||||||
|
@ -328,7 +328,7 @@ begin
|
|||||||
|
|
||||||
|
|
||||||
{ Editor }
|
{ Editor }
|
||||||
rgReferenceMode.ItemIndex := ReferenceMode;
|
// rgReferenceMode.ItemIndex := ReferenceMode;
|
||||||
chkUseXFormColor.checked := UseTransformColors;
|
chkUseXFormColor.checked := UseTransformColors;
|
||||||
chkHelpers.Checked := HelpersEnabled;
|
chkHelpers.Checked := HelpersEnabled;
|
||||||
chkExtendedEdit.Checked := ExtEditEnabled;
|
chkExtendedEdit.Checked := ExtEditEnabled;
|
||||||
@ -465,7 +465,7 @@ begin
|
|||||||
|
|
||||||
|
|
||||||
// Editor
|
// Editor
|
||||||
ReferenceMode := rgReferenceMode.ItemIndex;
|
// ReferenceMode := rgReferenceMode.ItemIndex;
|
||||||
UseTransformColors := chkUseXFormColor.checked;
|
UseTransformColors := chkUseXFormColor.checked;
|
||||||
HelpersEnabled := chkHelpers.Checked;
|
HelpersEnabled := chkHelpers.Checked;
|
||||||
ShowAllXforms := chkShowAllXforms.Checked;
|
ShowAllXforms := chkShowAllXforms.Checked;
|
||||||
|
@ -397,9 +397,9 @@ begin
|
|||||||
randGradientFile := ''
|
randGradientFile := ''
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if Registry.ValueExists('ReferenceMode') then
|
// if Registry.ValueExists('ReferenceMode') then
|
||||||
ReferenceMode := Registry.ReadInteger('ReferenceMode')
|
// ReferenceMode := Registry.ReadInteger('ReferenceMode')
|
||||||
else ReferenceMode := 0;
|
// else ReferenceMode := 0;
|
||||||
|
|
||||||
if Registry.ValueExists('RotationMode') then
|
if Registry.ValueExists('RotationMode') then
|
||||||
MainForm_RotationMode := Registry.ReadInteger('RotationMode')
|
MainForm_RotationMode := Registry.ReadInteger('RotationMode')
|
||||||
@ -620,7 +620,7 @@ begin
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
ReferenceMode := 0;
|
// ReferenceMode := 0;
|
||||||
MainForm_RotationMode := 0;
|
MainForm_RotationMode := 0;
|
||||||
EditPrevQual := 1;
|
EditPrevQual := 1;
|
||||||
MutatePrevQual := 1;
|
MutatePrevQual := 1;
|
||||||
@ -1101,7 +1101,7 @@ begin
|
|||||||
Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
|
Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
|
||||||
// Registry.WriteInteger('VariationOptions', VariationOptions);
|
// Registry.WriteInteger('VariationOptions', VariationOptions);
|
||||||
// Registry.WriteInteger('VariationOptions2', VariationOptions shr 32);
|
// Registry.WriteInteger('VariationOptions2', VariationOptions shr 32);
|
||||||
Registry.WriteInteger('ReferenceMode', ReferenceMode);
|
// Registry.WriteInteger('ReferenceMode', ReferenceMode);
|
||||||
Registry.WriteInteger('RotationMode', MainForm_RotationMode);
|
Registry.WriteInteger('RotationMode', MainForm_RotationMode);
|
||||||
Registry.WriteInteger('MinNodes', MinNodes);
|
Registry.WriteInteger('MinNodes', MinNodes);
|
||||||
Registry.WriteInteger('MinHue', MinHue);
|
Registry.WriteInteger('MinHue', MinHue);
|
||||||
@ -1139,7 +1139,7 @@ begin
|
|||||||
|
|
||||||
Registry.WriteBool('SaveIncompleteRenders', SaveIncompleteRenders);
|
Registry.WriteBool('SaveIncompleteRenders', SaveIncompleteRenders);
|
||||||
Registry.WriteBool('ShowRenderStats', ShowRenderStats);
|
Registry.WriteBool('ShowRenderStats', ShowRenderStats);
|
||||||
Registry.WriteBool('LowerRenderPriority', LowerRenderPriority);
|
// Registry.WriteBool('LowerRenderPriority', LowerRenderPriority);
|
||||||
|
|
||||||
Registry.WriteInteger('NrTreads', NrTreads);
|
Registry.WriteInteger('NrTreads', NrTreads);
|
||||||
Registry.WriteInteger('UseNrThreads', UseNrThreads);
|
Registry.WriteInteger('UseNrThreads', UseNrThreads);
|
||||||
|
@ -550,14 +550,14 @@ end;
|
|||||||
procedure TScriptEditor.GetFixedReference(AMachine: TatVirtualMachine);
|
procedure TScriptEditor.GetFixedReference(AMachine: TatVirtualMachine);
|
||||||
begin
|
begin
|
||||||
with AMachine do
|
with AMachine do
|
||||||
ReturnOutPutArg(ReferenceMode = 0);
|
ReturnOutPutArg(true); //ReferenceMode = 0);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TScriptEditor.SetFixedReference(AMachine: TatVirtualMachine);
|
procedure TScriptEditor.SetFixedReference(AMachine: TatVirtualMachine);
|
||||||
begin
|
begin
|
||||||
with AMachine do
|
// with AMachine do
|
||||||
if GetInputArgAsBoolean(0) then ReferenceMode := 0
|
// if GetInputArgAsBoolean(0) then ReferenceMode := 0
|
||||||
else ReferenceMode := 1;
|
// else ReferenceMode := 1;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TScriptEditor.GetSampleDensity(AMachine: TatVirtualMachine);
|
procedure TScriptEditor.GetSampleDensity(AMachine: TatVirtualMachine);
|
||||||
|
Loading…
Reference in New Issue
Block a user