ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Helper/LevelDB.pas

Comparing oup/current/Helper/LevelDB.pas (file contents):
Revision 120 by alloc, Fri Mar 23 00:59:01 2007 UTC vs.
Revision 132 by alloc, Wed Mar 28 01:41:10 2007 UTC

#	Line 1 | Line 1
1	–	{$A8,B-,C+,D+,E-,F-,G+,H+,I+,J-,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W-,X+,Y+,Z1}
2	–	{$MINSTACKSIZE $00004000}
3	–	{$MAXSTACKSIZE $00100000}
4	–	{$IMAGEBASE $00400000}
5	–	{$APPTYPE GUI}
6	–	{$WARN SYMBOL_DEPRECATED ON}
7	–	{$WARN SYMBOL_LIBRARY ON}
8	–	{$WARN SYMBOL_PLATFORM ON}
9	–	{$WARN SYMBOL_EXPERIMENTAL ON}
10	–	{$WARN UNIT_LIBRARY ON}
11	–	{$WARN UNIT_PLATFORM ON}
12	–	{$WARN UNIT_DEPRECATED ON}
13	–	{$WARN UNIT_EXPERIMENTAL ON}
14	–	{$WARN HRESULT_COMPAT ON}
15	–	{$WARN HIDING_MEMBER ON}
16	–	{$WARN HIDDEN_VIRTUAL ON}
17	–	{$WARN GARBAGE ON}
18	–	{$WARN BOUNDS_ERROR ON}
19	–	{$WARN ZERO_NIL_COMPAT ON}
20	–	{$WARN STRING_CONST_TRUNCED ON}
21	–	{$WARN FOR_LOOP_VAR_VARPAR ON}
22	–	{$WARN TYPED_CONST_VARPAR ON}
23	–	{$WARN ASG_TO_TYPED_CONST ON}
24	–	{$WARN CASE_LABEL_RANGE ON}
25	–	{$WARN FOR_VARIABLE ON}
26	–	{$WARN CONSTRUCTING_ABSTRACT ON}
27	–	{$WARN COMPARISON_FALSE ON}
28	–	{$WARN COMPARISON_TRUE ON}
29	–	{$WARN COMPARING_SIGNED_UNSIGNED ON}
30	–	{$WARN COMBINING_SIGNED_UNSIGNED ON}
31	–	{$WARN UNSUPPORTED_CONSTRUCT ON}
32	–	{$WARN FILE_OPEN ON}
33	–	{$WARN FILE_OPEN_UNITSRC ON}
34	–	{$WARN BAD_GLOBAL_SYMBOL ON}
35	–	{$WARN DUPLICATE_CTOR_DTOR ON}
36	–	{$WARN INVALID_DIRECTIVE ON}
37	–	{$WARN PACKAGE_NO_LINK ON}
38	–	{$WARN PACKAGED_THREADVAR ON}
39	–	{$WARN IMPLICIT_IMPORT ON}
40	–	{$WARN HPPEMIT_IGNORED ON}
41	–	{$WARN NO_RETVAL ON}
42	–	{$WARN USE_BEFORE_DEF ON}
43	–	{$WARN FOR_LOOP_VAR_UNDEF ON}
44	–	{$WARN UNIT_NAME_MISMATCH ON}
45	–	{$WARN NO_CFG_FILE_FOUND ON}
46	–	{$WARN IMPLICIT_VARIANTS ON}
47	–	{$WARN UNICODE_TO_LOCALE ON}
48	–	{$WARN LOCALE_TO_UNICODE ON}
49	–	{$WARN IMAGEBASE_MULTIPLE ON}
50	–	{$WARN SUSPICIOUS_TYPECAST ON}
51	–	{$WARN PRIVATE_PROPACCESSOR ON}
52	–	{$WARN UNSAFE_TYPE OFF}
53	–	{$WARN UNSAFE_CODE OFF}
54	–	{$WARN UNSAFE_CAST OFF}
55	–	{$WARN OPTION_TRUNCATED ON}
56	–	{$WARN WIDECHAR_REDUCED ON}
57	–	{$WARN DUPLICATES_IGNORED ON}
58	–	{$WARN UNIT_INIT_SEQ ON}
59	–	{$WARN LOCAL_PINVOKE ON}
60	–	{$WARN MESSAGE_DIRECTIVE ON}
1		unit LevelDB;
2		interface
3		uses
#	Line 125 | Line 65 | var
65		Stream_Body, Stream_Names:          TMemoryStream;
66		Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
67
128	–	//  Data, rawdata: Tdata;
68		BeginTime, FileTime: Double;
69		Step:     Integer;
131	–	//  rawlist:  TRawDataList;
132	–	//  datlinks: TDatLinks;
70		OniImage:   TOniImage;
71		LevelID:    Integer;
72		TimeFormat: TFormatSettings;
#	Line 150 | Line 87 | var
87		RawLinks:   TRawDataList;
88
89		DatFileStream, RawFileStream: TMemoryStream;
90	+
91	+	// ###########################
92	+	datsum, linksum, rawsum: Int64;
93	+	freq: Int64;
94	+	tempticks1, tempticks2: Int64;
95	+	// ###########################
96		const
97		Steps: Byte = 3;
98
#	Line 211 | Line 154 | begin
154		begin
155		ShowMessage('Couldn''t delete file. Aborting');
156		Exit;
214	–	end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
215	–	begin
216	–	ShowMessage('Couldn''t delete file. Aborting');
217	–	Exit;
218	–	end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
219	–	begin
220	–	ShowMessage('Couldn''t delete file. Aborting');
221	–	Exit;
157		end;
158	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
159	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
160	+	begin
161	+	ShowMessage('Couldn''t delete file. Aborting');
162	+	Exit;
163	+	end;
164	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
165	+	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
166	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
167	+	begin
168	+	ShowMessage('Couldn''t delete file. Aborting');
169	+	Exit;
170	+	end;
171		end else begin
172		ShowMessage('Aborting');
173		Exit;
#	Line 335 | Line 283 | begin
283		lbl_estimation.Caption := 'Estimated finishing time: unknown';
284		Application.ProcessMessages;
285
286	+	QueryPerformanceFrequency(freq);
287	+	datsum := 0;
288	+	linksum := 0;
289	+	rawsum := 0;
290	+
291		FileTime := Time;
292		for FileID := 0 to DatHeader.Files - 1 do
293		begin
#	Line 343 | Line 296 | begin
296		FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
297		if FileInfo.Size > 0 then
298		begin
299	+	QueryPerformanceCounter(tempticks1);
300	+
301		FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
302		DatFileStream := TMemoryStream.Create;
303		Connection.LoadDatFile(FileID, TStream(DatFileStream));
304		DatFileStream.Seek(4, soFromBeginning);
305		DatFileStream.Write(LevelID, 4);
306
307	+	QueryPerformanceCounter(tempticks2);
308	+	datsum := datsum + (tempticks2 - tempticks1);
309	+
310		DatLinks := Connection.GetDatLinks(FileID);
311		if Length(DatLinks) > 0 then
312		begin
#	Line 363 | Line 321 | begin
321		end;
322		end;
323
324	+	QueryPerformanceCounter(tempticks1);
325	+	linksum := linksum + (tempticks1 - tempticks2);
326	+
327		RawLinks := Connection.GetRawList(FileID);
328		if Length(RawLinks) > 0 then
329		begin
#	Line 371 | Line 332 | begin
332		if RawLinks[i].RawSize > 0 then
333		begin
334		RawFileStream := TMemoryStream.Create;
335	<	if UpperCase(fileinfo.Extension) = 'TXMP' then
335	>	Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream));
336	>	RawFileStream.Seek(0, soFromBeginning);
337	>	if RawLinks[i].LocSep then
338		begin
339	<	DatFileStream.Seek($88, soFromBeginning);
340	<	DatFileStream.Read(tempb, 1);
378	<	if (tempb and $01) > 0 then
379	<	begin
380	<	OniImage.Load(Connection.ConnectionID, FileID);
381	<	if not OniImage.GetMipMappedImage(TStream(RawFileStream)) then
382	<	begin
383	<	ShowMessage('MipMapping-Error');
384	<	RawFileStream.Seek(0, soFromBeginning);
385	<	tempb := tempb and $FE;
386	<	DatFileStream.Seek($88, soFromBeginning);
387	<	DatFileStream.Write(tempb, 1);
388	<	OniImage.Load(Connection.ConnectionID, FileID);
389	<	OniImage.GetAsData(TStream(RawFileStream));
390	<	end else
391	<	begin
392	<	// Change of Depth($89), Storetype ($90)
393	<	DatFileStream.Seek($89, soFromBeginning);
394	<	DatFileStream.Read(tempb, 1);
395	<
396	<	DatFileStream.Seek($90, soFromBeginning);
397	<	DatFileStream.Read(tempb, 1);
398	<	Exit;
399	<	end;
400	<	end else
401	<	OniImage.GetAsData(TStream(RawFileStream));
339	>	RawLinks[i].RawAddr := Stream_Sep.Size;
340	>	Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
341		end else begin
342	<	Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream));
342	>	RawLinks[i].RawAddr := Stream_Raw.Size;
343	>	Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
344		end;
405	–	RawFileStream.Seek(0, soFromBeginning);
345		end else
346		RawLinks[i].RawAddr := 0;
347	+	DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
348	+	DatFileStream.Write(RawLinks[i].RawAddr, 4);
349		end;
350		end;
351	+	DatFileStream.Seek(0, soFromBeginning);
352	+	Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
353
354	<	{
355	<	if rawlist[j].raw_size > 0 then
413	<	begin
414	<	if (UpperCase(fileinfo.Extension) = 'TXMP') and
415	<	((Data[$88] and $01) > 0) then
416	<	begin
417	<	OniImage.LoadFromTXMP(Connection, i);
418	<	OniImage.GetMipMappedImage(rawdata);
419	<	rawlist[j].raw_size := OniImage.GetImageDataSize(True);
420	<	Data[$90] := $08;
421	<	Data[$89] := 32;
422	<	(*                  if data[$90]<>OniImage.StoreType then begin
423	<	data[$90]:=OniImage.StoreType;
424	<	data[$89]:=(data[$89] and $CF) or $20;
425	<	end;
426	<	*)                end
427	<	else
428	<	begin
429	<	SetLength(rawdata, rawlist[j].raw_size);
430	<	OniDataConnection.LoadRawFile(i, rawlist[j].src_offset, @rawdata[0]);
431	<	end;
432	<	//                data[$88]:=data[$88] and $FE;
433	<
434	<	if rawlist[j].loc_sep then
435	<	begin
436	<	rawlist[j].raw_addr := Stream_Sep.Size;
437	<	Stream_Sep.Write(rawdata[0], Length(rawdata));
438	<	end
439	<	else
440	<	begin
441	<	rawlist[j].raw_addr := Stream_Raw.Size;
442	<	Stream_Raw.Write(rawdata[0], Length(rawdata));
443	<	end;
444	<	end
445	<	else
446	<	rawlist[j].raw_addr := 0;
447	<	Data[rawlist[j].src_offset + 0] := (rawlist[j].raw_addr) and $FF;
448	<	Data[rawlist[j].src_offset + 1] := (rawlist[j].raw_addr shr 8) and $FF;
449	<	Data[rawlist[j].src_offset + 2] := (rawlist[j].raw_addr shr 16) and $FF;
450	<	Data[rawlist[j].src_offset + 3] := (rawlist[j].raw_addr shr 24) and $FF;
451	<	}
452	<	Stream_Body.Write(Data[0], Length(Data));
453	<	//
354	>	QueryPerformanceCounter(tempticks2);
355	>	rawsum := rawsum + (tempticks2 - tempticks1);
356		end
357		else
358		FilesHeader[i].DataAddr := 0;
#	Line 465 | Line 367 | begin
367		FilesHeader[i].FileSize := fileinfo.Size;
368		FilesHeader[i].FileType := fileinfo.FileType;
369
370	<	if ((i mod 10) = 0) and (i >= 100) then
370	>	if ((FileID mod 10) = 0) and (FileID >= 100) then
371		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
372	<	(Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
373	<	progress.Position := i + 1;
374	<	lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
372	>	(Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
373	>	progress.Position := FileID + 1;
374	>	lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
375		Application.ProcessMessages;
376		end;
377
378	+	ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
379	+	'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
380	+	'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
381	+	);
382	+
383		Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
384		for i := 0 to High(FilesHeader) do
385		Stream_Dat.Write(FilesHeader[i], SizeOf(FilesHeader[i]));
#	Line 497 | Line 404 | begin
404		Stream_Body.Free;
405		Stream_Names.Free;
406		Stream_Raw.Free;
407	<	if OniDataConnection.OSisMac then
407	>
408	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
409		Stream_Sep.Free;
410
411		progress.Position      := progress.Max;
#	Line 513 | Line 421 | begin
421
422		converting := False;
423
424	<	CloseDataConnection(DataConnections[conIndex]);
424	>	//  CloseDataConnection(DataConnections[conIndex]);
425		end;
426
427
#	Line 523 | Line 431 | procedure TForm_LevelDB.HandleFile;
431		var
432		i: Byte;
433		begin
434	<	for i := 1 to Length(ConvertHandlers) do
434	>	{  for i := 1 to Length(ConvertHandlers) do
435		if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
436		if ConvertHandlers[i].needed then
437		begin
#	Line 532 | Line 440 | begin
440		end
441		else
442		Break;
443	<	end;
443	>	}end;
444
445
446
447
448		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
449	+	{
450		var
451		DataBase:    TABSDatabase;
452		Query:       TABSQuery;
#	Line 569 | Line 478 | const
478		else
479		group_progress.Caption := 'Creating DB (FINISHED)';
480		end;
481	+	}
482
483		begin
484	<	if CreateDataConnection(Source, ODB_Dat) = nil then
484	>	{  if CreateDataConnection(Source, ODB_Dat) = nil then
485		begin
486		ShowMessage('Could not connect to .dat-file');
487		Exit;
#	Line 774 | Line 684 | begin
684		database.Free;
685
686		CloseDataConnection(DataConnections[conIndex]);
687	+	}
688		end;
689
690
691
692
693	<	procedure TForm_LevelDB.stop_convert;
693	>	procedure TForm_LevelDB.StopConvert;
694		begin
695	<	btn_abortok.Caption := '&Close';
695	>	{  btn_abortok.Caption := '&Close';
696		btn_abortok.Default := True;
697		converting := False;
698		lbl_estimation.Caption := 'ABORTED';
#	Line 792 | Line 703 | begin
703		begin
704		DeleteFile(loaded_filename);
705		end;
706	<	end;
706	>	}end;
707
708
709
#	Line 815 | Line 726 | end;
726
727
728
729	<
729	>	{
730		procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
731		var
732		link: LongWord;
#	Line 1847 | Line 1758 | begin
1758		begin
1759		end;
1760		end;
1761	+	}
1762
1763
1764	<
1853	<
1764	>	{
1765		procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1766		begin
1767		SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
#	Line 1858 | Line 1769 | begin
1769		ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1770		ConvertHandlers[High(ConvertHandlers)].handler := handler;
1771		end;
1772	<
1772	>	}
1773		begin
1774	<	InsertHandler('ABNA', False, nil);
1774	>	{  InsertHandler('ABNA', False, nil);
1775		//  InsertHandler('AGDB',True,AGDB);
1776		InsertHandler('AGDB', False, nil);
1777		InsertHandler('AGQC', False, nil);
#	Line 1958 | Line 1869 | begin
1869		InsertHandler('WMM_', False, nil);
1870		InsertHandler('WMMB', True, WMMB);
1871		InsertHandler('WPGE', True, WPGE);
1872	<	end.
1872	>	}end.

Diff Legend

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