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

bugfix

Browse Source
This commit is contained in:
zueuk 2005-10-20 10:11:07 +00:00
parent 1e6b947141
commit 9443050443
1 changed files with 40 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
2.10/Source/Adjust.pas
View File

@ -257,9 +257,9 @@ type
cp: TControlPoint; cp: TControlPoint;
private // --Z-- // gradient stuff private // gradient stuff
Palette: TColorMap; Palette, BackupPal: TColorMap;
BackupPal: TColorMap; tmpBackupPal: TColorMap;
scrollMode: (modeRotate, scrollMode: (modeRotate,
modeHue, modeSaturation, modeBrightness, modeContrast, modeHue, modeSaturation, modeBrightness, modeContrast,
@ -275,7 +275,7 @@ type
procedure UpdateGradient(Pal: TColorMap); procedure UpdateGradient(Pal: TColorMap);
private // --Z-- // image size stuff private // image size stuff
ImageHeight, ImageWidth: integer; ImageHeight, ImageWidth: integer;
Preset: array[1..3] of record Preset: array[1..3] of record
Left, Top, Width, Height: integer; Left, Top, Width, Height: integer;
@ -304,8 +304,6 @@ function GradientInClipboard: boolean;
procedure RGBToHSV(R, G, B: byte; var H, S, V: real); procedure RGBToHSV(R, G, B: byte; var H, S, V: real);
procedure HSVToRGB(H, S, V: real; var Rb, Gb, Bb: integer); procedure HSVToRGB(H, S, V: real; var Rb, Gb, Bb: integer);
//function RandomGradient: TColorMap;
implementation implementation
//uses Main, Global, Registry, Mutate, Editor, Save, Browser; //uses Main, Global, Registry, Mutate, Editor, Save, Browser;
@ -428,9 +426,9 @@ begin
for i := 0 to 255 do for i := 0 to 255 do
with Row[i] do with Row[i] do
begin begin
rgbtRed := Palette[i][0]; rgbtRed := cp.cmap[i][0];
rgbtGreen := Palette[i][1]; rgbtGreen := cp.cmap[i][1];
rgbtBlue := Palette[i][2]; rgbtBlue := cp.cmap[i][2];
end; end;
GradientImage.Picture.Graphic := Bitmap; GradientImage.Picture.Graphic := Bitmap;
@ -1223,40 +1221,6 @@ begin
end; end;
end; end;
{
procedure TAdjustForm.DrawPalette;
var
i: integer;
Row: pRGBTripleArray;
BitMap: TBitMap;
begin
BitMap := TBitMap.Create;
try
Bitmap.PixelFormat := pf24bit;
BitMap.Width := 256;
BitMap.Height := 1;
//for j := 0 to Bitmap.Height - 1 do // a loop from 0 to 0, hmm? :-\
Row := Bitmap.Scanline[0];
for i := 0 to Bitmap.Width - 1 do
begin
with Row[i] do
begin
rgbtRed := Palette[i][0];
rgbtGreen := Palette[i][1];
rgbtBlue := Palette[i][2];
end;
end;
//end;
GradientImage.Picture.Graphic := Bitmap;
GradientImage.Refresh;
finally
BitMap.Free;
end;
end;
}
procedure TAdjustForm.cmbPaletteChange(Sender: TObject); procedure TAdjustForm.cmbPaletteChange(Sender: TObject);
var var
i: integer; i: integer;
@ -1378,9 +1342,9 @@ begin
modeRotate: modeRotate:
for i := 0 to 255 do for i := 0 to 255 do
begin begin
Palette[i][0] := BackupPal[(255 + i - ScrollBar.Position) mod 256][0]; Palette[i][0] := BackupPal[(256 + i - ScrollBar.Position) mod 256][0];
Palette[i][1] := BackupPal[(255 + i - ScrollBar.Position) mod 256][1]; Palette[i][1] := BackupPal[(256 + i - ScrollBar.Position) mod 256][1];
Palette[i][2] := BackupPal[(255 + i - ScrollBar.Position) mod 256][2]; Palette[i][2] := BackupPal[(256 + i - ScrollBar.Position) mod 256][2];
end; end;
modeBlur: modeBlur:
Palette := Blur(ScrollBar.Position, BackupPal); Palette := Blur(ScrollBar.Position, BackupPal);
@ -1664,7 +1628,7 @@ begin
begin begin
dragX:=x; dragX:=x;
oldX:=x; // hmmm oldX:=x; // hmmm
BackupPal:=Palette; // hmmmm.... tmpBackupPal := BackupPal;
imgDrag:=true; imgDrag:=true;
GradientChanged:=false; GradientChanged:=false;
end; end;
@ -1678,21 +1642,40 @@ begin
if imgDrag and (oldX<>x) then if imgDrag and (oldX<>x) then
begin begin
oldX:=x; oldX:=x;
offset := ( ((x - dragX) shl 8) div GradientImage.Width ) mod 256; offset := ( ((x - dragX) shl 8) div GradientImage.Width) mod 256;
lblOffset.Caption:=IntToStr(offset); lblOffset.Caption:=IntToStr(offset);
lblOffset.Refresh; lblOffset.Refresh;
GradientChanged := true; GradientChanged := true;
for i := 0 to 255 do for i := 0 to 255 do
begin begin
Palette[i][0] := BackupPal[(256 + i - offset) and $FF][0]; cp.cmap[i][0] := Palette[(256 + i - offset) and $FF][0];
Palette[i][1] := BackupPal[(256 + i - offset) and $FF][1]; cp.cmap[i][1] := Palette[(256 + i - offset) and $FF][1];
Palette[i][2] := BackupPal[(256 + i - offset) and $FF][2]; cp.cmap[i][2] := Palette[(256 + i - offset) and $FF][2];
end;
cp.CmapIndex := cmbPalette.ItemIndex;
cp.cmap := Palette;
//if scrollMode = modeRotate then lblVal.Caption := IntToStr(offset); BackupPal[i][0] := tmpBackupPal[(256 + i - offset) and $FF][0];
BackupPal[i][1] := tmpBackupPal[(256 + i - offset) and $FF][1];
BackupPal[i][2] := tmpBackupPal[(256 + i - offset) and $FF][2];
end;
//? cp.CmapIndex := cmbPalette.ItemIndex;
//cp.cmap := Palette;
(*
if scrollMode = modeRotate then
begin
Resetting := true;
if offset < -128 then ScrollBar.Position := offset+256
else if offset > 128 then ScrollBar.Position := offset-256
else ScrollBar.Position := offset;
Resetting := false;
end
else for i := 0 to 255 do
begin
BackupPal[i][0] := tmpBackupPal[(256 + i - offset) and $FF][0];
BackupPal[i][1] := tmpBackupPal[(256 + i - offset) and $FF][1];
BackupPal[i][2] := tmpBackupPal[(256 + i - offset) and $FF][2];
end;
*)
DrawPreview; DrawPreview;
end; end;
@ -1706,6 +1689,8 @@ begin
imgDrag := false; imgDrag := false;
lblOffset.Caption:=''; lblOffset.Caption:='';
Palette := cp.cmap;
if GradientChanged then Apply; if GradientChanged then Apply;
end; end;
end; end;