ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/Tools/TxmpReplace.pas
(Generate patch)

Comparing oup/current/Tools/TxmpReplace.pas (file contents):
Revision 193 by alloc, Sat May 26 14:24:55 2007 UTC vs.
Revision 201 by alloc, Sat May 26 21:36:23 2007 UTC

# Line 27 | Line 27 | type
27      procedure btn_saveClick(Sender: TObject);
28      procedure btn_loadClick(Sender: TObject);
29      procedure btn_replaceClick(Sender: TObject);
30 +    procedure Splitter1Moved(Sender: TObject);
31    private
32      OniImage_Old: TOniImage;
33      OniImage_New: TOniImage;
# Line 56 | Line 57 | begin
57  
58    OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
59    old_size := OniImage_Old.GetImageSize(True);
60 <  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 2);
60 >  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
61  
62    check_fading.Checked := OniImage_Old.HasMipMaps;
63   //  check_transparency.Checked := (depthbyte and $04) > 0;
# Line 66 | Line 67 | begin
67   end;
68  
69  
70 + procedure TForm_TxmpReplace.Splitter1Moved(Sender: TObject);
71 + begin
72 +  inherited;
73 +  image_txmppreview.Picture.Assign(nil);
74 +  image_bmppreview.Picture.Assign(nil);
75 +  if Length(OniImage_Old.Images) > 0 then
76 +    OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
77 +  if Length(OniImage_New.Images) > 0 then
78 +    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 1);
79 + end;
80 +
81   procedure TForm_TxmpReplace.btn_loadClick(Sender: TObject);
82   var
83    mem:   TMemoryStream;
# Line 89 | Line 101 | var
101    datbyte: Word;
102    mem: TMemoryStream;
103    new_storetype: Byte;
104 +  formatinfo: TImageFormatInfo;
105 +  i: Integer;
106 + const
107 +  powers: array[0..8] of Integer = (1, 2, 4, 8, 16, 32, 64, 128, 256);
108   begin
109    if filelist.ItemIndex >= 0 then
110    begin
# Line 98 | Line 114 | begin
114      else
115        ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
116  
117 +    if (OniImage_New.Width[1] > 256) or (OniImage_New.Height[1] > 256) then
118 +    begin
119 +      ShowMessage('Widht and height have to be smaller than or equal to 256.');
120 +      Exit;
121 +    end;
122 +    for i := 0 to High(powers) do
123 +      if OniImage_New.Width[1] = powers[i] then
124 +        Break;
125 +    if i = Length(powers) then
126 +    begin
127 +      ShowMessage('Width has to be a power of 2 (1, 2, 4, 8, 16 ...)');
128 +      Exit;
129 +    end;
130 +    for i := 0 to High(powers) do
131 +      if OniImage_New.Height[1] = powers[i] then
132 +        Break;
133 +    if i = Length(powers) then
134 +    begin
135 +      ShowMessage('Height has to be a power of 2 (1, 2, 4, 8, 16 ...)');
136 +      Exit;
137 +    end;
138 +
139      if (OniImage_Old.Width[1] <> OniImage_New.Width[1]) or
140        (OniImage_Old.Height[1] <> OniImage_New.Height[1]) then
141      begin
# Line 116 | Line 154 | begin
154      mem := TMemoryStream.Create;
155  
156      case OniImage_New.Format of
157 +      ifX1R5G5B5: new_storetype := 1;
158        ifA1R5G5B5: new_storetype := 2;
159        ifA4R4G4B4: new_storetype := 0;
160        ifA8R8G8B8:
# Line 126 | Line 165 | begin
165        ifX8R8G8B8: new_storetype := 8;
166        ifDXT1: new_storetype := 9;
167      else
168 +      if OniImage_New.FormatInfo.HasAlphaChannel then
169 +        ShowMessage('Loaded image has an alpha-channel.' + #13#10 +
170 +                    'Because the format is neither ARGB1555' +#13#10 +
171 +                    'nor ARGB4444 it can not be imported without conversion.' + #13#10 +
172 +                    'It is converted to RGB888, so alpha gets dropped.' + #13#10 +
173 +                    'If you need alpha you have to save your image in' + #13#10 +
174 +                    'one of the previously named formats.');  
175        OniImage_New.Format := ifX8R8G8B8;
176        new_storetype := 8;
177      end;
# Line 144 | Line 190 | begin
190        ConManager.Connection[ConnectionID].UpdateRawFile(fileid, $9C, mem);
191      end;
192  
147 –    datbyte := $00;
193      if check_fading.Checked then
194 <      datbyte := datbyte or $01;
194 >      oldfading := oldfading or $01
195 >    else
196 >      oldfading := oldfading and (not Byte($01));
197      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $88, 1, @datbyte);
198      datbyte := $10;
199   //    if check_transparency.Checked then
# Line 163 | Line 210 | begin
210        ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
211  
212      ShowMessage('TXMP-image replaced');
213 +    Self.listClick(Self);
214    end;
215   end;
216  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)