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

Diff Legend

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