version 2.05 beta

This commit is contained in:
zueuk 2006-10-29 16:39:27 +00:00
parent c132463c76
commit ae773f206a
4 changed files with 40 additions and 7 deletions

View File

@ -299,6 +299,7 @@ object MainForm: TMainForm
Caption = 'ToolButton2' Caption = 'ToolButton2'
ImageIndex = 39 ImageIndex = 39
Style = tbsSeparator Style = tbsSeparator
Visible = False
end end
object tbShowTrace: TToolButton object tbShowTrace: TToolButton
Left = 579 Left = 579
@ -306,6 +307,7 @@ object MainForm: TMainForm
Hint = 'Show trace window' Hint = 'Show trace window'
Caption = 'tbShowTrace' Caption = 'tbShowTrace'
ImageIndex = 38 ImageIndex = 38
Visible = False
OnClick = tbShowTraceClick OnClick = tbShowTraceClick
end end
end end

View File

@ -97,19 +97,19 @@ begin
Result := ''; Result := '';
if n > 0 then begin if n > 0 then begin
Result := Result + Format(' %d day', [n]); Result := Result + Format(' %d day', [n]);
if (n mod 10) <> 1 then Result := Result + 's'; if n <> 1 then Result := Result + 's';
end; end;
t := t * 24; t := t * 24;
n := Trunc(t) mod 24; n := Trunc(t) mod 24;
if n > 0 then begin if n > 0 then begin
Result := Result + Format(' %d hour', [n]); Result := Result + Format(' %d hour', [n]);
if (n mod 10) <> 1 then Result := Result + 's'; if n <> 1 then Result := Result + 's';
end; end;
t := t * 60; t := t * 60;
n := Trunc(t) mod 60; n := Trunc(t) mod 60;
if n > 0 then begin if n > 0 then begin
Result := Result + Format(' %d minute', [n]); Result := Result + Format(' %d minute', [n]);
if (n mod 10) <> 1 then Result := Result + 's'; if n <> 1 then Result := Result + 's';
end; end;
t := t * 60; t := t * 60;
t := t - (Trunc(t) div 60) * 60; t := t - (Trunc(t) div 60) * 60;

View File

@ -70,7 +70,7 @@ procedure TTraceForm.FormCreate(Sender: TObject);
var var
Registry: TRegistry; Registry: TRegistry;
begin begin
//TraceLevel := 0; // Tracer disabled in release version TraceLevel := 0; // Tracer disabled in release version
{ Read position from registry } { Read position from registry }
Registry := TRegistry.Create; Registry := TRegistry.Create;

View File

@ -5,6 +5,8 @@ interface
uses uses
BaseVariation, XFormMan; BaseVariation, XFormMan;
{$define _ASM_}
type type
TVariationPDJ = class(TBaseVariation) TVariationPDJ = class(TBaseVariation)
private private
@ -34,9 +36,38 @@ uses
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
procedure TVariationPDJ.CalcFunction; procedure TVariationPDJ.CalcFunction;
{$ifndef _ASM_}
begin begin
FPx^ := FPx^ + vvar * (sin(FA * FTy^) - cos(FB * FTx^)); FPx^ := FPx^ + vvar * (sin(FA * FTy^) - cos(FB * FTx^));
FPy^ := FPy^ + vvar * (sin(FC * FTx^) - cos(FD * FTy^)); 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; end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////