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

small fixes

Browse Source
This commit is contained in:
zueuk 2006-03-22 13:58:26 +00:00
parent 7264e2ac56
commit f5adf098b3
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
2.10/Source/Adjust.pas
View File

@ -1,6 +1,6 @@
{ {
Apophysis Copyright (C) 2001-2004 Mark Townsend Apophysis Copyright (C) 2001-2004 Mark Townsend
Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov 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

9
2.10/Source/Editor.pas
View File

@ -1,6 +1,6 @@
{ {
Apophysis Copyright (C) 2001-2004 Mark Townsend Apophysis Copyright (C) 2001-2004 Mark Townsend
Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov 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
@ -811,8 +811,6 @@ begin
end; end;
procedure TEditForm.UpdateFlameX; procedure TEditForm.UpdateFlameX;
var
i: integer;
begin begin
cp.GetFromTriangles(MainTriangles, Transforms); cp.GetFromTriangles(MainTriangles, Transforms);
if not chkPreserve.checked then cp.ComputeWeights(MainTriangles, Transforms); if not chkPreserve.checked then cp.ComputeWeights(MainTriangles, Transforms);
@ -825,7 +823,7 @@ procedure TEditForm.UpdateFlame(DrawMain: boolean);
begin begin
//; MainForm.StopThread; //; MainForm.StopThread;
StatusBar.Panels[2].Text := Format('Zoom: %f', [GraphZoom]); StatusBar.Panels[2].Text := Format('Zoom: %f', [GraphZoom]);
cp.GetFromTriangles(MainTriangles, Transforms); cp.GetFromTriangles(MainTriangles, LastTriangle);
// if not chkPreserve.Checked then ComputeWeights(cp, MainTriangles, transforms); // if not chkPreserve.Checked then ComputeWeights(cp, MainTriangles, transforms);
DrawPreview; DrawPreview;
ShowSelectedInfo; ShowSelectedInfo;
@ -1985,7 +1983,7 @@ begin
Inc(Transforms); Inc(Transforms);
cbTransforms.clear; cbTransforms.clear;
for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i)); for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i));
if cp.HasFinalXForm = true then cbTransforms.Items.Add('Final'); if EnableFinalXform or (cp.HasFinalXForm = true) then cbTransforms.Items.Add('Final');
UpdateFlame(True); UpdateFlame(True);
end; end;
end; end;
@ -2009,6 +2007,7 @@ begin
Inc(Transforms); Inc(Transforms);
cbTransforms.clear; cbTransforms.clear;
for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i)); for i := 1 to Transforms do cbTransforms.Items.Add(IntToStr(i));
if EnableFinalXform or (cp.HasFinalXForm = true) then cbTransforms.Items.Add('Final');
UpdateFlame(True); UpdateFlame(True);
end; end;
end; end;

23
2.10/Source/Main.pas
View File

@ -1,6 +1,6 @@
{ {
Apophysis Copyright (C) 2001-2004 Mark Townsend Apophysis Copyright (C) 2001-2004 Mark Townsend
Apophysis Copyright (C) 2005-2006 Ronald Hordijk, Piotr Boris, Peter Sdobnov 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
@ -37,7 +37,7 @@ const
RS_XO = 2; RS_XO = 2;
RS_VO = 3; RS_VO = 3;
AppVersionString = 'Apophysis 2.03d pre-release 3'; AppVersionString = 'Apophysis 2.03d pre-release 4';
type type
TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove); TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
@ -335,8 +335,8 @@ function DeleteEntry(Entry, FileName: string): boolean;
function CleanIdentifier(ident: string): string; function CleanIdentifier(ident: string): string;
function CleanUPRTitle(ident: string): string; function CleanUPRTitle(ident: string): string;
function GradientString(c: TColorMap): string; function GradientString(c: TColorMap): string;
function PackVariations: cardinal; function PackVariations: int64;
procedure UnpackVariations(v: integer); procedure UnpackVariations(v: int64);
//procedure NormalizeWeights(var cp: TControlPoint); //procedure NormalizeWeights(var cp: TControlPoint);
//procedure EqualizeWeights(var cp: TControlPoint); //procedure EqualizeWeights(var cp: TControlPoint);
procedure MultMatrix(var s: TMatrix; const m: TMatrix); procedure MultMatrix(var s: TMatrix; const m: TMatrix);
@ -434,20 +434,19 @@ begin
end; end;
function PackVariations: cardinal; function PackVariations: int64;
{ Packs the variation options into an integer with Linear as lowest bit } { Packs the variation options into an integer with Linear as lowest bit }
var var
r, i: cardinal; i: integer;
begin begin
r := 0; result := 0;
for i := 0 to NRVAR - 1 do for i := NRVAR-1 downto 0 do
begin begin
r := r or byte(Variations[i]) shl i; result := (result shl 1) or integer(Variations[i]);
end; end;
Result := r;
end; end;
procedure UnpackVariations(v: integer); procedure UnpackVariations(v: int64);
{ Unpacks the variation options form an integer } { Unpacks the variation options form an integer }
var var
i: integer; i: integer;
@ -1349,7 +1348,7 @@ begin
FileList.Add(' ' + cp1.xform[t].ToXMLString); FileList.Add(' ' + cp1.xform[t].ToXMLString);
Filelist.Add(' </xformset>'); Filelist.Add(' </xformset>');
{$else} {$else}
FileList.Add(cp1.xform[i].FinalToXMLString(cp1.finalXformEnabled)); FileList.Add(cp1.xform[t].FinalToXMLString(cp1.finalXformEnabled));
{$ifend} {$ifend}
end; end;

6
2.10/Source/Regstry.pas
View File

@ -277,7 +277,9 @@ begin
end; end;
if Registry.ValueExists('VariationOptions') then if Registry.ValueExists('VariationOptions') then
begin begin
VariationOptions := Registry.ReadInteger('VariationOptions'); Registry.ReadBinaryData('VariationOptions', VariationOptions, 8);
// Delphi_Suxx := Registry.ReadString('VariationOptions');
// VariationOptions := StrToInt64(Delphi_Suxx);
end end
else else
begin begin
@ -940,7 +942,7 @@ begin
Registry.WriteInteger('SymmetryType', SymmetryType); Registry.WriteInteger('SymmetryType', SymmetryType);
Registry.WriteInteger('SymmetryOrder', SymmetryOrder); Registry.WriteInteger('SymmetryOrder', SymmetryOrder);
Registry.WriteInteger('SymmetryNVars', SymmetryNVars); Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
Registry.WriteInteger('VariationOptions', VariationOptions); Registry.WriteBinaryData('VariationOptions', VariationOptions, 8);
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);