ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Global/OniImgClass.pas

Comparing oup/current/Global/OniImgClass.pas (file contents):
Revision 127 by alloc, Fri Mar 23 17:14:40 2007 UTC vs.
Revision 198 by alloc, Sat May 26 19:28:08 2007 UTC

#	Line 2 | Line 2 | unit OniImgClass;
2
3		interface
4
5	<	uses Math, Dialogs, Types, SysUtils, Classes, Data, ConnectionManager, TypeDefs;
5	>	uses Math, Dialogs, Types, SysUtils, Classes, Data, ConnectionManager, TypeDefs,
6	>	Imaging, ImagingTypes, Graphics;
7
7	–	type
8	–	TImgDataType = set of (DT_OniReverted, DT_Oni, DT_Decoded32);
8
9		type
10		TOniImage = class
11		private
12	<	FLoaded:    Boolean;
13	<	FDataType:  TImgDataType;
14	<	FData:      TByteData;
15	<	FWidth, FHeight: Word;
16	<	FDepth:     Byte;
17	<	FStoreType: Byte;
18	<
19	<	function ResizeImage(oldx, oldy: Integer; img: TByteData): TByteData;
21	<	procedure RevertImage;
22	<	procedure DecompressImage;
12	>	FImages: TDynImageDataArray;
13	>	function GetImage(MipGen: Integer): TImageData;
14	>	function GetWidth(MipGen: Integer): Integer;
15	>	function GetHeight(MipGen: Integer): Integer;
16	>	function GetImageFormat: TImageFormat;
17	>	procedure SetImageFormat(Format: TImageFormat);
18	>	function pGetImageFormatInfo: TImageFormatInfo;
19	>	function GetHasMipMaps: Boolean;
20		protected
21		public
22	<	property Loaded:    Boolean      Read FLoaded    Write FLoaded;
23	<	property DataType:  TImgDataType Read FDataType  Write FDataType;
24	<	property Width:     Word         Read FWidth     Write FWidth;
25	<	property Height:    Word         Read FHeight    Write FHeight;
26	<	property Depth:     Byte         Read FDepth     Write FDepth;
27	<	property StoreType: Byte         Read FStoreType Write FStoreType;
28	<	property Data:      TByteData    Read FData      Write FData;
22	>	property Images: TDynImageDataArray         read FImages;
23	>	property Image[MipGen: Integer]: TImageData read GetImage;
24	>	property Width[MipGen: Integer]: Integer    read GetWidth;
25	>	property Height[MipGen: Integer]: Integer   read GetHeight;
26	>	property Format: TImageFormat read GetImageFormat write SetImageFormat;
27	>	property FormatInfo: TImageFormatInfo read pGetImageFormatInfo;
28	>	property HasMipMaps: Boolean read GetHasMipMaps;
29
30		constructor Create;
31	+	procedure Free;
32		function Load(ConnectionID, FileID: Integer): Boolean;
33		function LoadFromPSpc(ConnectionID, FileID: Integer): Boolean;
34		function LoadFromTXMP(ConnectionID, FileID: Integer): Boolean;
35		function LoadFromTXMB(ConnectionID, FileID: Integer): Boolean;
38	–	function GetImageDataSize(fading: Boolean): Integer;
36
37	<	procedure DecodeImageTo32bit;
37	>	procedure SaveDataToStream(MipMaps: Boolean; var Target: TStream);
38	>
39	>	function LoadFromFile(filename: String): Boolean;
40	>	function WriteToFile(filename: String): Boolean;
41
42	<	procedure GetAsData(var Target: TStream); overload;
43	<	procedure GetAsData(var Target: TByteData); overload;
44	<	procedure GetAs32bit(var Target: TStream); overload;
45	<	procedure GetAs32bit(var Target: TByteData); overload;
46	<	procedure GetAsBMP(var Target: TStream); overload;
47	<	procedure GetAsBMP(var Target: TByteData); overload;
48	<	function LoadFromBMP(filename: String): Boolean;
49	<	function WriteToBMP(filename: String): Boolean;
50	<	function GetMipMappedImage(var Target: TStream): Boolean; overload;
51	<	function GetMipMappedImage(var Target: TByteData): Boolean; overload;
42	>	procedure DrawOnCanvas(Canvas: TCanvas; Index: Integer);
43	>	function GetImageSize(MipMaps: Boolean): Integer;
44		published
45		end;
46
47
48		implementation
49
50	<	//uses Functions;
50	>	uses Img_DDSTypes, ImagingComponents;
51
52
53	+	procedure TOniImage.DrawOnCanvas(Canvas: TCanvas; Index: Integer);
54	+	var
55	+	singleimg: TImageData;
56	+	rect: TRect;
57	+	begin
58	+	InitImage(singleimg);
59	+	CloneImage(FImages[Index-1], singleimg);
60	+	ConvertImage(singleimg, ifX8R8G8B8);
61	+	rect.Left := 0;
62	+	rect.Top := 0;
63	+	rect.Right := singleimg.Width - 1;
64	+	rect.Bottom := singleimg.Height - 1;
65	+	Canvas.Brush.Color := $C8D0D4;
66	+	Canvas.FillRect(Canvas.ClipRect);
67	+	DisplayImageData(Canvas, rect, singleimg, rect);
68	+	FreeImage(singleimg);
69	+	end;
70	+
71
72
73		constructor TOniImage.Create;
74		begin
65	–	Self.FLoaded   := False;
66	–	Self.FDataType := [];
67	–	SetLength(Self.FData, 0);
68	–	Self.FWidth     := 0;
69	–	Self.FHeight    := 0;
70	–	Self.FDepth     := 0;
71	–	Self.FStoreType := 0;
75		end;
76
77
78
79	+	procedure TOniImage.Free;
80	+	begin
81	+	FreeImagesInArray(FImages);
82	+	end;
83
84	<	function TOniImage.ResizeImage(oldx, oldy: Integer; img: TByteData): TByteData;
85	<	var
86	<	i, j: Integer;
87	<	col, row, row_orig: Integer;
84	>
85	>
86	>
87	>	function TOniImage.GetImage(MipGen: Integer): TImageData;
88		begin
89	<	SetLength(Result, (oldx div 2) * (oldy div 2) * (Self.FDepth div 8));
83	<	row_orig := 0;
84	<	row      := 0;
85	<	col      := 0;
86	<	for i := 0 to (oldx * oldy) - 1 do
89	>	if MipGen <= Length(FImages) then
90		begin
91	<	if ((i mod oldx) = 0) and (i > 0) then
92	<	begin
90	<	Inc(row_orig);
91	<	if (row_orig mod 2) = 0 then
92	<	begin
93	<	Inc(row);
94	<	col := 0;
95	<	end;
96	<	end;
97	<	if (row_orig mod 2) = 0 then
98	<	begin
99	<	if (i mod 2) = 0 then
100	<	begin
101	<	for j := 0 to (Self.FDepth div 8) - 1 do
102	<	Result[((row * (oldx div 2)) + col) * (Self.FDepth div 8) + j] :=
103	<	img[(i * (Self.FDepth div 8)) + j];
104	<	Inc(col);
105	<	end;
106	<	end;
91	>	InitImage(Result);
92	>	CloneImage(FImages[MipGen-1], Result);
93		end;
94		end;
95
96
97
98	<
113	<	procedure TOniImage.RevertImage;
114	<	var
115	<	x, y, i: Integer;
116	<	tempd:   TByteData;
98	>	function TOniImage.GetWidth(MipGen: Integer): Integer;
99		begin
100	<	SetLength(tempd, Self.FWidth * Self.FHeight * (Self.FDepth div 8));
101	<	for y := 0 to Self.FHeight - 1 do
120	<	for x := 0 to Self.FWidth - 1 do
121	<	for i := 0 to (Self.FDepth div 8) - 1 do
122	<	tempd[((Self.FWidth * (Self.FHeight - 1 - y) + x) * (Self.FDepth div 8)) + i] :=
123	<	Self.FData[(Self.FWidth * y + x) * (Self.FDepth div 8) + i];
124	<	for x := 0 to High(tempd) do
125	<	Self.FData[x] := tempd[x];
126	<	if DT_OniReverted in Self.FDataType then
127	<	Self.FDataType := Self.FDataType - [DT_OniReverted]
100	>	if MipGen <= Length(FImages) then
101	>	Result := FImages[MipGen-1].Width
102		else
103	<	Self.FDataType := Self.FDataType + [DT_OniReverted];
103	>	Result := -1;
104		end;
105
106
107	<
134	<
135	<	procedure TOniImage.DecodeImageTo32bit;
136	<	var
137	<	x, y:  Integer;
138	<	tempd: TByteData;
107	>	function TOniImage.GetHeight(MipGen: Integer): Integer;
108		begin
109	<	if not (DT_Decoded32 in Self.FDataType) then
110	<	begin
111	<	SetLength(tempd, Self.FWidth * Self.FHeight * 4);
112	<	case Self.FStoreType of
144	<	0: // 16bit, RGB444, A4?
145	<	begin
146	<	for y := 0 to Self.FHeight - 1 do
147	<	begin
148	<	for x := 0 to Self.FWidth - 1 do
149	<	begin
150	<	tempd[((Self.FWidth * y + x) * 4) + 0] :=
151	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
152	<	$000F) / $000F * 255);
153	<	tempd[((Self.FWidth * y + x) * 4) + 1] :=
154	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
155	<	$00F0) / $00F0 * 255);
156	<	tempd[((Self.FWidth * y + x) * 4) + 2] :=
157	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
158	<	$0F00) / $0F00 * 255);
159	<	tempd[((Self.FWidth * y + x) * 4) + 3] := 0;
160	<	end;
161	<	end;
162	<	end;
163	<	1, 2: // 16bit, RGB555, A1?
164	<	begin
165	<	for y := 0 to Self.FHeight - 1 do
166	<	begin
167	<	for x := 0 to Self.FWidth - 1 do
168	<	begin
169	<	tempd[((Self.FWidth * y + x) * 4) + 0] :=
170	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
171	<	$001F) / $001F * 255);
172	<	tempd[((Self.FWidth * y + x) * 4) + 1] :=
173	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
174	<	$03E0) / $03E0 * 255);
175	<	tempd[((Self.FWidth * y + x) * 4) + 2] :=
176	<	Round(((Self.FData[(Self.FWidth * y + x) * 2] + Self.FData[(Self.FWidth * y + x) * 2 + 1] * 256) and
177	<	$7C00) / $7C00 * 255);
178	<	tempd[((Self.FWidth * y + x) * 4) + 3] := 0;
179	<	end;
180	<	end;
181	<	end;
182	<	8: // 32bit, RGB888, A8?
183	<	begin end;
184	<	9: // Compressed, RGB565
185	<	begin
186	<	DecompressImage;
187	<	end;
188	<	end;
189	<	Self.FDepth := 32;
190	<	if (Self.FStoreType <> 9) and (Self.FStoreType <> 8) then
191	<	begin
192	<	SetLength(Self.FData, Length(tempd));
193	<	for x := 0 to High(tempd) do
194	<	Self.FData[x] := tempd[x];
195	<	end;
196	<	Self.FStoreType := 8;
197	<	if DT_Oni in Self.FDataType then
198	<	Self.FDataType := Self.FDataType - [DT_Oni];
199	<	Self.FDataType := Self.FDataType + [DT_Decoded32];
200	<	end;
201	<	if DT_OniReverted in Self.FDataType then
202	<	Self.RevertImage;
109	>	if MipGen <= Length(FImages) then
110	>	Result := FImages[MipGen-1].Height
111	>	else
112	>	Result := -1;
113		end;
114
115
116	+	function TOniImage.GetImageFormat: TImageFormat;
117	+	begin
118	+	if Length(FImages) > 0 then
119	+	Result := FImages[0].Format
120	+	else
121	+	Result := ifUnknown;
122	+	end;
123
124	<
208	<	procedure TOniImage.DecompressImage;
209	<	type
210	<	Tcolor = record
211	<	RGBb: Byte;
212	<	RGBg: Byte;
213	<	RGBr: Byte;
214	<	RGBa: Byte;
215	<	end;
124	>	procedure TOniImage.SetImageFormat(Format: TImageFormat);
125		var
126	<	i, j, x, y: Integer;
218	<	color:      array[1..4] of Tcolor;
219	<	pixel:      array[1..16] of Byte;
220	<	tempd:      TByteData;
126	>	i: Integer;
127		begin
128	<	x := 0;
129	<	y := 0;
130	<	SetLength(tempd, Self.FWidth * Self.FHeight * 4);
225	<	for i := 0 to ((Self.FWidth * Self.FHeight) div 16) - 1 do
226	<	begin
227	<	Color[1].RGBb := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $001F) /
228	<	$001F * 255);
229	<	Color[1].RGBg := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $07E0) /
230	<	$07E0 * 255);
231	<	Color[1].RGBr := Round(((Self.FData[(i * 8) + 0] + Self.FData[(i * 8) + 1] * 256) and $F800) /
232	<	$F800 * 255);
233	<	Color[1].RGBa := 255;
234	<	Color[2].RGBb := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $001F) /
235	<	$001F * 255);
236	<	Color[2].RGBg := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $07E0) /
237	<	$07E0 * 255);
238	<	Color[2].RGBr := Round(((Self.FData[(i * 8) + 2] + Self.FData[(i * 8) + 3] * 256) and $F800) /
239	<	$F800 * 255);
240	<	Color[2].RGBa := 255;
241	<	Color[3].RGBb := Round(Color[1].RGBb / 3 * 2 + Color[2].RGBb / 3);
242	<	Color[3].RGBg := Round(Color[1].RGBg / 3 * 2 + Color[2].RGBg / 3);
243	<	Color[3].RGBr := Round(Color[1].RGBr / 3 * 2 + Color[2].RGBr / 3);
244	<	Color[3].RGBa := 255;
245	<	Color[4].RGBb := Round(Color[1].RGBb / 3 + Color[2].RGBb / 3 * 2);
246	<	Color[4].RGBg := Round(Color[1].RGBg / 3 + Color[2].RGBg / 3 * 2);
247	<	Color[4].RGBr := Round(Color[1].RGBr / 3 + Color[2].RGBr / 3 * 2);
248	<	Color[4].RGBa := 255;
249	<	Pixel[1]      := Round((Self.FData[(i * 8) + 4] and $C0) / $40 + 1);
250	<	Pixel[2]      := Round((Self.FData[(i * 8) + 4] and $30) / $10 + 1);
251	<	Pixel[3]      := Round((Self.FData[(i * 8) + 4] and $0C) / $04 + 1);
252	<	Pixel[4]      := Round((Self.FData[(i * 8) + 4] and $03) + 1);
253	<	Pixel[5]      := Round((Self.FData[(i * 8) + 5] and $C0) / $40 + 1);
254	<	Pixel[6]      := Round((Self.FData[(i * 8) + 5] and $30) / $10 + 1);
255	<	Pixel[7]      := Round((Self.FData[(i * 8) + 5] and $0C) / $04 + 1);
256	<	Pixel[8]      := Round((Self.FData[(i * 8) + 5] and $03) + 1);
257	<	Pixel[9]      := Round((Self.FData[(i * 8) + 6] and $C0) / $40 + 1);
258	<	Pixel[10]     := Round((Self.FData[(i * 8) + 6] and $30) / $10 + 1);
259	<	Pixel[11]     := Round((Self.FData[(i * 8) + 6] and $0C) / $04 + 1);
260	<	Pixel[12]     := Round((Self.FData[(i * 8) + 6] and $03) + 1);
261	<	Pixel[13]     := Round((Self.FData[(i * 8) + 7] and $C0) / $40 + 1);
262	<	Pixel[14]     := Round((Self.FData[(i * 8) + 7] and $30) / $10 + 1);
263	<	Pixel[15]     := Round((Self.FData[(i * 8) + 7] and $0C) / $04 + 1);
264	<	Pixel[16]     := Round((Self.FData[(i * 8) + 7] and $03) + 1);
265	<	for j := 0 to 3 do
266	<	begin
267	<	tempd[((y + 3) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[16 - j]].RGBb;
268	<	tempd[((y + 3) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[16 - j]].RGBg;
269	<	tempd[((y + 3) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[16 - j]].RGBr;
270	<	tempd[((y + 3) * Self.FWidth + x + j) * 4 + 3] := 0;
271	<	end;
272	<	for j := 0 to 3 do
273	<	begin
274	<	tempd[((y + 2) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[12 - j]].RGBb;
275	<	tempd[((y + 2) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[12 - j]].RGBg;
276	<	tempd[((y + 2) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[12 - j]].RGBr;
277	<	tempd[((y + 2) * Self.FWidth + x + j) * 4 + 3] := 0;
278	<	end;
279	<	for j := 0 to 3 do
280	<	begin
281	<	tempd[((y + 1) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[8 - j]].RGBb;
282	<	tempd[((y + 1) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[8 - j]].RGBg;
283	<	tempd[((y + 1) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[8 - j]].RGBr;
284	<	tempd[((y + 1) * Self.FWidth + x + j) * 4 + 3] := 0;
285	<	end;
286	<	for j := 0 to 3 do
287	<	begin
288	<	tempd[((y + 0) * Self.FWidth + x + j) * 4 + 0] := Color[Pixel[4 - j]].RGBb;
289	<	tempd[((y + 0) * Self.FWidth + x + j) * 4 + 1] := Color[Pixel[4 - j]].RGBg;
290	<	tempd[((y + 0) * Self.FWidth + x + j) * 4 + 2] := Color[Pixel[4 - j]].RGBr;
291	<	tempd[((y + 0) * Self.FWidth + x + j) * 4 + 3] := 0;
292	<	end;
293	<	x := x + 4;
294	<	if x = Self.FWidth then
295	<	begin
296	<	y := y + 4;
297	<	x := 0;
298	<	end;
299	<	end;
300	<	SetLength(Self.FData, Length(tempd));
301	<	for i := 0 to High(tempd) do
302	<	Self.FData[i] := tempd[i];
303	<	Self.FStoreType := 8;
304	<	Self.FDepth    := 32;
305	<	Self.FDataType := Self.FDataType - [DT_Oni] + [DT_Decoded32];
128	>	if Length(FImages) > 0 then
129	>	for i := 0 to High(FImages) do
130	>	ConvertImage(FImages[i], Format);
131		end;
132
133
134	+	function TOniImage.pGetImageFormatInfo: TImageFormatInfo;
135	+	begin
136	+	if Length(FImages) > 0 then
137	+	GetImageFormatInfo(FImages[0].Format, Result);
138	+	end;
139	+
140
141	+	function TOniImage.GetHasMipMaps: Boolean;
142	+	begin
143	+	Result := Length(FImages) > 1;
144	+	end;
145
146
147		function TOniImage.Load(ConnectionID, FileID: Integer): Boolean;
#	Line 343 | Line 178 | type
178		x_txmp, y_txmp: Word;
179		x_pspc, y_pspc: Word;
180		w, h:    Word;
181	<	imgdata: TByteData;
181	>	imgdata: TImageData;
182		used:    Boolean;
183		end;
184		const
185		PartMatch: array[0..8] of Byte = (0, 3, 6, 1, 4, 7, 2, 5, 8);
186	+	stretch_x: Integer = 50;
187	+	stretch_y: Integer = 1;
188		var
189	<	x, y, pixel: Word;
189	>	x, y: Word;
190		i: Integer;
191
192		PSpc:     TPSpc;
193		txmpimg:  TOniImage;
194	<	txmpdata: TByteData;
194	>	//  txmpdata: TByteData;
195
196		parts:    array[0..8] of TPart;
197		part:     Byte;
198		cols:     array[0..2] of Word;
199		rows:     array[0..2] of Word;
200		col, row: Byte;
201	+
202	+	pspcimage: TImageData;
203		begin
204		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $08, SizeOf(PSpc), @PSpc);
205		PSpc.TXMP := PSpc.TXMP div 256;
#	Line 370 | Line 209 | begin
209		Exit;
210		end;
211		txmpimg := TOniImage.Create;
212	<	txmpimg.LoadFromTXMP(ConnectionID, PSpc.TXMP);
213	<	txmpimg.DecodeImageTo32bit;
214	<	//  txmpimg.WriteToBMP('C:\file.bmp');
215	<	txmpimg.GetAs32bit(txmpdata);
216	<	{    ShowMessage(IntToStr(txmpimg.Width)+'x'+IntToStr(txmpimg.Height));
378	<	for i:=0 to High(txmpdata) do
379	<	txmpimg.Data[i]:=txmpdata[i];
380	<	txmpimg.WriteToBMP('D:\file2.bmp');
381	<	}
382	<	with PSpc do
212	>	txmpimg.Load(ConnectionID, PSpc.TXMP);
213	>	CloneImage(txmpimg.Image[1], pspcimage);
214	>	txmpimg.Free;
215	>
216	>	with pspc do
217		begin
218		for i := 0 to 2 do
219		begin
#	Line 408 | Line 242 | begin
242		parts[part].used := True;
243		cols[col] := parts[part].w;
244		rows[row] := parts[part].h;
245	<	SetLength(parts[part].imgdata, parts[part].w * parts[part].h * 4);
246	<	for y := 0 to parts[part].h - 1 do
247	<	begin
248	<	for x := 0 to parts[part].w - 1 do
249	<	begin
250	<	for pixel := 0 to 3 do
417	<	begin
418	<	parts[part].imgdata[(y * parts[part].w + x) * 4 + pixel] :=
419	<	txmpdata[((parts[part].y_txmp + y) * txmpimg.Width +
420	<	parts[part].x_txmp + x) * 4 + pixel];
421	<	end;
422	<	end;
423	<	end;
245	>
246	>	NewImage(parts[part].w, parts[part].h, pspcimage.Format, parts[part].imgdata);
247	>
248	>	CopyRect(pspcimage,
249	>	parts[part].x_txmp, parts[part].y_txmp, parts[part].w, parts[part].h,
250	>	parts[part].imgdata, 0, 0);
251		end
252		else
253		begin
#	Line 430 | Line 257 | begin
257
258		end;
259
433	–	txmpimg.Free;
434	–	txmpimg := TOniImage.Create;
260		for i := 0 to 8 do
261		begin
262		if parts[i].used then
263		begin
264	<	SetLength(txmpimg.FData, Length(parts[i].imgdata));
440	<	for pixel := 0 to High(parts[i].imgdata) do
441	<	txmpimg.Data[pixel] := parts[i].imgdata[pixel];
442	<	txmpimg.Width := parts[i].w;
443	<	txmpimg.Height    := parts[i].h;
444	<	txmpimg.StoreType := 8;
445	<	txmpimg.DataType  := [DT_Decoded32];
446	<	txmpimg.Depth     := 32;
447	<	txmpimg.WriteToBMP('M:\' + IntToStr(i) + '.bmp');
264	>	//      SaveImageToFile('M:\' + IntToStr(i) + '.bmp', parts[i].imgdata);
265		end;
266		end;
450	–	txmpimg.Free;
267
268	<	Self.FWidth  := 0;
269	<	Self.FHeight := 0;
270	<	for i := 0 to 2 do
268	>	SetLength(FImages, 1);
269	>	x := cols[0] + cols[1] * stretch_x + cols[2];
270	>	y := rows[0] + rows[1] * stretch_y + rows[2];
271	>
272	>	NewImage(x, y, pspcimage.Format, FImages[0]);
273	>
274	>	x := 0;
275	>	for col := 0 to 2 do
276		begin
277	<	Inc(Self.FWidth, cols[i]);
278	<	Inc(Self.FHeight, rows[i]);
277	>	y := 0;
278	>	for row := 0 to 2 do
279	>	begin
280	>	part := row*3 + col;
281	>	if (row = 1) and (col = 1) then
282	>	StretchRect(parts[part].imgdata, 0, 0, parts[part].w, parts[part].h,
283	>	FImages[0], x, y, parts[part].w * stretch_x, parts[part].h * stretch_y, rfNearest)
284	>	else
285	>	if (row = 1) then
286	>	StretchRect(parts[part].imgdata, 0, 0, parts[part].w, parts[part].h,
287	>	FImages[0], x, y, parts[part].w, parts[part].h * stretch_y, rfNearest)
288	>	else
289	>	if (col = 1) then
290	>	StretchRect(parts[part].imgdata, 0, 0, parts[part].w, parts[part].h,
291	>	FImages[0], x, y, parts[part].w * stretch_x, parts[part].h, rfNearest)
292	>	else
293	>	CopyRect(parts[part].imgdata, 0, 0, parts[part].w, parts[part].h,
294	>	FImages[0], x, y );
295	>	if row = 1 then
296	>	y := y + parts[part].h * stretch_y
297	>	else
298	>	y := y + parts[part].h;
299	>	end;
300	>	if (part mod 3) = 1 then
301	>	x := x + parts[part].w * stretch_x
302	>	else
303	>	x := x + parts[part].w;
304		end;
459	–	SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
460	–
461	–	//Combine data parts
305
306	<	Self.FDepth     := 32;
307	<	Self.FStoreType := 8;
308	<	Self.FDataType  := [DT_Decoded32];
309	<	//    Self.RevertImage;
306	>	FreeImage(pspcimage);
307	>	for i := 0 to 8 do
308	>	if parts[i].used then
309	>	FreeImage(parts[i].imgdata);
310		end;
311
312
#	Line 472 | Line 315 | end;
315		function TOniImage.LoadFromTXMP(ConnectionID, FileID: Integer): Boolean;
316		var
317		img_addr: Integer;
318	+	data: TMemoryStream;
319	+	hdr: TDDSDXTHeader;
320	+	imginfo: Integer;
321	+	x,y, i: Integer;
322	+
323	+	_width, _height: Word;
324	+	_storetype: Byte;
325	+	_depth: Byte;
326		begin
327		Result := True;
328	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(Self.FWidth), @Self.FWidth);
329	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(Self.FHeight), @Self.FHeight);
330	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(Self.FStoreType),
331	<	@Self.FStoreType);
328	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8C, SizeOf(_width), @_width);
329	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $8E, SizeOf(_height), @_height);
330	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $90, SizeOf(_storetype), @_storetype);
331	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $88, SizeOf(imginfo), @imginfo);
332		if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
333		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $9C, SizeOf(img_addr), @img_addr)
334		else
335		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $A0, SizeOf(img_addr), @img_addr);
336
337	<	case Self.FStoreType of
337	>	case _storetype of
338		0, 1, 2:
339	<	begin
340	<	SetLength(Self.FData, Self.FWidth * Self.FHeight * 2);
341	<	Self.FDepth := 16;
491	<	end;
492	<	8:
493	<	begin
494	<	SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
495	<	Self.FDepth := 32;
496	<	end;
339	>	_depth := 16;
340	>	7, 8:
341	>	_depth := 32;
342		9:
343	<	begin
499	<	SetLength(Self.FData, Self.FWidth * Self.FHeight div 2);
500	<	Self.FDepth := 16;
501	<	end;
343	>	_depth := 16;
344		else
345		Result := False;
346		Exit;
347		end;
348
349	+	with hdr do
350	+	begin
351	+	FOURCC := 'DDS ';
352	+	with SURFACEDESC2 do
353	+	begin
354	+	Size := 124;
355	+	Flags := DDSD_CAPS or DDSD_PIXELFORMAT or DDSD_WIDTH or DDSD_HEIGHT;
356	+	if _storetype = 9 then
357	+	Flags := Flags or DDSD_LINEARSIZE
358	+	else
359	+	Flags := Flags or DDSD_PITCH;
360	+	if (imginfo and $01) > 0 then
361	+	Flags := Flags or DDSD_MIPMAPCOUNT;
362	+	Height := _height;
363	+	Width := _width;
364	+	if _storetype = 9 then
365	+	PitchOrLinearSize := width * height div 2
366	+	else
367	+	PitchOrLinearSize := width * _depth div 8;
368	+	Depth := 0;
369	+	MipMapCount := 1;
370	+	if (imginfo and $01) > 0 then
371	+	begin
372	+	x := width;
373	+	y := height;
374	+	while (x > 1) and (y > 1) do
375	+	begin
376	+	x := x div 2;
377	+	y := y div 2;
378	+	Inc(MipMapCount);
379	+	end;
380	+	end;
381	+	for i := 1 to 11 do
382	+	Reserved[i] := 0;
383	+	with PIXELFORMAT do
384	+	begin
385	+	Size := 32;
386	+	if _storetype = 9 then
387	+	Flags := DDPF_FOURCC
388	+	else
389	+	Flags := DDPF_RGB;
390	+	if _storetype in [0, 2] then
391	+	Flags := Flags or DDPF_ALPHAPIXELS;
392	+	if _storetype = 9 then
393	+	FOURCC := 'DXT1'
394	+	else
395	+	begin
396	+	RGBBitCount := _depth;
397	+	case _storetype of
398	+	0: begin
399	+	RBitMask := $0F00;
400	+	GBitMask := $00F0;
401	+	BBitMask := $000F;
402	+	AlphaBitMask := $F000;
403	+	end;
404	+	1, 2: begin
405	+	RBitMask := $7C00;
406	+	GBitMask := $03E0;
407	+	BBitMask := $001F;
408	+	if _storetype = 2 then
409	+	AlphaBitMask := $8000
410	+	else
411	+	AlphaBitMask := $0000;
412	+	end;
413	+	8: begin
414	+	RBitMask := $00FF0000;
415	+	GBitMask := $0000FF00;
416	+	BBitMask := $000000FF;
417	+	AlphaBitMask := $00000000;
418	+	end;
419	+	end;
420	+	end;
421	+	end;
422	+	with DDSCAPS2 do
423	+	begin
424	+	Caps1 := DDSCAPS_TEXTURE;
425	+	if (imginfo and $01) > 0 then
426	+	Caps1 := Caps1 or DDSCAPS_COMPLEX or DDSCAPS_MIPMAP;
427	+	Caps2 := 0;
428	+	Reserved[1] := 0;
429	+	Reserved[2] := 0;
430	+	end;
431	+	end;
432	+	end;
433	+
434	+	data := TMemoryStream.Create;
435	+	data.Write(hdr, SizeOf(hdr));
436		if ConManager.Connection[ConnectionID].DataOS = DOS_WIN then
437	<	ConManager.Connection[ConnectionID].LoadRawFile(fileid, $9C, FData)
437	>	ConManager.Connection[ConnectionID].LoadRawFile(fileid, $9C, TStream(data))
438		else
439	<	ConManager.Connection[ConnectionID].LoadRawFile(fileid, $A0, FData);
439	>	ConManager.Connection[ConnectionID].LoadRawFile(fileid, $A0, TStream(data));
440
441	<	Self.FDataType := [DT_OniReverted, DT_Oni];
441	>	//  data.Seek(0, soFromBeginning);
442	>	//  data.SaveToFile('m:\test.txmp');
443	>
444	>	data.Seek(0, soFromBeginning);
445	>	result := LoadMultiImageFromStream(data, FImages);
446	>	data.Free;
447	>	{
448	>	if result then
449	>	begin
450	>	for i := 0 to High(FImages) do
451	>	begin
452	>	data := TMemoryStream.Create;
453	>	data.Write(FImages[i].Bits^, FImages[i].Size);
454	>	data.Seek(0, soFromBeginning);
455	>	data.SaveToFile('m:\test.txmp.'+IntToStr(i));
456	>	data.Free;
457	>	end;
458	>	end;
459	>	}
460	>	if not result then
461	>	begin
462	>	ShowMessage('Error while loading file' + #13#10 + DetermineStreamFormat(data));
463	>	//    data.SaveToFile('m:\prob.dds');
464	>	end;
465		end;
466
467
#	Line 517 | Line 469 | end;
469
470		function TOniImage.LoadFromTXMB(ConnectionID, FileID: Integer): Boolean;
471		var
472	<	i, x, y, x2, y2, pixelid, imgid: Integer;
472	>	i, x, y, imgid: Integer;
473		rows, cols: Word;
474		linkcount: Integer;
475		link: Integer;
476	<	images_decoded: array of TOniImage;
476	>	images: array of TOniImage;
477		x_start, y_start: Integer;
478	+
479	+	width, height: Word;
480		begin
481	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, SizeOf(Self.FWidth), @Self.FWidth);
482	<	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $12, SizeOf(Self.FHeight), @Self.FHeight);
481	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $10, SizeOf(width), @width);
482	>	ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $12, SizeOf(height), @height);
483		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $18, SizeOf(cols), @cols);
484		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1A, SizeOf(rows), @rows);
485		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $1C, SizeOf(linkcount), @linkcount);
486	<	SetLength(images_decoded, linkcount);
486	>	SetLength(images, linkcount);
487		for i := 0 to linkcount - 1 do
488		begin
489		ConManager.Connection[ConnectionID].LoadDatFilePart(fileid, $20 + i * 4, SizeOf(link), @link);
490		link := link div 256;
491	<	images_decoded[i] := TOniImage.Create;
492	<	images_decoded[i].LoadFromTXMP(ConnectionID, link);
493	<	images_decoded[i].DecodeImageTo32bit;
494	<	images_decoded[i].RevertImage;
491	>	images[i] := TOniImage.Create;
492	>	images[i].LoadFromTXMP(ConnectionID, link);
493	>	SetLength(FImages, 1);
494	>	NewImage(width, height, ifA1R5G5B5, FImages[0]);
495		end;
542	–	SetLength(Self.FData, Self.FWidth * Self.FHeight * 4);
496		for y := 0 to rows - 1 do
497		begin
498		for x := 0 to cols - 1 do
499		begin
500	<	imgid   := y * cols + x;
500	>	imgid := y * cols + x;
501		x_start := 0;
502		y_start := 0;
503		for i := 0 to x do
504		if i < x then
505	<	x_start := x_start + images_decoded[i].Width;
505	>	x_start := x_start + images[i].Image[0].Width;
506		for i := 0 to y do
507		if i < y then
508	<	y_start := y_start + images_decoded[i].Height;
509	<	for y2 := 0 to images_decoded[imgid].Height - 1 do
510	<	begin
558	<	for x2 := 0 to images_decoded[imgid].Width - 1 do
559	<	begin
560	<	if ((x_start + x2) < Self.FWidth) and ((y_start + y2) < Self.FHeight) then
561	<	begin
562	<	pixelid := y_start * Self.FWidth + x_start + y2 * Self.FWidth + x2;
563	<	Self.FData[pixelid * 4 + 0] :=
564	<	images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 0];
565	<	Self.FData[pixelid * 4 + 1] :=
566	<	images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 1];
567	<	Self.FData[pixelid * 4 + 2] :=
568	<	images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 2];
569	<	Self.FData[pixelid * 4 + 3] :=
570	<	images_decoded[imgid].Data[(y2 * images_decoded[imgid].Width + x2) * 4 + 3];
571	<	end;
572	<	end;
573	<	end;
508	>	y_start := y_start + images[i].Image[0].Height;
509	>	CopyRect(images[imgid].Image[0], 0, 0, images[imgid].Image[0].Width,
510	>	images[imgid].Image[0].Height, FImages[0], x_start, y_start);
511		end;
512		end;
513		for i := 0 to linkcount - 1 do
514	<	images_decoded[i].Free;
578	<	Self.FDepth     := 32;
579	<	Self.FStoreType := 8;
580	<	Self.FDataType  := [DT_Decoded32];
581	<	Self.RevertImage;
514	>	images[i].Free;
515		end;
516
517
518
519	<
587	<	function TOniImage.GetImageDataSize(fading: Boolean): Integer;
519	>	procedure TOniImage.SaveDataToStream(MipMaps: Boolean; var Target: TStream);
520		var
521	<	size: Integer;
522	<	x, y: Word;
523	<	bpp:  Byte;
592	<	minside: Byte;
521	>	images: TDynImageDataArray;
522	>	mem: TMemoryStream;
523	>	i: Integer;
524		begin
525	<	minside := 1;
526	<	case Self.FStoreType of
527	<	9:
525	>	if Length(FImages) = 0 then
526	>	Exit;
527	>	if MipMaps then
528	>	begin
529	>	if Length(FImages) = 1 then
530		begin
531	<	bpp := 4;
532	<	minside := 4;
533	<	end;
534	<	0, 1, 2:
535	<	bpp := 16;
536	<	8:
604	<	bpp := 32;
531	>	if not GenerateMipMaps(FImages[0], 0, images) then
532	>	begin
533	>	ShowMessage('Could not generate MipMaps');
534	>	Exit;
535	>	end;
536	>	end
537		else
538	<	Result := 0;
538	>	begin
539	>	SetLength(images, Length(FImages));
540	>	for i := 0 to High(FImages) do
541	>	CloneImage(FImages[i], images[i]);
542	>	end;
543	>	mem := TMemoryStream.Create;
544	>	if not SaveMultiImageToStream('dds', mem, images) then
545	>	begin
546	>	ShowMessage('Could not save images to stream');
547		Exit;
608	–	end;
609	–
610	–	x    := Self.FWidth;
611	–	y    := Self.FHeight;
612	–	size := (x * y * bpp) div 8;
613	–	if fading then
614	–	begin
615	–	repeat
616	–	x    := x div 2;
617	–	y    := y div 2;
618	–	size := size + (x * y * bpp) div 8;
619	–	until (x = minside) or (y = minside);
620	–	if FStoreType = 9 then
621	–	begin
622	–	repeat
623	–	x    := x div 2;
624	–	y    := y div 2;
625	–	size := size + (x * y * 16) div 8;
626	–	until (x = 1) or (y = 1);
548		end;
549	<	end;
629	<	Result := size;
630	<	end;
631	<
632	<
633	<
634	<
635	<	procedure TOniImage.GetAsData(var Target: TStream);
636	<	var
637	<	revert: Boolean;
638	<	begin
639	<	//    if not (DT_Decoded32 in Self.FDataType) then
640	<	//      Self.DecodeImage;
641	<	if not (DT_OniReverted in Self.FDataType) then
642	<	begin
643	<	revert := True;
644	<	Self.RevertImage;
549	>	FreeImagesInArray(images);
550		end
551		else
647	–	revert := False;
648	–	if not Assigned(Target) then
649	–	Target := TMemoryStream.Create;
650	–	Target.Write(FData[0], Length(FData));
651	–	Target.Seek(0, soFromBeginning);
652	–	if revert then
653	–	Self.RevertImage;
654	–	end;
655	–
656	–	procedure TOniImage.GetAsData(var Target: TByteData);
657	–	var
658	–	mem: TStream;
659	–	begin
660	–	mem := TMemoryStream.Create;
661	–	GetAsData(mem);
662	–	SetLength(Target, mem.Size);
663	–	mem.Read(Target[0], mem.Size);
664	–	mem.Free;
665	–	end;
666	–
667	–
668	–	procedure TOniImage.GetAs32bit(var Target: TStream);
669	–	begin
670	–	if not (DT_Decoded32 in Self.FDataType) then
671	–	Self.DecodeImageTo32bit;
672	–	if not Assigned(Target) then
673	–	Target := TMemoryStream.Create;
674	–	Target.Write(FData[0], Length(FData));
675	–	Target.Seek(0, soFromBeginning);
676	–	end;
677	–
678	–	procedure TOniImage.GetAs32bit(var Target: TByteData);
679	–	var
680	–	mem: TStream;
681	–	begin
682	–	mem := TMemoryStream.Create;
683	–	GetAs32bit(mem);
684	–	SetLength(Target, mem.Size);
685	–	mem.Read(Target[0], mem.Size);
686	–	mem.Free;
687	–	end;
688	–
689	–
690	–	procedure TOniImage.GetAsBMP(var Target: TByteData);
691	–	const
692	–	BMPheader: array[0..53] of Byte =
693	–	($42, $4D, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0,
694	–	40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, $18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
695	–	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
696	–	var
697	–	i, x, y: Integer;
698	–	begin
699	–	if not (DT_Decoded32 in Self.FDataType) then
700	–	Self.DecodeImageTo32bit;
701	–
702	–	SetLength(Target, Self.FWidth * Self.FHeight * 3 + 54);
703	–	for y := 0 to Self.FHeight - 1 do
552		begin
553	<	for x := 0 to Self.FWidth - 1 do
553	>	mem := TMemoryStream.Create;
554	>	if not SaveImageToStream('dds', mem, FImages[0]) then
555		begin
556	<	Target[((Self.FWidth * y + x) * 3) + 0 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 0];
557	<	Target[((Self.FWidth * y + x) * 3) + 1 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 1];
709	<	Target[((Self.FWidth * y + x) * 3) + 2 + 54] := Self.FData[(Self.FWidth * y + x) * 4 + 2];
556	>	ShowMessage('Could not save image to stream');
557	>	Exit;
558		end;
559		end;
560	+	if not Assigned(Target) then
561	+	Target := TMemoryStream.Create;
562
563	<	for i := 0 to High(BMPheader) do
564	<	Target[i] := BMPheader[i];
715	<	Target[2] := ((Self.FWidth * Self.FHeight * 3 + 54) and $000000FF) div $1;
716	<	Target[3]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $0000FF00) div $100;
717	<	Target[4]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $00FF0000) div $10000;
718	<	Target[5]  := ((Self.FWidth * Self.FHeight * 3 + 54) and $FF000000) div $1000000;
719	<	Target[18] := (Self.FWidth and $000000FF) div $1;
720	<	Target[19] := (Self.FWidth and $0000FF00) div $100;
721	<	Target[20] := (Self.FWidth and $00FF0000) div $10000;
722	<	Target[21] := (Self.FWidth and $FF000000) div $1000000;
723	<	Target[22] := (Self.FHeight and $000000FF) div $1;
724	<	Target[23] := (Self.FHeight and $0000FF00) div $100;
725	<	Target[24] := (Self.FHeight and $00FF0000) div $10000;
726	<	Target[25] := (Self.FHeight and $FF000000) div $1000000;
727	<	Target[34] := ((Self.FWidth * Self.FHeight * 3) and $000000FF) div $1;
728	<	Target[35] := ((Self.FWidth * Self.FHeight * 3) and $0000FF00) div $100;
729	<	Target[36] := ((Self.FWidth * Self.FHeight * 3) and $00FF0000) div $10000;
730	<	Target[37] := ((Self.FWidth * Self.FHeight * 3) and $FF000000) div $1000000;
731	<	end;
732	<
563	>	//  mem.Seek(0, soFromBeginning);
564	>	//  mem.SaveToFile('m:\dds.dds');
565
566	<	procedure TOniImage.GetAsBMP(var Target: TStream);
567	<	var
568	<	data: TByteData;
569	<	streampos: Integer;
738	<	begin
739	<	GetAsBMP(data);
740	<	streampos := Target.Position;
741	<	Target.Write(data[0], Length(data));
742	<	Target.Seek(streampos, soFromBeginning);
566	>	mem.Seek(128, soFromBeginning);
567	>	Target.CopyFrom(mem, mem.Size - 128);
568	>	mem.Free;
569	>	Target.Seek(0, soFromBeginning);
570		end;
571
572
573	<	function TOniImage.LoadFromBMP(filename: String): Boolean;
747	<	var
748	<	filestream: TFileStream;
749	<	tempd:      TByteData;
750	<
751	<	x, y: Integer;
573	>	function TOniImage.LoadFromFile(filename: String): Boolean;
574		begin
575	<	filestream := TFileStream.Create(filename, fmOpenRead);
576	<	SetLength(tempd, filestream.Size);
755	<	filestream.Read(tempd[0], filestream.Size);
756	<	filestream.Free;
757	<
758	<	if not ((tempd[00] = $42) and (tempd[01] = $4D)) then
759	<	begin
760	<	Result := False;
761	<	ShowMessage('Not a standard 24bit bitmap');
762	<	Exit;
763	<	end;
764	<	if not (tempd[10] = 54) then
765	<	begin
766	<	Result := False;
767	<	ShowMessage('Imagedata has to start at 0x54');
768	<	Exit;
769	<	end;
770	<	if not (tempd[14] = 40) then
771	<	begin
772	<	Result := False;
773	<	ShowMessage('Second bitmap header has to have 40 bytes');
774	<	Exit;
775	<	end;
776	<	if not (tempd[28] = 24) then
777	<	begin
778	<	Result := False;
779	<	ShowMessage('Bitmap has to have 24bits');
780	<	Exit;
781	<	end;
782	<	if not (tempd[30] = 0) then
783	<	begin
784	<	Result := False;
785	<	ShowMessage('Bitmap has to be uncompressed');
786	<	Exit;
787	<	end;
788	<
789	<	Self.FWidth     := tempd[18] + tempd[19] * 256 + tempd[20] * 256 * 256 + tempd[21] * 256 * 256 * 256;
790	<	Self.FHeight    := tempd[22] + tempd[23] * 256 + tempd[24] * 256 * 256 + tempd[25] * 256 * 256 * 256;
791	<	Self.FDepth     := 32;
792	<	Self.FStoreType := 8;
793	<
794	<	SetLength(Self.FData, Self.FWidth * Self.FHeight * Self.FDepth div 8);
795	<	for y := 0 to Self.FHeight - 1 do
796	<	begin
797	<	for x := 0 to Self.FWidth - 1 do
798	<	begin
799	<	Self.FData[((Self.FWidth * y + x) * 4) + 0] := tempd[54 + (Self.FWidth * y + x) * 3 + 0];
800	<	Self.FData[((Self.FWidth * y + x) * 4) + 1] := tempd[54 + (Self.FWidth * y + x) * 3 + 1];
801	<	Self.FData[((Self.FWidth * y + x) * 4) + 2] := tempd[54 + (Self.FWidth * y + x) * 3 + 2];
802	<	Self.FData[((Self.FWidth * y + x) * 4) + 3] := 0;
803	<	end;
804	<	end;
805	<
806	<	Self.FDataType := [DT_Decoded32];
575	>	if not LoadMultiImageFromFile(filename, FImages) then
576	>	ShowMessage('Couldn''t load image file');
577		end;
578
579
580	<
811	<
812	<	function TOniImage.WriteToBMP(filename: String): Boolean;
813	<	var
814	<	filestream: TFileStream;
580	>	function TOniImage.WriteToFile(filename: String): Boolean;
581		begin
582	<	filestream := TFileStream.Create(filename, fmCreate);
817	<	GetAsBMP(TStream(filestream));
818	<	filestream.Free;
582	>	SaveMultiImageToFile(filename, FImages);
583		end;
584
585
586
587	<	function TOniImage.GetMipMappedImage(var Target: TByteData): Boolean;
587	>	function TOniImage.GetImageSize(MipMaps: Boolean): Integer;
588		var
589	<	i:      Integer;
590	<	x, y:   Word;
591	<	fadelvldata: TByteData;
828	<	revert: Boolean;
829	<	begin
830	<	Result := False;
831	<
832	<	//    if not (DT_Decoded32 in Self.FDataType) then
833	<	//      Self.DecodeImage;
834	<	if Self.FStoreType = 9 then
835	<	Self.DecompressImage;
836	<	if not (DT_OniReverted in Self.FDataType) then
589	>	i: Integer;
590	>	begin
591	>	if Length(FImages) > 0 then
592		begin
593	<	revert := True;
594	<	Self.RevertImage;
593	>	Result := FImages[0].Size;
594	>	if mipmaps then
595	>	for i := 1 to High(FImages) do
596	>	Result := Result + FImages[i].Size;
597		end
598		else
599	<	revert := False;
843	<
844	<	x := Self.FWidth;
845	<	y := Self.FHeight;
846	<	SetLength(Target, x * y * Self.FDepth div 8);
847	<	SetLength(fadelvldata, x * y * Self.FDepth div 8);
848	<	for i := 0 to Length(Target) - 1 do
849	<	begin
850	<	Target[i] := Self.FData[i];
851	<	fadelvldata[i] := Self.FData[i];
852	<	end;
853	<	repeat
854	<	fadelvldata := Self.ResizeImage(x, y, fadelvldata);
855	<	x := x div 2;
856	<	y := y div 2;
857	<	SetLength(Target, Length(Target) + x * y * Self.FDepth div 8);
858	<	for i := 0 to Length(fadelvldata) - 1 do
859	<	Target[Length(Target) - x * y * Self.FDepth div 8 + i] := fadelvldata[i];
860	<	until (x = 1) or (y = 1) or ((x mod 2) = 1) or ((y mod 2) = 1);
861	<	if (x > 1) and (y > 1) then
862	<	Exit;
863	<	Result := True;
864	<
865	<	if revert then
866	<	Self.RevertImage;
867	<	end;
868	<
869	<
870	<	function TOniImage.GetMipMappedImage(var Target: TStream): Boolean;
871	<	var
872	<	data: TByteData;
873	<	streampos: Integer;
874	<	begin
875	<	Result := GetMipMappedImage(data);
876	<	if not Assigned(Target) then
877	<	Target := TMemoryStream.Create;
878	<	streampos := Target.Position;
879	<	Target.Write(data[0], Length(data));
880	<	Target.Seek(streampos, soFromBeginning);
599	>	Result := -1;
600		end;
601
883	–
602		end.

Diff Legend

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