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 181 by alloc, Sat May 19 17:54:34 2007 UTC vs.
Revision 194 by alloc, Sat May 26 18:26:48 2007 UTC

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

Diff Legend

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