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

Comparing:
oup/rewrite/Tools/TxmpReplace.pas (file contents), Revision 97 by alloc, Mon Jan 22 23:05:45 2007 UTC vs.
oup/current/Tools/TxmpReplace.pas (file contents), Revision 199 by alloc, Sat May 26 20:41:34 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 40 | Line 41 | var
41  
42   implementation
43   {$R *.dfm}
44 < uses Main, ConnectionManager;
44 > uses Main, ConnectionManager, ImagingTypes;
45  
46  
47  
48   procedure TForm_TxmpReplace.SelectFile(fileinfo: TFileInfo);
49   var
49  Data: TByteData;
50    mem:  TMemoryStream;
51    fadingbyte, depthbyte, storebyte: Byte;
52   begin
53    fileid := fileinfo.ID;
54 <  Connection.LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
55 <  Connection.LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
56 <  Connection.LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
57 <  check_fading.Checked := (fadingbyte and $01) > 0;
58 <  check_transparency.Checked := (depthbyte and $04) > 0;
59 <
60 <  OniImage_Old.LoadFromTXMP(connection, fileid);
61 <  old_size := OniImage_Old.GetImageDataSize((fadingbyte and $01) > 0);
62 <  Data := OniImage_Old.GetAsBMP;
63 <  mem  := TMemoryStream.Create;
64 <  mem.Write(Data[0], Length(Data));
65 <  mem.Seek(0, soFromBeginning);
66 <  image_txmppreview.Picture.Bitmap.LoadFromStream(mem);
67 <  mem.Free;
54 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
55 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
56 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
57 >
58 >  OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
59 >  old_size := OniImage_Old.GetImageSize(True);
60 >  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 1);
61 >
62 >  check_fading.Checked := OniImage_Old.HasMipMaps;
63 > //  check_transparency.Checked := (depthbyte and $04) > 0;
64 >  check_transparency.Checked := storebyte in [0, 2, 7];
65  
66    group_bmpselect.Enabled := True;
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;
76  tempd: Tdata;
84   begin
85    if opend.Execute then
86    begin
87 <    OniImage_New.LoadFromBMP(opend.FileName);
88 <    tempd := OniImage_New.GetAsBMP;
82 <    mem   := TMemoryStream.Create;
83 <    mem.Write(tempd[0], Length(tempd));
84 <    mem.Seek(0, soFromBeginning);
85 <    image_bmppreview.Picture.Bitmap.LoadFromStream(mem);
86 <    mem.Free;
87 >    OniImage_New.LoadFromFile(opend.FileName);
88 >    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 1);
89      group_options.Enabled := True;
90    end;
91   end;
# Line 93 | Line 95 | end;
95  
96   procedure TForm_TxmpReplace.btn_replaceClick(Sender: TObject);
97   var
98 <  newsize: LongWord;
99 <  old_rawaddr, new_rawaddr: LongWord;
98 >  newsize: Integer;
99 >  old_rawaddr, new_rawaddr: Integer;
100    oldfading: Byte;
99  tempd:     Tdata;
100
101    datbyte: Word;
102 +  mem: TMemoryStream;
103 +  new_storetype: Byte;
104 +  formatinfo: TImageFormatInfo;
105   begin
106    if filelist.ItemIndex >= 0 then
107    begin
108 <    Connection.LoadDatFilePart(fileid, $88, 1, @oldfading);
109 <    if Connection.OSisMac then
110 <      Connection.UpdateDatFilePart(fileid, $A0, 4, @old_rawaddr)
108 >    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, 1, @oldfading);
109 >    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
110 >      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @old_rawaddr)
111      else
112 <      Connection.LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
112 >      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
113  
114 <    if (OniImage_Old.Width <> OniImage_New.Width) or
115 <      (OniImage_Old.Height <> OniImage_New.Height) then
114 >    if (OniImage_Old.Width[1] <> OniImage_New.Width[1]) or
115 >      (OniImage_Old.Height[1] <> OniImage_New.Height[1]) then
116      begin
117 <      if MessageBox(Self.Handle, PChar(
118 <        'Current image and new image have different size' + CrLf +
119 <        '(Current: ' + IntToStr(OniImage_Old.Width) +
120 <        'x' + IntToStr(OniImage_Old.Height) + ' - New: ' +
121 <        IntToStr(OniImage_New.Width) + 'x' + IntToStr(OniImage_New.Height) + ')' + CrLf +
122 <        'Replace anyways?'),
123 <        PChar(filelist.Items.Strings[filelist.ItemIndex]),
124 <        MB_YESNO) = idNo then
117 >      if MessageBox(Self.Handle,
118 >            PChar(
119 >              'Current image and new image have different size' + CrLf +
120 >              '(Current: ' + IntToStr(OniImage_Old.Width[1]) + 'x' +
121 >              IntToStr(OniImage_Old.Height[1]) + ' - New: ' +
122 >              IntToStr(OniImage_New.Width[1]) + 'x' +
123 >              IntToStr(OniImage_New.Height[1]) +
124 >              ')' + CrLf + 'Replace anyway?'),
125 >            PChar(filelist.Items.Strings[filelist.ItemIndex]), MB_YESNO) = idNo then
126          Exit;
127      end;
128  
129 <    if check_fading.Checked then
130 <      if not OniImage_New.GetMipMappedImage(tempd) then
131 <        if MessageBox(Self.Handle,
132 <          PChar('Can not create a MipMapped-image (probably because of a wrong dimension).' +
133 <          #13 + #10 + 'Do you want to continue without MipMapping?'), PChar('Warning'),
134 <          MB_YESNO) = ID_YES then
135 <          check_fading.Checked := False
136 <        else
137 <          Exit;
138 <
139 <    if not check_fading.Checked then
140 <      tempd := OniImage_New.GetAsData;
141 <
142 <    newsize := OniImage_New.GetImageDataSize(check_fading.Checked);
143 <
144 <    if (newsize > old_size) and (Connection.Backend = ODB_Dat) then
145 <      new_rawaddr := Connection.AppendRawFile(
146 <        Connection.OSisMac, Length(tempd), tempd)
129 >    mem := TMemoryStream.Create;
130 >
131 >    case OniImage_New.Format of
132 >      ifX1R5G5B5: new_storetype := 1;
133 >      ifA1R5G5B5: new_storetype := 2;
134 >      ifA4R4G4B4: new_storetype := 0;
135 >      ifA8R8G8B8:
136 >        begin
137 >          new_storetype := 8;
138 >          OniImage_New.Format := ifX8R8G8B8;
139 >        end;
140 >      ifX8R8G8B8: new_storetype := 8;
141 >      ifDXT1: new_storetype := 9;
142 >    else
143 >      if OniImage_New.FormatInfo.HasAlphaChannel then
144 >        ShowMessage('Loaded image has an alpha-channel.' + #13#10 +
145 >                    'Because the format is neither ARGB1555' +#13#10 +
146 >                    'nor ARGB4444 it can not be imported without conversion.' + #13#10 +
147 >                    'It is converted to RGB888, so alpha gets dropped.' + #13#10 +
148 >                    'If you need alpha you have to save your image in' + #13#10 +
149 >                    'one of the previously named formats.');  
150 >      OniImage_New.Format := ifX8R8G8B8;
151 >      new_storetype := 8;
152 >    end;
153 >
154 >    OniImage_New.SaveDataToStream(check_fading.Checked, TStream(mem));
155 >
156 >    newsize := mem.Size;
157 >    mem.Seek(0, soFromBeginning);
158 >
159 >    if (newsize > old_size) and (ConManager.Connection[ConnectionID].Backend = DB_ONI) then
160 >      new_rawaddr := ConManager.Connection[ConnectionID].AppendRawFile(
161 >        not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN), mem)
162      else
163      begin
164        new_rawaddr := old_rawaddr;
165 <      Connection.UpdateRawFile(fileid, $9C, Length(tempd), tempd);
165 >      ConManager.Connection[ConnectionID].UpdateRawFile(fileid, $9C, mem);
166      end;
167  
149    datbyte := $00;
168      if check_fading.Checked then
169 <      datbyte := datbyte or $01;
170 <    Connection.UpdateDatFilePart(fileid, $88, 1, @datbyte);
169 >      oldfading := oldfading or $01
170 >    else
171 >      oldfading := oldfading and (not Byte($01));
172 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $88, 1, @datbyte);
173      datbyte := $10;
174 <    if check_transparency.Checked then
175 <      datbyte := datbyte or $04;
176 <    Connection.UpdateDatFilePart(fileid, $89, 1, @datbyte);
177 <    Connection.UpdateDatFilePart(fileid, $8C, 2, @OniImage_New.Width);
178 <    Connection.UpdateDatFilePart(fileid, $8E, 2, @OniImage_New.Height);
179 <    datbyte := $08;
180 <    Connection.UpdateDatFilePart(fileid, $90, 1, @datbyte);
181 <    if Connection.OSisMac then
182 <      Connection.UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
174 > //    if check_transparency.Checked then
175 > //      datbyte := datbyte or $04;
176 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $89, 1, @datbyte);
177 >    datbyte := OniImage_New.Width[1];
178 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8C, 2, @datbyte);
179 >    datbyte := OniImage_New.Height[1];
180 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8E, 2, @datbyte);
181 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $90, 1, @new_storetype);
182 >    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
183 >      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
184      else
185 <      Connection.UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
185 >      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
186  
187      ShowMessage('TXMP-image replaced');
188 +    Self.listClick(Self);
189    end;
190   end;
191  
# Line 187 | Line 209 | begin
209    OniImage_New := TOniImage.Create;
210    Self.AllowedExts := 'TXMP';
211    Self.OnNewFileSelected := SelectFile;
212 +  opend.Filter := saved.Filter;
213   end;
214  
215  
# Line 195 | Line 218 | end;
218   procedure TForm_TxmpReplace.btn_saveClick(Sender: TObject);
219   begin
220    if saved.Execute then
221 <    OniImage_Old.WriteToBMP(saved.FileName);
221 >    OniImage_Old.WriteToFile(saved.FileName);
222   end;
223  
224   begin

Diff Legend

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