diff --git a/2.10/Source/Main.dfm b/2.10/Source/Main.dfm index 6b1246d..08762b5 100644 --- a/2.10/Source/Main.dfm +++ b/2.10/Source/Main.dfm @@ -299,6 +299,7 @@ object MainForm: TMainForm Caption = 'ToolButton2' ImageIndex = 39 Style = tbsSeparator + Visible = False end object tbShowTrace: TToolButton Left = 579 @@ -306,6 +307,7 @@ object MainForm: TMainForm Hint = 'Show trace window' Caption = 'tbShowTrace' ImageIndex = 38 + Visible = False OnClick = tbShowTraceClick end end diff --git a/2.10/Source/RenderTypes.pas b/2.10/Source/RenderTypes.pas index f270d8b..b843bb4 100644 --- a/2.10/Source/RenderTypes.pas +++ b/2.10/Source/RenderTypes.pas @@ -95,21 +95,21 @@ var begin n := Trunc(t); Result := ''; - if n>0 then begin + if n > 0 then begin Result := Result + Format(' %d day', [n]); - if (n mod 10) <> 1 then Result := Result + 's'; + if n <> 1 then Result := Result + 's'; end; t := t * 24; n := Trunc(t) mod 24; - if n>0 then begin + if n > 0 then begin Result := Result + Format(' %d hour', [n]); - if (n mod 10) <> 1 then Result := Result + 's'; + if n <> 1 then Result := Result + 's'; end; t := t * 60; n := Trunc(t) mod 60; - if n>0 then begin + if n > 0 then begin Result := Result + Format(' %d minute', [n]); - if (n mod 10) <> 1 then Result := Result + 's'; + if n <> 1 then Result := Result + 's'; end; t := t * 60; t := t - (Trunc(t) div 60) * 60; diff --git a/2.10/Source/Tracer.pas b/2.10/Source/Tracer.pas index 53dd36a..bd4e871 100644 --- a/2.10/Source/Tracer.pas +++ b/2.10/Source/Tracer.pas @@ -70,7 +70,7 @@ procedure TTraceForm.FormCreate(Sender: TObject); var Registry: TRegistry; begin - //TraceLevel := 0; // Tracer disabled in release version + TraceLevel := 0; // Tracer disabled in release version { Read position from registry } Registry := TRegistry.Create; diff --git a/2.10/Source/varpdj.pas b/2.10/Source/varpdj.pas index 595fdd1..c0201fd 100644 --- a/2.10/Source/varpdj.pas +++ b/2.10/Source/varpdj.pas @@ -5,6 +5,8 @@ interface uses BaseVariation, XFormMan; +{$define _ASM_} + type TVariationPDJ = class(TBaseVariation) private @@ -34,9 +36,38 @@ uses /////////////////////////////////////////////////////////////////////////////// procedure TVariationPDJ.CalcFunction; +{$ifndef _ASM_} begin FPx^ := FPx^ + vvar * (sin(FA * FTy^) - cos(FB * FTx^)); FPy^ := FPy^ + vvar * (sin(FC * FTx^) - cos(FD * FTy^)); +{$else} +asm + fld qword ptr [eax + vvar] + mov edx, [eax + FTx] + fld qword ptr [edx + 8] // FTy + fld qword ptr [edx] // FTx + + fld st(1) + fmul qword ptr [eax + Fa] + fsin + fld st(1) + fmul qword ptr [eax + Fb] + fcos + fsubp st(1), st + fmul st, st(3) + fadd qword ptr [edx + 16] // FPx + fstp qword ptr [edx + 16] + + fmul qword ptr [eax + Fc] + fsin + fxch st(1) + fmul qword ptr [eax + Fd] + fcos + fsubp st(1), st + fmulp + fadd qword ptr [edx + 24] // FPy + fstp qword ptr [edx + 24] +{$endif} end; ///////////////////////////////////////////////////////////////////////////////