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

updated mutator and scripter to support (aka not screw up) finalxform

Browse Source
This commit is contained in:
zueuk 2006-04-05 11:04:21 +00:00
parent df7d8bc7f0
commit e79d7bc664
2 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
2.10/Source/Mutate.pas
View File

@ -291,6 +291,8 @@ begin
begin begin
if cps[0].xform[j].Symmetry = 1 then if cps[0].xform[j].Symmetry = 1 then
begin begin
mutants[i].xform[j].Assign(cps[0].xform[j]);
{
mutants[i].xform[j].Symmetry := 1; mutants[i].xform[j].Symmetry := 1;
mutants[i].xform[j].Color := cps[0].xform[j].color; mutants[i].xform[j].Color := cps[0].xform[j].color;
mutants[i].xform[j].Density := cps[0].xform[j].Density; mutants[i].xform[j].Density := cps[0].xform[j].Density;
@ -302,6 +304,7 @@ begin
mutants[i].xform[j].c[2][1] := cps[0].xform[j].c[2][1]; mutants[i].xform[j].c[2][1] := cps[0].xform[j].c[2][1];
for k := 0 to NRVAR - 1 do for k := 0 to NRVAR - 1 do
mutants[i].xform[j].vars[k] := cps[0].xform[j].vars[k]; mutants[i].xform[j].vars[k] := cps[0].xform[j].vars[k];
}
end; end;
end; end;
end; end;
@ -320,6 +323,11 @@ begin
else else
cps[i].RandomCP(mutantMinTransforms, mutantMaxTransforms, false); cps[i].RandomCP(mutantMinTransforms, mutantMaxTransforms, false);
cps[i].SetVariation(TVariation(cmbTrend.Items.Objects[cmbTrend.ItemIndex])); cps[i].SetVariation(TVariation(cmbTrend.Items.Objects[cmbTrend.ItemIndex]));
if cps[0].HasFinalXForm = false then
begin
cps[i].xform[cps[i].NumXForms].Clear;
cps[i].xform[cps[i].NumXForms].symmetry := 1;
end;
end; end;
Interpolate; Interpolate;
end; end;
@ -475,6 +483,8 @@ begin
begin begin
if cpt.xform[i].Symmetry = 1 then if cpt.xform[i].Symmetry = 1 then
begin begin
cps[0].xform[i].Assign(cpt.xform[i]);
{
cps[0].xform[i].Symmetry := 1; cps[0].xform[i].Symmetry := 1;
cps[0].xform[i].Color := cpt.xform[i].color; cps[0].xform[i].Color := cpt.xform[i].color;
cps[0].xform[i].Density := cpt.xform[i].Density; cps[0].xform[i].Density := cpt.xform[i].Density;
@ -486,6 +496,7 @@ begin
cps[0].xform[i].c[2][1] := cpt.xform[i].c[2][1]; cps[0].xform[i].c[2][1] := cpt.xform[i].c[2][1];
for j := 0 to NRVAR - 1 do for j := 0 to NRVAR - 1 do
cps[0].xform[i].vars[j] := cpt.xform[i].vars[j]; cps[0].xform[i].vars[j] := cpt.xform[i].vars[j];
}
end; end;
end; end;
end; end;

53
2.10/Source/ScriptForm.pas
View File

@ -1,5 +1,6 @@
{ {
Apophysis Copyright (C) 2001-2004 Mark Townsend Apophysis Copyright (C) 2001-2004 Mark Townsend
Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Borys, Peter Sdobnov
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1321,7 +1322,7 @@ end;
procedure TOperationLibrary.RotateProc(AMachine: TatVirtualMachine); procedure TOperationLibrary.RotateProc(AMachine: TatVirtualMachine);
begin begin
try try
if (ActiveTransform < 0) or (ActiveTransform > NXFORMS - 1) then raise EFormatInvalid.Create('Transform out of range.'); if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Rotate(GetInputArgAsFloat(0)); ScriptEditor.cp.xform[ActiveTransform].Rotate(GetInputArgAsFloat(0));
except on E: EFormatInvalid do except on E: EFormatInvalid do
@ -1336,7 +1337,7 @@ end;
procedure TOperationLibrary.MulProc(AMachine: TatVirtualMachine); procedure TOperationLibrary.MulProc(AMachine: TatVirtualMachine);
begin begin
try try
if (ActiveTransform < 0) or (ActiveTransform > NXFORMS - 1) then raise EFormatInvalid.Create('Transform out of range.'); if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Multiply(GetInputArgAsFloat(0), GetInputArgAsFloat(1), GetInputArgAsFloat(2), GetInputArgAsFloat(3)); ScriptEditor.cp.xform[ActiveTransform].Multiply(GetInputArgAsFloat(0), GetInputArgAsFloat(1), GetInputArgAsFloat(2), GetInputArgAsFloat(3));
except on E: EFormatInvalid do except on E: EFormatInvalid do
@ -1447,12 +1448,14 @@ begin
NumTransforms := i; NumTransforms := i;
end; end;
(*
procedure ParseXML(var cp1: TControlPoint; const params: PCHAR); procedure ParseXML(var cp1: TControlPoint; const params: PCHAR);
var var
i: integer; i: integer;
h, s, v: real; h, s, v: real;
begin begin
nxform := 0; nxform := 0;
FinalXformLoaded := false;
MainForm.XMLScanner.LoadFromBuffer(params); MainForm.XMLScanner.LoadFromBuffer(params);
MainForm.XMLScanner.Execute; MainForm.XMLScanner.Execute;
cp1.copy(ParseCp); cp1.copy(ParseCp);
@ -1483,6 +1486,7 @@ begin
cp1.symmetry := 0; cp1.symmetry := 0;
end; end;
end; end;
*)
procedure LoadXMLFlame(index: integer); procedure LoadXMLFlame(index: integer);
var var
@ -1513,7 +1517,7 @@ begin
inc(i); inc(i);
IFSStrings.Add(FStrings[i]); IFSStrings.Add(FStrings[i]);
until Pos('</flame>', FStrings[i]) <> 0; until Pos('</flame>', FStrings[i]) <> 0;
ParseXML(ScriptEditor.Cp, PCHAR(IFSStrings.Text)); MainForm.ParseXML(ScriptEditor.Cp, PCHAR(IFSStrings.Text));
for i := 0 to NXFORMS - 1 do for i := 0 to NXFORMS - 1 do
if ScriptEditor.cp.xform[i].density = 0 then break; if ScriptEditor.cp.xform[i].density = 0 then break;
NumTransforms := i; NumTransforms := i;
@ -1644,17 +1648,22 @@ procedure TOperationLibrary.RotateReferenceProc(AMachine: TatVirtualMachine);
var var
Triangles: TTriangles; Triangles: TTriangles;
r: double; r: double;
tx: TXForm;
begin begin
tx := TXForm.Create;
tx.Assign(scripteditor.cp.xform[NumTransforms]);
ScriptEditor.cp.TrianglesFromCp(Triangles); ScriptEditor.cp.TrianglesFromCp(Triangles);
r := AMachine.GetInputArgAsFloat(0) * pi / 180; r := AMachine.GetInputArgAsFloat(0) * pi / 180;
Triangles[-1] := RotateTriangle(Triangles[-1], r); Triangles[-1] := RotateTriangle(Triangles[-1], r);
ScriptEditor.cp.GetFromTriangles(Triangles, NumTransforms); ScriptEditor.cp.GetFromTriangles(Triangles, NumTransforms);
scripteditor.cp.xform[NumTransforms].Assign(tx);
tx.Free;
end; end;
procedure TOperationLibrary.ScaleProc(AMachine: TatVirtualMachine); procedure TOperationLibrary.ScaleProc(AMachine: TatVirtualMachine);
begin begin
try try
if (ActiveTransform < 0) or (ActiveTransform > NXFORMS - 1) then raise EFormatInvalid.Create('Transform out of range.'); if (ActiveTransform < 0) or (ActiveTransform >= ScriptEditor.cp.NumXForms) then raise EFormatInvalid.Create('Transform out of range.');
with AMachine do with AMachine do
ScriptEditor.cp.xform[ActiveTransform].Scale(GetInputArgAsFloat(0)); ScriptEditor.cp.xform[ActiveTransform].Scale(GetInputArgAsFloat(0));
except on E: EFormatInvalid do except on E: EFormatInvalid do
@ -1799,9 +1808,10 @@ begin
try try
if NumTransforms < NXFORMS then if NumTransforms < NXFORMS then
begin begin
ActiveTransform := NumTransforms;
inc(NumTransforms); inc(NumTransforms);
ActiveTransform := NumTransforms - 1; scriptEditor.cp.xform[NumTransforms].Assign(scriptEditor.cp.xform[ActiveTransform]);
ScriptEditor.cp.xform[ActiveTransform].c[0, 0] := 1; { ScriptEditor.cp.xform[ActiveTransform].c[0, 0] := 1;
ScriptEditor.cp.xform[ActiveTransform].c[0, 1] := 0; ScriptEditor.cp.xform[ActiveTransform].c[0, 1] := 0;
ScriptEditor.cp.xform[ActiveTransform].c[1, 0] := 0; ScriptEditor.cp.xform[ActiveTransform].c[1, 0] := 0;
ScriptEditor.cp.xform[ActiveTransform].c[1, 1] := 1; ScriptEditor.cp.xform[ActiveTransform].c[1, 1] := 1;
@ -1811,7 +1821,9 @@ begin
ScriptEditor.cp.xform[ActiveTransform].density := 1 / NumTransforms; ScriptEditor.cp.xform[ActiveTransform].density := 1 / NumTransforms;
ScriptEditor.cp.xform[ActiveTransform].vars[0] := 1; ScriptEditor.cp.xform[ActiveTransform].vars[0] := 1;
for i := 1 to NRVAR - 1 do for i := 1 to NRVAR - 1 do
ScriptEditor.cp.xform[ActiveTransform].vars[i] := 0; ScriptEditor.cp.xform[ActiveTransform].vars[i] := 0;}
scriptEditor.cp.xform[ActiveTransform].Clear;
ScriptEditor.cp.xform[ActiveTransform].density := 1 / NumTransforms;
end end
else raise EFormatInvalid.Create('Too many transforms.'); else raise EFormatInvalid.Create('Too many transforms.');
except on E: EFormatInvalid do except on E: EFormatInvalid do
@ -1829,30 +1841,37 @@ var
begin begin
if NumTransforms > 0 then if NumTransforms > 0 then
try 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 if ActiveTransform = (NumTransforms - 1) then
{ Last triangle...just reduce number} { Last triangle...just reduce number}
begin begin
NumTransforms := NumTransforms - 1; Dec(NumTransforms);
ActiveTransform := NumTransforms - 1; ActiveTransform := NumTransforms - 1;
scriptEditor.cp.xform[NumTransforms].density := 0; // scriptEditor.cp.xform[NumTransforms].density := 0;
scriptEditor.cp.xform[NumTransforms].Assign(scriptEditor.cp.xform[NumTransforms+1]);
end end
else else
begin begin
for i := ActiveTransform to NumTransforms - 2 do for i := ActiveTransform to NumTransforms - 2 do
begin scriptEditor.cp.xform[i].Assign(scriptEditor.cp.xform[i + 1]);
{ begin
// copy higher transforms down // copy higher transforms down
ScriptEditor.cp.xform[i].density := ScriptEditor.cp.xform[i + 1].density; ScriptEditor.cp.xform[i].density := ScriptEditor.cp.xform[i + 1].density;
ScriptEditor.cp.xform[i].color := ScriptEditor.cp.xform[i + 1].color; ScriptEditor.cp.xform[i].color := ScriptEditor.cp.xform[i + 1].color;
ScriptEditor.cp.xform[i].symmetry := ScriptEditor.cp.xform[i + 1].symmetry; ScriptEditor.cp.xform[i].symmetry := ScriptEditor.cp.xform[i + 1].symmetry;
for j := 0 to NRVAR - 1 do for j := 0 to NRVAR - 1 do
ScriptEditor.cp.xform[i].vars[j] := ScriptEditor.cp.xform[i + 1].vars[j]; ScriptEditor.cp.xform[i].vars[j] := ScriptEditor.cp.xform[i + 1].vars[j];
end; end;}
NumTransforms := NumTransforms - 1; NumTransforms := NumTransforms - 1;
ScriptEditor.cp.xform[Numtransforms].density := 0; // ScriptEditor.cp.xform[Numtransforms].density := 0;
scriptEditor.cp.xform[NumTransforms].Assign(scriptEditor.cp.xform[NumTransforms+1]);
end end
//do we normalize weights?
except except
begin begin
Application.ProcessMessages; Application.ProcessMessages;
@ -1873,7 +1892,8 @@ begin
inc(NumTransforms); inc(NumTransforms);
old := ActiveTransform; old := ActiveTransform;
ActiveTransform := NumTransforms - 1; ActiveTransform := NumTransforms - 1;
ScriptEditor.cp.xform[ActiveTransform].c[0, 0] := ScriptEditor.cp.xform[old].c[0, 0]; ScriptEditor.cp.xform[ActiveTransform].Assign(ScriptEditor.cp.xform[old]);
{
ScriptEditor.cp.xform[ActiveTransform].c[0, 1] := ScriptEditor.cp.xform[old].c[0, 1]; ScriptEditor.cp.xform[ActiveTransform].c[0, 1] := ScriptEditor.cp.xform[old].c[0, 1];
ScriptEditor.cp.xform[ActiveTransform].c[1, 0] := ScriptEditor.cp.xform[old].c[1, 0]; ScriptEditor.cp.xform[ActiveTransform].c[1, 0] := ScriptEditor.cp.xform[old].c[1, 0];
ScriptEditor.cp.xform[ActiveTransform].c[1, 1] := ScriptEditor.cp.xform[old].c[1, 1]; ScriptEditor.cp.xform[ActiveTransform].c[1, 1] := ScriptEditor.cp.xform[old].c[1, 1];
@ -1883,6 +1903,7 @@ begin
ScriptEditor.cp.xform[ActiveTransform].density := ScriptEditor.cp.xform[old].density; ScriptEditor.cp.xform[ActiveTransform].density := ScriptEditor.cp.xform[old].density;
for i := 0 to NRVAR - 1 do for i := 0 to NRVAR - 1 do
ScriptEditor.cp.xform[ActiveTransform].vars[i] := ScriptEditor.cp.xform[old].vars[i] ScriptEditor.cp.xform[ActiveTransform].vars[i] := ScriptEditor.cp.xform[old].vars[i]
}
end end
else raise EFormatInvalid.Create('Too many transforms.'); else raise EFormatInvalid.Create('Too many transforms.');
except on E: EFormatInvalid do except on E: EFormatInvalid do