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 192 by alloc, Thu May 24 17:48:18 2007 UTC

# Line 40 | Line 40 | var
40  
41   implementation
42   {$R *.dfm}
43 < uses Main, ConnectionManager;
43 > uses Main, ConnectionManager, ImagingTypes;
44  
45  
46  
47   procedure TForm_TxmpReplace.SelectFile(fileinfo: TFileInfo);
48   var
49  Data: TByteData;
49    mem:  TMemoryStream;
50    fadingbyte, depthbyte, storebyte: Byte;
51   begin
52    fileid := fileinfo.ID;
53 <  Connection.LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
54 <  Connection.LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
55 <  Connection.LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
56 <  check_fading.Checked := (fadingbyte and $01) > 0;
57 <  check_transparency.Checked := (depthbyte and $04) > 0;
58 <
59 <  OniImage_Old.LoadFromTXMP(connection, fileid);
60 <  old_size := OniImage_Old.GetImageDataSize((fadingbyte and $01) > 0);
61 <  Data := OniImage_Old.GetAsBMP;
62 <  mem  := TMemoryStream.Create;
63 <  mem.Write(Data[0], Length(Data));
65 <  mem.Seek(0, soFromBeginning);
66 <  image_txmppreview.Picture.Bitmap.LoadFromStream(mem);
67 <  mem.Free;
53 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(fadingbyte), @fadingbyte);
54 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $89, SizeOf(depthbyte), @depthbyte);
55 >  ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(storebyte), @storebyte);
56 >
57 >  OniImage_Old.LoadFromTXMP(ConnectionID, fileid);
58 >  old_size := OniImage_Old.GetImageSize(True);
59 >  OniImage_Old.DrawOnCanvas(image_txmppreview.Canvas, 0);
60 >
61 >  check_fading.Checked := OniImage_Old.HasMipMaps;
62 > //  check_transparency.Checked := (depthbyte and $04) > 0;
63 >  check_transparency.Checked := storebyte in [0, 2, 7];
64  
65    group_bmpselect.Enabled := True;
66   end;
# Line 73 | Line 69 | end;
69   procedure TForm_TxmpReplace.btn_loadClick(Sender: TObject);
70   var
71    mem:   TMemoryStream;
76  tempd: Tdata;
72   begin
73    if opend.Execute then
74    begin
75 <    OniImage_New.LoadFromBMP(opend.FileName);
76 <    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;
75 >    OniImage_New.LoadFromFile(opend.FileName);
76 >    OniImage_New.DrawOnCanvas(image_bmppreview.Canvas, 0);
77      group_options.Enabled := True;
78    end;
79   end;
# Line 93 | Line 83 | end;
83  
84   procedure TForm_TxmpReplace.btn_replaceClick(Sender: TObject);
85   var
86 <  newsize: LongWord;
87 <  old_rawaddr, new_rawaddr: LongWord;
86 >  newsize: Integer;
87 >  old_rawaddr, new_rawaddr: Integer;
88    oldfading: Byte;
99  tempd:     Tdata;
100
89    datbyte: Word;
90 +  mem: TMemoryStream;
91   begin
92    if filelist.ItemIndex >= 0 then
93    begin
94 <    Connection.LoadDatFilePart(fileid, $88, 1, @oldfading);
95 <    if Connection.OSisMac then
96 <      Connection.UpdateDatFilePart(fileid, $A0, 4, @old_rawaddr)
94 >    ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, 1, @oldfading);
95 >    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
96 >      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, 4, @old_rawaddr)
97      else
98 <      Connection.LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
98 >      ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, 4, @old_rawaddr);
99  
100 <    if (OniImage_Old.Width <> OniImage_New.Width) or
101 <      (OniImage_Old.Height <> OniImage_New.Height) then
100 >    if (OniImage_Old.Width[1] <> OniImage_New.Width[1]) or
101 >      (OniImage_Old.Height[1] <> OniImage_New.Height[1]) then
102      begin
103 <      if MessageBox(Self.Handle, PChar(
104 <        'Current image and new image have different size' + CrLf +
105 <        '(Current: ' + IntToStr(OniImage_Old.Width) +
106 <        'x' + IntToStr(OniImage_Old.Height) + ' - New: ' +
107 <        IntToStr(OniImage_New.Width) + 'x' + IntToStr(OniImage_New.Height) + ')' + CrLf +
108 <        'Replace anyways?'),
109 <        PChar(filelist.Items.Strings[filelist.ItemIndex]),
110 <        MB_YESNO) = idNo then
103 >      if MessageBox(Self.Handle,
104 >            PChar(
105 >              'Current image and new image have different size' + CrLf +
106 >              '(Current: ' + IntToStr(OniImage_Old.Width[1]) + 'x' +
107 >              IntToStr(OniImage_Old.Height[1]) + ' - New: ' +
108 >              IntToStr(OniImage_New.Width[1]) + 'x' +
109 >              IntToStr(OniImage_New.Height[1]) +
110 >              ')' + CrLf + 'Replace anyway?'),
111 >            PChar(filelist.Items.Strings[filelist.ItemIndex]), MB_YESNO) = idNo then
112          Exit;
113      end;
114  
115 <    if check_fading.Checked then
116 <      if not OniImage_New.GetMipMappedImage(tempd) then
117 <        if MessageBox(Self.Handle,
118 <          PChar('Can not create a MipMapped-image (probably because of a wrong dimension).' +
119 <          #13 + #10 + 'Do you want to continue without MipMapping?'), PChar('Warning'),
120 <          MB_YESNO) = ID_YES then
121 <          check_fading.Checked := False
122 <        else
123 <          Exit;
124 <
125 <    if not check_fading.Checked then
136 <      tempd := OniImage_New.GetAsData;
137 <
138 <    newsize := OniImage_New.GetImageDataSize(check_fading.Checked);
139 <
140 <    if (newsize > old_size) and (Connection.Backend = ODB_Dat) then
141 <      new_rawaddr := Connection.AppendRawFile(
142 <        Connection.OSisMac, Length(tempd), tempd)
115 >    mem := TMemoryStream.Create;
116 >
117 >    OniImage_New.SaveDataToStream(check_fading.Checked, TStream(mem));
118 >
119 >    newsize := mem.Size;
120 >    mem.Seek(0, soFromBeginning);
121 >
122 >    if (newsize > old_size) and (ConManager.Connection[ConnectionID].Backend = DB_ONI) then
123 >      new_rawaddr := ConManager.Connection[ConnectionID].AppendRawFile(
124 >        not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN),
125 >        mem.Size, mem)
126      else
127      begin
128        new_rawaddr := old_rawaddr;
129 <      Connection.UpdateRawFile(fileid, $9C, Length(tempd), tempd);
129 >      ConManager.Connection[ConnectionID].UpdateRawFile(fileid, $9C, mem);
130      end;
131  
132      datbyte := $00;
133      if check_fading.Checked then
134        datbyte := datbyte or $01;
135 <    Connection.UpdateDatFilePart(fileid, $88, 1, @datbyte);
135 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $88, 1, @datbyte);
136      datbyte := $10;
137 <    if check_transparency.Checked then
138 <      datbyte := datbyte or $04;
139 <    Connection.UpdateDatFilePart(fileid, $89, 1, @datbyte);
140 <    Connection.UpdateDatFilePart(fileid, $8C, 2, @OniImage_New.Width);
141 <    Connection.UpdateDatFilePart(fileid, $8E, 2, @OniImage_New.Height);
142 <    datbyte := $08;
143 <    Connection.UpdateDatFilePart(fileid, $90, 1, @datbyte);
144 <    if Connection.OSisMac then
145 <      Connection.UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
137 > //    if check_transparency.Checked then
138 > //      datbyte := datbyte or $04;
139 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $89, 1, @datbyte);
140 >    datbyte := OniImage_New.Width[1];
141 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8C, 2, @datbyte);
142 >    datbyte := OniImage_New.Height[1];
143 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $8E, 2, @datbyte);
144 >    case OniImage_New.Format of
145 >      ifA1R5G5B5: datbyte := 2;
146 >      ifA4R4G4B4: datbyte := 0;
147 >      ifA8R8G8B8:
148 >        begin
149 >          datbyte := 8;
150 >          OniImage_New.Format := ifX8R8G8B8;
151 >        end;
152 >      ifX8R8G8B8: datbyte := 8;
153 >      ifDXT1: datbyte := 9;
154 >    else
155 >      OniImage_New.Format := ifX8R8G8B8;
156 >      datbyte := 8;
157 >    end;
158 >    ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $90, 1, @datbyte);
159 >    if not (ConManager.Connection[ConnectionID].DataOS = DOS_WIN) then
160 >      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $A0, 4, @new_rawaddr)
161      else
162 <      Connection.UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
162 >      ConManager.Connection[ConnectionID].UpdateDatFilePart(fileid, $9C, 4, @new_rawaddr);
163  
164      ShowMessage('TXMP-image replaced');
165    end;
# Line 187 | Line 185 | begin
185    OniImage_New := TOniImage.Create;
186    Self.AllowedExts := 'TXMP';
187    Self.OnNewFileSelected := SelectFile;
188 +  opend.Filter := saved.Filter;
189   end;
190  
191  
# Line 195 | Line 194 | end;
194   procedure TForm_TxmpReplace.btn_saveClick(Sender: TObject);
195   begin
196    if saved.Execute then
197 <    OniImage_Old.WriteToBMP(saved.FileName);
197 >    OniImage_Old.WriteToFile(saved.FileName);
198   end;
199  
200   begin

Diff Legend

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