Menu
▾
▴
[Apophysis-cvs-commits] 2.10/Source Adjust.dfm,1.11,1.12 Adjust.pas,1.12,1.13 ControlPoint.pas,1.16,1.17 Editor.dfm,1.19,1.20 Editor.pas,1.25,1.26 Global.pas,1.10,1.11 Main.dfm,1.21,1.22 Main.pas,1.24,1.25 VarEyefish.pas,1.3,1.4
Update of /cvsroot/apophysis/2.10/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25190/Source Modified Files: Adjust.dfm Adjust.pas ControlPoint.pas Editor.dfm Editor.pas Global.pas Main.dfm Main.pas VarEyefish.pas Log Message: many changes, mostly in editor and adjust Index: ControlPoint.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/ControlPoint.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ControlPoint.pas 9 Oct 2005 13:26:27 -0000 1.16 --- ControlPoint.pas 19 Oct 2005 18:51:05 -0000 1.17 *************** *** 1931,1934 **** --- 1931,1935 ---- end; + // I don't like this... :-/ for j := -1 to Result-1 do for i := 0 to 2 do *************** *** 1994,2005 **** begin solve3(Triangles[-1].x[0], -Triangles[-1].y[0], Triangles[i].x[0], ! Triangles[-1].x[1], -Triangles[-1].y[1], Triangles[i].x[1], ! Triangles[-1].x[2], -Triangles[-1].y[2], Triangles[i].x[2], ! xform[i].c[0][0], xform[i].c[1][0], xform[i].c[2][0]); solve3(Triangles[-1].x[0], -Triangles[-1].y[0], -Triangles[i].y[0], ! Triangles[-1].x[1], -Triangles[-1].y[1], -Triangles[i].y[1], ! Triangles[-1].x[2], -Triangles[-1].y[2], -Triangles[i].y[2], ! xform[i].c[0][1], xform[i].c[1][1], xform[i].c[2][1]); end; end; --- 1995,2006 ---- begin solve3(Triangles[-1].x[0], -Triangles[-1].y[0], Triangles[i].x[0], ! Triangles[-1].x[1], -Triangles[-1].y[1], Triangles[i].x[1], ! Triangles[-1].x[2], -Triangles[-1].y[2], Triangles[i].x[2], ! xform[i].c[0][0], xform[i].c[1][0], xform[i].c[2][0]); solve3(Triangles[-1].x[0], -Triangles[-1].y[0], -Triangles[i].y[0], ! Triangles[-1].x[1], -Triangles[-1].y[1], -Triangles[i].y[1], ! Triangles[-1].x[2], -Triangles[-1].y[2], -Triangles[i].y[2], ! xform[i].c[0][1], xform[i].c[1][1], xform[i].c[2][1]); end; end; Index: Editor.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Editor.pas 19 Oct 2005 04:51:50 -0000 1.25 --- Editor.pas 19 Oct 2005 18:51:05 -0000 1.26 *************** *** 47,51 **** mnuDelete: TMenuItem; mnuDuplicate: TMenuItem; - MenuItem2: TMenuItem; mnuAdd: TMenuItem; mnuAutoZoom: TMenuItem; --- 47,50 ---- *************** *** 66,75 **** TriangleTab: TTabSheet; tabXForm: TTabSheet; [...1141 lines suppressed...] + + procedure TEditForm.btnOcoefsClick(Sender: TObject); + begin + if (cp.xform[SelectedTriangle].c[2][0] = 0) and + (cp.xform[SelectedTriangle].c[2][1] = 0) then exit; + + MainForm.UpdateUndo; + cp.xform[SelectedTriangle].c[2][0] := 0; + cp.xform[SelectedTriangle].c[2][1] := 0; + cp.TrianglesFromCP(MainTriangles); + UpdateFlame(True); + end; + + procedure TEditForm.btnCoefsModeClick(Sender: TObject); + begin + ShowSelectedInfo; + end; + end. Index: Adjust.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Adjust.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Adjust.pas 6 Oct 2005 15:54:53 -0000 1.12 --- Adjust.pas 19 Oct 2005 18:51:05 -0000 1.13 *************** *** 258,273 **** cp: TControlPoint; ! // --Z-- // gradient stuff Palette: TColorMap; BackupPal: TColorMap; ! scrollMode: (modeRotate, modeHue, modeSaturation, modeBrightness, modeContrast, ! modeBlur, modeFrequency); imgDrag, GradientChanged: boolean; dragX, oldX: integer; ! offset: integer; // for display... :-\ ! // --Z-- // image size stuff ImageHeight, ImageWidth: integer; Preset: array[1..3] of record --- 258,280 ---- cp: TControlPoint; ! private // --Z-- // gradient stuff Palette: TColorMap; BackupPal: TColorMap; ! scrollMode: (modeRotate, ! modeHue, modeSaturation, modeBrightness, modeContrast, ! modeBlur, modeFrequency); imgDrag, GradientChanged: boolean; dragX, oldX: integer; ! offset: integer; // for display...? :-\ + procedure Apply; + function Blur(const radius: integer; const pal: TColorMap): TColorMap; + function Frequency(const times: Integer; const pal: TColorMap): TColorMap; + procedure SaveMap(FileName: string); ! procedure UpdateGradient(Pal: TColorMap); ! ! private // --Z-- // image size stuff ImageHeight, ImageWidth: integer; Preset: array[1..3] of record *************** *** 276,292 **** ratio: double; - // gradient stuff again - procedure Apply; - function Blur(const radius: integer; const pal: TColorMap): TColorMap; - function Frequency(const times: Integer; const pal: TColorMap): TColorMap; - procedure SaveMap(FileName: string); - - // and image size stuff again procedure ReadPreset(n: integer); procedure WritePreset(n: integer); function PresetToStr(n: integer): string; - procedure UpdateGradient(Pal: TColorMap); - // -- public PreviewDensity: double; --- 283,290 ---- *************** *** 295,299 **** // Sample_Density, Zoom: double; // Center: array[0..1] of double; ! procedure UpdateDisplay; procedure UpdateFlame; --- 293,297 ---- // Sample_Density, Zoom: double; // Center: array[0..1] of double; ! procedure UpdateDisplay(PreviewOnly: boolean = false); procedure UpdateFlame; *************** *** 318,329 **** {$R *.DFM} ! procedure TAdjustForm.UpdateDisplay; var pw, ph: integer; r: double; begin pw := PrevPnl.Width - 2; ph := PrevPnl.Height - 2; - cp.copy(MainCp); if (cp.width / cp.height) > (PrevPnl.Width / PrevPnl.Height) then begin --- 316,328 ---- {$R *.DFM} ! procedure TAdjustForm.UpdateDisplay(PreviewOnly: boolean = false); var pw, ph: integer; r: double; begin + cp.copy(MainCp); + pw := PrevPnl.Width - 2; ph := PrevPnl.Height - 2; if (cp.width / cp.height) > (PrevPnl.Width / PrevPnl.Height) then begin *************** *** 334,339 **** PreviewImage.Top := (ph - PreviewImage.Height) div 2; end ! else ! begin PreviewImage.Height := ph; r := cp.height / PreviewImage.height; --- 333,337 ---- PreviewImage.Top := (ph - PreviewImage.Height) div 2; end ! else begin PreviewImage.Height := ph; r := cp.height / PreviewImage.height; *************** *** 342,347 **** PreviewImage.Left := (pw - PreviewImage.Width) div 2; end; - cp.cmap := MainCp.cmap; AdjustScale(cp, PreviewImage.Width, PreviewImage.Height); // zoom := MainForm.zoom; // cp.zoom := zoom; --- 340,349 ---- PreviewImage.Left := (pw - PreviewImage.Width) div 2; end; AdjustScale(cp, PreviewImage.Width, PreviewImage.Height); + + cp.cmap := MainCp.cmap; + + if not PreviewOnly then begin //*** + // zoom := MainForm.zoom; // cp.zoom := zoom; *************** *** 369,380 **** if cp.cmapindex >= 0 then cmbPalette.ItemIndex := cp.cmapindex; ! // ScrollBar.Position := 0; Palette := cp.cmap; BackupPal := cp.cmap; Resetting := False; - DrawPreview; ! //DrawPalette; end; --- 371,382 ---- if cp.cmapindex >= 0 then cmbPalette.ItemIndex := cp.cmapindex; ! ScrollBar.Position := 0; Palette := cp.cmap; BackupPal := cp.cmap; Resetting := False; ! end; //*** ! DrawPreview; end; *************** *** 399,445 **** BitMap: TBitMap; begin ! if not Resetting then begin ! Render.Stop; ! // AdjustScale(cp, PreviewImage.Width, PreviewImage.Height); ! cp.sample_density := PreviewDensity; ! cp.spatial_oversample := defOversample; ! cp.spatial_filter_radius := defFilterRadius; ! // cp.Zoom := Zoom; ! // cp.center[0] := Center[0]; ! // cp.center[1] := Center[1]; ! Render.Compatibility := compatibility; ! Render.SetCP(cp); ! Render.Render; ! BM.Assign(Render.GetImage); ! PreviewImage.Picture.Graphic := bm; ! if mnuInstantPreview.Checked then ! PreviewImage.Refresh; ! //--begin DrawPalette ! BitMap := TBitMap.Create; ! try ! Bitmap.PixelFormat := pf24bit; ! BitMap.Width := 256; ! BitMap.Height := 1; ! Row := Bitmap.Scanline[0]; ! for i := 0 to 255 do begin ! with Row[i] do ! begin ! rgbtRed := Palette[i][0]; ! rgbtGreen := Palette[i][1]; ! rgbtBlue := Palette[i][2]; ! end; end; ! GradientImage.Picture.Graphic := Bitmap; ! GradientImage.Refresh; ! finally ! BitMap.Free; ! end; ! //--end DrawPalette end; end; --- 401,443 ---- BitMap: TBitMap; begin ! if Resetting then exit; ! Render.Stop; ! // AdjustScale(cp, PreviewImage.Width, PreviewImage.Height); ! cp.sample_density := PreviewDensity; ! cp.spatial_oversample := defOversample; ! cp.spatial_filter_radius := defFilterRadius; ! // cp.Zoom := Zoom; ! // cp.center[0] := Center[0]; ! // cp.center[1] := Center[1]; ! Render.Compatibility := compatibility; ! Render.SetCP(cp); ! Render.Render; ! BM.Assign(Render.GetImage); ! PreviewImage.Picture.Graphic := bm; ! if mnuInstantPreview.Checked then PreviewImage.Refresh; ! //--begin DrawPalette ! BitMap := TBitMap.Create; ! try ! Bitmap.PixelFormat := pf24bit; ! BitMap.Width := 256; ! BitMap.Height := 1; ! Row := Bitmap.Scanline[0]; ! for i := 0 to 255 do ! with Row[i] do begin ! rgbtRed := Palette[i][0]; ! rgbtGreen := Palette[i][1]; ! rgbtBlue := Palette[i][2]; end; ! GradientImage.Picture.Graphic := Bitmap; ! GradientImage.Refresh; ! finally ! BitMap.Free; end; + //--end DrawPalette end; *************** *** 495,515 **** end; - { - procedure TAdjustForm.btnOKClick(Sender: TObject); - begin - ModalResult := mrOK; - end; - - procedure TAdjustForm.btnCancelClick(Sender: TObject); - begin - ModalResult := mrCancel; - end; - - procedure TAdjustForm.btnCanelClick(Sender: TObject); - begin - ModalResult := mrCancel; - end; - } - procedure TAdjustForm.FormShow(Sender: TObject); var --- 493,496 ---- *************** *** 536,540 **** if Registry.OpenKey('Software\' + APP_NAME + '\ImageSizePresets', False) then begin - // --Zueuk-- // image size presets for i:=1 to 3 do begin strx:='Preset'+IntToStr(i)+'Left'; --- 517,520 ---- *************** *** 1045,1050 **** if MutateForm.Visible then MutateForm.UpdateDisplay; ! if mnuInstantPreview.Checked then ! DrawPreview; //hmm MainForm.RedrawTimer.enabled := true; --- 1025,1029 ---- if MutateForm.Visible then MutateForm.UpdateDisplay; ! if mnuInstantPreview.Checked then DrawPreview; MainForm.RedrawTimer.enabled := true; *************** *** 1087,1094 **** // DrawPalette; ! cp.copy(MainCp); ! if mnuInstantPreview.Checked then ! DrawPreview; //hmm end; --- 1066,1073 ---- // DrawPalette; ! cp.cmap := pal; ! // cp.copy(MainCp); ! if mnuInstantPreview.Checked then DrawPreview; end; *************** *** 1334,1431 **** h, s, v: real; begin - GradientChanged:=true; // hmm - lblVal.Caption := IntToStr(ScrollBar.Position); lblVal.Refresh; - { - wtf???? this is ridiculous! ! =>> if btnMenu.Caption = 'Hue' then <<= (and 6 more like this follows...) ! } ! case scrollMode of ! modeHue: ! begin ! for i := 0 to 255 do ! begin ! RGBToHSV(BackupPal[i][0], BackupPal[i][1], BackupPal[i][2], h, s, v); ! if s <> 0 then // --Z-- //(?) begin ! h := Round(360 + h + ScrollBar.Position) mod 360; ! HSVToRGB(h, s, v, Palette[i][0], Palette[i][1], Palette[i][2]); end; ! end; ! end; ! modeSaturation: ! begin ! for i := 0 to 255 do ! begin ! RGBToHSV(BackupPal[i][0], BackupPal[i][1], BackupPal[i][2], h, s, v); ! // if s <> 0 then // --Z-- //(?) ! // begin ! s := s + ScrollBar.Position; ! if s > 100 then s := 100; ! if s < 0 then s := 0; ! HSVToRGB(h, s, v, Palette[i][0], Palette[i][1], Palette[i][2]); ! // end; ! end; ! end; ! modeContrast: ! begin ! intens := scrollBar.Position; ! if intens > 0 then intens := intens * 2; ! for i := 0 to 255 do ! begin ! r := BackupPal[i][0]; ! g := BackupPal[i][1]; ! b := BackupPal[i][2]; ! r := round(r + intens / 100 * (r - 127)); ! g := round(g + intens / 100 * (g - 127)); ! b := round(b + intens / 100 * (b - 127)); ! if R > 255 then R := 255 else if R < 0 then R := 0; ! if G > 255 then G := 255 else if G < 0 then G := 0; ! if B > 255 then B := 255 else if B < 0 then B := 0; ! Palette[i][0] := r; ! Palette[i][1] := g; ! Palette[i][2] := b; ! end; ! end; ! // if btnMenu.Caption = 'Brightness' then ! modeBrightness: ! begin ! for i := 0 to 255 do ! begin ! Palette[i][0] := BackupPal[i][0] + ScrollBar.Position; ! if Palette[i][0] > 255 then Palette[i][0] := 255; ! if Palette[i][0] < 0 then Palette[i][0] := 0; ! Palette[i][1] := BackupPal[i][1] + ScrollBar.Position; ! if Palette[i][1] > 255 then Palette[i][1] := 255; ! if Palette[i][1] < 0 then Palette[i][1] := 0; ! Palette[i][2] := BackupPal[i][2] + ScrollBar.Position; ! if Palette[i][2] > 255 then Palette[i][2] := 255; ! if Palette[i][2] < 0 then Palette[i][2] := 0; ! end; ! end; ! modeRotate: ! begin ! for i := 0 to 255 do begin ! Palette[i][0] := BackupPal[(255 + i - ScrollBar.Position) mod 256][0]; ! Palette[i][1] := BackupPal[(255 + i - ScrollBar.Position) mod 256][1]; ! Palette[i][2] := BackupPal[(255 + i - ScrollBar.Position) mod 256][2]; end; end; ! // if scrollMode = modeBlur then ! // if btnMenu.Caption = 'Blur' then ! modeBlur: ! begin ! Palette := Blur(ScrollBar.Position, BackupPal); ! end; ! // if scrollMode = modeFrequency then ! modeFrequency: ! begin ! Palette := Frequency(ScrollBar.Position, BackupPal); ! end; ! end; ! // DrawPalette; cp.cmap:=Palette; DrawPreview; --- 1313,1392 ---- h, s, v: real; begin lblVal.Caption := IntToStr(ScrollBar.Position); lblVal.Refresh; ! if Resetting then exit; ! ! GradientChanged:=true; // hmm ! ! case scrollMode of ! modeHue: ! for i := 0 to 255 do begin ! RGBToHSV(BackupPal[i][0], BackupPal[i][1], BackupPal[i][2], h, s, v); ! if s <> 0 then // --Z-- //(?) ! begin ! h := Round(360 + h + ScrollBar.Position) mod 360; ! HSVToRGB(h, s, v, Palette[i][0], Palette[i][1], Palette[i][2]); ! end; end; ! modeSaturation: ! for i := 0 to 255 do ! begin ! RGBToHSV(BackupPal[i][0], BackupPal[i][1], BackupPal[i][2], h, s, v); ! if s <> 0 then // --Z-- //(?) ! begin ! s := s + ScrollBar.Position; ! if s > 100 then s := 100; ! if s < 0 then s := 0; ! HSVToRGB(h, s, v, Palette[i][0], Palette[i][1], Palette[i][2]); ! end; ! end; ! modeContrast: begin ! intens := scrollBar.Position; ! if intens > 0 then intens := intens * 2; ! for i := 0 to 255 do ! begin ! r := BackupPal[i][0]; ! g := BackupPal[i][1]; ! b := BackupPal[i][2]; ! r := round(r + intens / 100 * (r - 127)); ! g := round(g + intens / 100 * (g - 127)); ! b := round(b + intens / 100 * (b - 127)); ! if R > 255 then R := 255 else if R < 0 then R := 0; ! if G > 255 then G := 255 else if G < 0 then G := 0; ! if B > 255 then B := 255 else if B < 0 then B := 0; ! Palette[i][0] := r; ! Palette[i][1] := g; ! Palette[i][2] := b; ! end; end; + modeBrightness: + for i := 0 to 255 do + begin + Palette[i][0] := BackupPal[i][0] + ScrollBar.Position; + if Palette[i][0] > 255 then Palette[i][0] := 255; + if Palette[i][0] < 0 then Palette[i][0] := 0; + Palette[i][1] := BackupPal[i][1] + ScrollBar.Position; + if Palette[i][1] > 255 then Palette[i][1] := 255; + if Palette[i][1] < 0 then Palette[i][1] := 0; + Palette[i][2] := BackupPal[i][2] + ScrollBar.Position; + if Palette[i][2] > 255 then Palette[i][2] := 255; + if Palette[i][2] < 0 then Palette[i][2] := 0; + end; + modeRotate: + for i := 0 to 255 do + begin + Palette[i][0] := BackupPal[(255 + i - ScrollBar.Position) mod 256][0]; + Palette[i][1] := BackupPal[(255 + i - ScrollBar.Position) mod 256][1]; + Palette[i][2] := BackupPal[(255 + i - ScrollBar.Position) mod 256][2]; + end; + modeBlur: + Palette := Blur(ScrollBar.Position, BackupPal); + modeFrequency: + Palette := Frequency(ScrollBar.Position, BackupPal); end; ! cp.cmap:=Palette; DrawPreview; Index: VarEyefish.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/VarEyefish.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VarEyefish.pas 22 Sep 2005 16:08:29 -0000 1.3 --- VarEyefish.pas 19 Oct 2005 18:51:05 -0000 1.4 *************** *** 20,24 **** math; ! // TVariationEyefish /////////////////////////////////////////////////////////////////////////////// --- 20,24 ---- math; ! // TVariationEyefish, the correct "fish-eye" variation /////////////////////////////////////////////////////////////////////////////// *************** *** 62,65 **** --- 62,66 ---- fstp qword ptr [ecx] + fwait {$ifend} end; Index: Adjust.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Adjust.dfm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Adjust.dfm 6 Oct 2005 15:54:53 -0000 1.11 --- Adjust.dfm 19 Oct 2005 18:51:05 -0000 1.12 *************** *** 678,681 **** --- 678,682 ---- Align = alTop BevelOuter = bvLowered + Color = clAppWorkSpace TabOrder = 0 object GradientImage: TImage Index: Editor.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Editor.dfm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Editor.dfm 19 Oct 2005 04:51:50 -0000 1.19 --- Editor.dfm 19 Oct 2005 18:51:05 -0000 1.20 *************** *** 1,7 **** object EditForm: TEditForm ! Left = 350 ! Top = 163 Width = 586 ! Height = 586 Caption = 'Transform Editor' Color = clBtnFace --- 1,7 ---- object EditForm: TEditForm ! Left = 279 [...1113 lines suppressed...] FF7FFFFF00000000FF7FFFFF00000000FFFFFFFFFFFFFFFFF0070001FEFF8003 ! F9F79FFD7FFDCFE7FCF7C8053EF9E7CFF277E4F51FF1F39FEF37F2754EE5F93F ! EF97F93567CDFC7FDFC7FC95729DFEFFDFE7FE45793D5555DFF7FF25729DFEFF ! DFFFFF9567CDFC7FEFC3FFCD4EE5F93FEFF3FFE51FF1F39FF3CBFFF13EF9E7CF FC3BFFF97FFDCFE7FFFFFFFDFEFF8003FFFFFFFFFFCFFFFFFFFFFFFFFF87FEFF FFFFFFFFF787FC7FFFFFFFFFF30FF83FFFF7EFFFF00FFEFFC1F7EF83F01FFEFF *************** *** 2305,2310 **** C003F239C609C619C003F319E309E219C003F389F189F009C003F3C1F8C1F8C1 C0030021FC41F061C0070031FE01E231C00FF3F9FF09C719C01FF3FDFF8D8F8D ! C03FF3FFFFCFDFDFFFFFF3FFFFEFFFFF00000000000000000000000000000000 ! 000000000000} end end --- 2240,2244 ---- C003F239C609C619C003F319E309E219C003F389F189F009C003F3C1F8C1F8C1 C0030021FC41F061C0070031FE01E231C00FF3F9FF09C719C01FF3FDFF8D8F8D ! C03FF3FFFFCFDFDFFFFFF3FFFFEFFFFF} end end Index: Main.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Main.pas,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Main.pas 2 Oct 2005 07:33:11 -0000 1.24 --- Main.pas 19 Oct 2005 18:51:05 -0000 1.25 *************** *** 1811,1817 **** begin AdjustScale(MainCp, Image.width, Image.height); ! if EditForm.Visible then EditForm.UpdateDisplay(true); // preview only end; ! if AdjustForm.Visible then AdjustForm.UpdateDisplay; // following needed ? // cp.Zoom := Zoom; --- 1811,1817 ---- begin AdjustScale(MainCp, Image.width, Image.height); ! if EditForm.Visible then EditForm.UpdateDisplay(true); // preview only? end; ! if AdjustForm.Visible then AdjustForm.UpdateDisplay(true); // preview only! // following needed ? // cp.Zoom := Zoom; *************** *** 2224,2229 **** Transforms := MainCp.TrianglesFromCP(MainTriangles); ! if AdjustForm.visible then ! AdjustForm.UpdateDisplay; StatusBar.Panels[2].text := maincp.name; --- 2224,2228 ---- Transforms := MainCp.TrianglesFromCP(MainTriangles); ! if AdjustForm.visible then AdjustForm.UpdateDisplay; StatusBar.Panels[2].text := maincp.name; *************** *** 2826,2830 **** Center[0] := maincp.Center[0]; Center[1] := maincp.Center[1]; ! MainCP.NormalizeWeights; mnuSaveUndo.Enabled := false; mnuUndo.Enabled := False; --- 2825,2829 ---- Center[0] := maincp.Center[0]; Center[1] := maincp.Center[1]; ! // MainCP.NormalizeWeights; mnuSaveUndo.Enabled := false; mnuUndo.Enabled := False; *************** *** 2867,2878 **** procedure TMainForm.UpdateWindows; begin ! if AdjustForm.visible then ! AdjustForm.UpdateDisplay; ! if EditForm.visible then EditForm.UpdateDisplay; - // hmm I think I still have some problems with EditForm updating - // several times in a row with all these calls :-\ - - // if AdjustForm.visible then AdjustForm.UpdateDisplay; if MutateForm.visible then MutateForm.UpdateDisplay; end; --- 2866,2871 ---- procedure TMainForm.UpdateWindows; begin ! if AdjustForm.visible then AdjustForm.UpdateDisplay; if EditForm.visible then EditForm.UpdateDisplay; if MutateForm.visible then MutateForm.UpdateDisplay; end; *************** *** 2938,2950 **** Center[1] := maincp.Center[1]; // cp.CalcBoundbox; ! MainCP.NormalizeWeights; Transforms := MainCp.TrianglesFromCP(MainTriangles); // Trim undo index from title maincp.name := Copy(Fstrings[0], 6, length(Fstrings[0]) - 7); ! if SavedPal then ! maincp.cmap := palette; ! if AdjustForm.visible then ! AdjustForm.UpdateDisplay; RedrawTimer.Enabled := True; --- 2931,2941 ---- Center[1] := maincp.Center[1]; // cp.CalcBoundbox; ! // MainCP.NormalizeWeights; Transforms := MainCp.TrianglesFromCP(MainTriangles); // Trim undo index from title maincp.name := Copy(Fstrings[0], 6, length(Fstrings[0]) - 7); ! if SavedPal then maincp.cmap := palette; ! if AdjustForm.visible then AdjustForm.UpdateDisplay; RedrawTimer.Enabled := True; *************** *** 3637,3641 **** for i := nxform to NXFORMS - 1 do cp1.xform[i].density := 0; ! cp1.NormalizeWeights; // Check for symmetry parameter if ParseCp.symmetry <> 0 then --- 3628,3632 ---- for i := nxform to NXFORMS - 1 do cp1.xform[i].density := 0; ! // cp1.NormalizeWeights; // Check for symmetry parameter if ParseCp.symmetry <> 0 then Index: Main.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Main.dfm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Main.dfm 3 Oct 2005 21:52:47 -0000 1.21 --- Main.dfm 19 Oct 2005 18:51:05 -0000 1.22 *************** *** 28,32 **** Top = 28 Width = 4 ! Height = 522 end object ToolBar: TToolBar --- 28,32 ---- Top = 28 Width = 4 ! Height = 520 end object ToolBar: TToolBar *************** *** 285,289 **** Top = 28 Width = 160 ! Height = 522 Align = alLeft Columns = < --- 285,289 ---- Top = 28 Width = 160 ! Height = 520 Align = alLeft Columns = < *************** *** 304,308 **** Top = 28 Width = 433 ! Height = 522 Align = alClient BevelInner = bvLowered --- 304,308 ---- Top = 28 Width = 433 ! Height = 520 Align = alClient BevelInner = bvLowered *************** *** 315,319 **** Top = 1 Width = 431 ! Height = 520 Align = alClient AutoSize = True --- 315,319 ---- Top = 1 Width = 431 ! Height = 518 Align = alClient AutoSize = True *************** *** 328,332 **** object StatusBar: TStatusBar Left = 0 ! Top = 550 Width = 597 Height = 19 --- 328,332 ---- object StatusBar: TStatusBar Left = 0 ! Top = 548 Width = 597 Height = 19 *************** *** 2627,2631 **** Hint = 'Show the flame in fullscreen mode' ImageIndex = 52 ! ShortCut = 16454 OnClick = mnuFullScreenClick end --- 2627,2631 ---- Hint = 'Show the flame in fullscreen mode' ImageIndex = 52 ! ShortCut = 114 OnClick = mnuFullScreenClick end *************** *** 2637,2641 **** Hint = 'Show the Transform Editor' ImageIndex = 19 ! ShortCut = 16453 OnClick = mnuEditorClick end --- 2637,2641 ---- Hint = 'Show the Transform Editor' ImageIndex = 19 ! ShortCut = 115 OnClick = mnuEditorClick end *************** *** 2644,2648 **** Hint = 'Show the Adjust window' ImageIndex = 18 ! ShortCut = 16449 OnClick = mnuAdjustClick end --- 2644,2648 ---- Hint = 'Show the Adjust window' ImageIndex = 18 ! ShortCut = 116 OnClick = mnuAdjustClick end *************** *** 2651,2655 **** Hint = 'Show the Gradient window' ImageIndex = 11 ! ShortCut = 16455 OnClick = mnuGradClick end --- 2651,2655 ---- Hint = 'Show the Gradient window' ImageIndex = 11 ! ShortCut = 117 OnClick = mnuGradClick end *************** *** 2658,2669 **** Hint = 'Show the Mutation window' ImageIndex = 17 ! ShortCut = 16461 OnClick = mnuMutateClick end - object mnuimage: TMenuItem - Caption = 'Image ' - Visible = False - OnClick = mnuimageClick - end object N5: TMenuItem Caption = '-' --- 2658,2664 ---- Hint = 'Show the Mutation window' ImageIndex = 17 ! ShortCut = 118 OnClick = mnuMutateClick end object N5: TMenuItem Caption = '-' *************** *** 2672,2678 **** Caption = 'Image Size' ImageIndex = 51 ! ShortCut = 16457 OnClick = mnuImageSizeClick end end object F1: TMenuItem --- 2667,2678 ---- Caption = 'Image Size' ImageIndex = 51 ! ShortCut = 119 OnClick = mnuImageSizeClick end + object mnuimage: TMenuItem + Caption = 'Image ' + Visible = False + OnClick = mnuimageClick + end end object F1: TMenuItem *************** *** 2692,2696 **** Caption = '&Randomize' Hint = 'Randomize flame parameters' - ShortCut = 120 OnClick = mnuRandomClick end --- 2692,2695 ---- *************** *** 2698,2702 **** Caption = 'Random &Weights' Hint = 'Randomize transform weights' - ShortCut = 116 OnClick = mnuRWeightsClick end --- 2697,2700 ---- *************** *** 2704,2708 **** Caption = '&Equalize Weights' Hint = 'Set all weights to the same value' - ShortCut = 117 OnClick = mnuEqualizeClick end --- 2702,2705 ---- *************** *** 2710,2714 **** Caption = 'Compute Weights' Hint = 'Compute weights from triangle areas' - ShortCut = 118 OnClick = mnuNormalWeightsClick end --- 2707,2710 ---- *************** *** 2746,2750 **** GroupIndex = 2 RadioItem = True ! ShortCut = 121 OnClick = mnuVRandomClick end --- 2742,2746 ---- GroupIndex = 2 RadioItem = True ! ShortCut = 122 OnClick = mnuVRandomClick end *************** *** 2757,2770 **** Caption = 'Script' object mnuRun: TMenuItem ! Caption = 'Run "Default Animation"' Hint = 'Run the currently loaded script' ImageIndex = 43 ! ShortCut = 119 OnClick = mnuRunClick end object mnuStop: TMenuItem ! Caption = 'Stop' ImageIndex = 36 ! ShortCut = 16468 OnClick = mnuStopClick end --- 2753,2766 ---- Caption = 'Script' object mnuRun: TMenuItem ! Caption = 'Run script' Hint = 'Run the currently loaded script' ImageIndex = 43 ! ShortCut = 120 OnClick = mnuRunClick end object mnuStop: TMenuItem ! Caption = 'Stop script' ImageIndex = 36 ! ShortCut = 121 OnClick = mnuStopClick end Index: Global.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/Global.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Global.pas 9 Oct 2005 13:26:27 -0000 1.10 --- Global.pas 19 Oct 2005 18:51:05 -0000 1.11 *************** *** 182,187 **** function dist(x1, y1, x2, y2: double): double; ! var ! d2: double; begin (* --- 182,187 ---- function dist(x1, y1, x2, y2: double): double; ! //var ! // d2: double; begin (* |