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

New test variants added

Browse Source
This commit is contained in:
ronaldhordijk 2005-05-01 08:05:13 +00:00
parent b472bd5f01
commit f95b97816a
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
2.10/Source/XForm.pas
View File

@ -4,9 +4,9 @@ interface
const const
{$IFDEF TESTVARIANT} {$IFDEF TESTVARIANT}
NVARS = 27; NVARS = 28;
{$ELSE} {$ELSE}
NVARS = 26; NVARS = 27;
{$ENDIF} {$ENDIF}
varnames: array[0..NVARS -1] of PChar = ( varnames: array[0..NVARS -1] of PChar = (
@ -35,7 +35,8 @@ const
'fan', 'fan',
'triblob', 'triblob',
'daisy', 'daisy',
'checkers' 'checkers',
'crot'
{$IFDEF TESTVARIANT} {$IFDEF TESTVARIANT}
,'test' ,'test'
{$ENDIF} {$ENDIF}
@ -99,6 +100,8 @@ type
procedure Triblob; // var[23] procedure Triblob; // var[23]
procedure Daisy; // var[24] procedure Daisy; // var[24]
procedure Checkers; // var[25] procedure Checkers; // var[25]
procedure CRot; // var[26]
procedure TestVar; // var[NVARS - 1] procedure TestVar; // var[NVARS - 1]
function Mul33(const M1, M2: TMatrix): TMatrix; function Mul33(const M1, M2: TMatrix): TMatrix;
@ -305,6 +308,11 @@ begin
Inc(FNrFunctions); Inc(FNrFunctions);
end; end;
if (vars[26] <> 0.0) then begin
FFunctionList[FNrFunctions] := CRot;
Inc(FNrFunctions);
end;
{$IFDEF TESTVARIANT} {$IFDEF TESTVARIANT}
if (vars[NVARS -1] <> 0.0) then begin if (vars[NVARS -1] <> 0.0) then begin
FFunctionList[FNrFunctions] := TestVar; FFunctionList[FNrFunctions] := TestVar;
@ -660,6 +668,29 @@ begin
FPy := FPy + vars[25] * FTy; FPy := FPy + vars[25] * FTy;
end; end;
///////////////////////////////////////////////////////////////////////////////
procedure TXForm.CRot;
var
r : double;
dx, dy, dx2: double;
Angle: double;
begin
r := sqrt(FTx * FTx + FTy * FTy);
if (FTx < -EPS) or (FTx > EPS) or (FTy < -EPS) or (FTy > EPS) then
Angle := arctan2(FTx, FTy)
else
Angle := 0.0;
if r < 3 then
Angle := Angle + (3 - r) * sin(3 * r);
// r:= R - 0.04 * sin(6.2 * R - 1) - 0.008 * R;
FPx := FPx + vars[26] * r * cos(Angle);
FPy := FPy + vars[26] * r * sin(Angle);
end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
procedure TXForm.TestVar; procedure TXForm.TestVar;
var var
@ -673,7 +704,9 @@ begin
else else
Angle := 0.0; Angle := 0.0;
r:= R - 0.04 * sin(6.2 * R - 1) - 0.008 * R; Angle := Angle + Max(0, (3 - r)) * sin(2 * r);
// r:= R - 0.04 * sin(6.2 * R - 1) - 0.008 * R;
FPx := FPx + vars[NVars - 1] * r * cos(Angle); FPx := FPx + vars[NVars - 1] * r * cos(Angle);
FPy := FPy + vars[NVars - 1] * r * sin(Angle); FPy := FPy + vars[NVars - 1] * r * sin(Angle);