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 138 by alloc, Fri Mar 30 00:49:02 2007 UTC vs.
Revision 154 by alloc, Sun Apr 1 20:36:23 2007 UTC

#	Line 44 | Line 44 | end;
44
45
46		procedure TForm_LevelDB.CreateLevel(Source, Target: String);
47	+	const
48	+	EmptyBytes: Array[0..31] of Byte = (
49	+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
50		var
51		DatHeader:        THeader;
52		FilesHeader:      TFilesMap;
#	Line 74 | Line 77 | var
77		RawLinks:   TRawDataList;
78
79		DatFileStream, RawFileStream: TMemoryStream;
77	–
78	–	// ###########################
79	–	datsum, linksum, rawsum: Int64;
80	–	freq: Int64;
81	–	tempticks1, tempticks2: Int64;
82	–	// ###########################
80		const
81		Steps: Byte = 3;
82
#	Line 205 | Line 202 | begin
202		Stream_Names := TMemoryStream.Create;
203		Stream_Dat   := TFileStream.Create(Target, fmCreate);
204		Stream_Raw   := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.raw'), fmCreate);
205	+	Stream_Raw.Write(EmptyBytes[0], 32);
206		if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
207	+	begin
208		Stream_Sep := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.sep'), fmCreate);
209	+	Stream_Sep.Write(EmptyBytes[0], 32);
210	+	end;
211	+
212
213		DoStep('Creating header');
214		progress.Position      := 0;
#	Line 297 | Line 299 | begin
299		lbl_estimation.Caption := 'Estimated finishing time: unknown';
300		Application.ProcessMessages;
301
300	–	QueryPerformanceFrequency(freq);
301	–	datsum := 0;
302	–	linksum := 0;
303	–	rawsum := 0;
304	–
302		FileTime := Time;
303		for FileID := 0 to DatHeader.Files - 1 do
304		begin
#	Line 310 | Line 307 | begin
307		FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
308		if FileInfo.Size > 0 then
309		begin
313	–	QueryPerformanceCounter(tempticks1);
314	–
310		FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
311		DatFileStream := TMemoryStream.Create;
312		Connection.LoadDatFile(FileID, TStream(DatFileStream));
#	Line 320 | Line 315 | begin
315		DatFileStream.Write(tempi, 4);
316		DatFileStream.Write(LevelID, 4);
317
323	–	QueryPerformanceCounter(tempticks2);
324	–	datsum := datsum + (tempticks2 - tempticks1);
325	–
318		DatLinks := Connection.GetDatLinks(FileID);
319		if Length(DatLinks) > 0 then
320		begin
#	Line 337 | Line 329 | begin
329		end;
330		end;
331
340	–	QueryPerformanceCounter(tempticks1);
341	–	linksum := linksum + (tempticks1 - tempticks2);
342	–
332		RawLinks := Connection.GetRawList(FileID);
333		if Length(RawLinks) > 0 then
334		begin
#	Line 354 | Line 343 | begin
343		begin
344		RawLinks[i].RawAddr := Stream_Sep.Size;
345		Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
346	+	if (Stream_Sep.Size mod 32) > 0 then
347	+	Stream_Sep.Write(EmptyBytes[0], 32 - (Stream_Sep.Size mod 32));
348		end else begin
349		RawLinks[i].RawAddr := Stream_Raw.Size;
350		Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
351	+	if (Stream_Raw.Size mod 32) > 0 then
352	+	Stream_Raw.Write(EmptyBytes[0], 32 - (Stream_Raw.Size mod 32));
353		end;
354		end else
355		RawLinks[i].RawAddr := 0;
#	Line 366 | Line 359 | begin
359		end;
360		DatFileStream.Seek(0, soFromBeginning);
361		Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
362	<
363	<	QueryPerformanceCounter(tempticks2);
364	<	rawsum := rawsum + (tempticks2 - tempticks1);
362	>	if (Stream_Body.Size mod 32) > 0 then
363	>	begin
364	>	ShowMessage(
365	>	IntToStr(FileID) + '-' + FileInfo.Name + '.' + FileInfo.Extension + #13#10 +
366	>	IntToStr(FileInfo.Size) + ' - 0x' + IntToHex(FileInfo.Size, 6) + ' - real: ' + IntToStr(DatFileStream.Size) + ' - 0x' + IntToHex(DatFileStream.Size, 6) + #13#10 +
367	>	IntToStr(Stream_Body.Size) + ' - 0x' + IntToHex(Stream_Body.Size, 6) );
368	>	Stream_Body.Write(EmptyBytes[0], 32 - (Stream_Body.Size mod 32));
369	>	end;
370		end
371		else
372		FilesHeader[FileID].DataAddr := 0;
#	Line 391 | Line 389 | begin
389		Application.ProcessMessages;
390		end;
391
394	–	ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
395	–	'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
396	–	'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
397	–	);
398	–
392		Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
393		for i := 0 to High(FilesHeader) do
394		Stream_Dat.Write(FilesHeader[i], SizeOf(FilesHeader[i]));
#	Line 404 | Line 397 | begin
397		for i := 0 to High(ExtensionsHeader) do
398		Stream_Dat.Write(ExtensionsHeader[i], SizeOf(ExtensionsHeader[i]));
399
400	+	if (Stream_Dat.Size mod 32) > 0 then
401	+	Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
402	+
403		DatHeader.DataSize  := Stream_Body.Size;
404		DatHeader.NamesSize := Stream_Names.Size;
405		DatHeader.DataAddr  := Stream_Dat.Size;
406
407		Stream_Body.Seek(0, soFromBeginning);
408		Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
409	+
410	+	if (Stream_Dat.Size mod 32) > 0 then
411	+	Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
412	+
413		DatHeader.NamesAddr := Stream_Dat.Size;
414		Stream_Names.Seek(0, soFromBeginning);
415		Stream_Dat.CopyFrom(Stream_Names, Stream_Names.Size);
#	Line 450 | Line 450 | var
450
451		BeginTime, FileTime: Double;
452		Step:       Integer;
453	–	LevelID:    Integer;
453		TimeFormat: TFormatSettings;
454
455		ConID:      Integer;
#	Line 459 | Line 458 | var
458
459		FileID:     Integer;
460
462	–	Strings:    TStrings;
461		i:          Integer;
462		temps:      String;
465	–	tempi:      Integer;
466	–	tempb:      Byte;
463		tempdata:   TByteData;
464		FileInfo:   TFileInfo;
465		DatLinks:   TDatLinkList;
#	Line 585 | Line 581 | begin
581		Query.ExecSQL;
582		Query.SQL.Text :=
583		'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
584	<	'src_link_offset INTEGER, target_id INTEGER,  INDEX idsrcid src_id, ' +
585	<	'INDEX iddestid target_id);';
584	>	'src_link_offset INTEGER, target_id INTEGER);';
585	>	Query.ExecSQL;
586	>	Query.SQL.Text := 'CREATE INDEX idsrcid ON linkmap (src_id);';
587	>	Query.ExecSQL;
588	>	Query.SQL.Text := 'CREATE INDEX idtargetid ON linkmap (target_id);';
589		Query.ExecSQL;
590		Query.SQL.Text :=
591		'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
592		'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
593	<	'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib, ' +
595	<	'INDEX idsrcid src_id);';
593	>	'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib);';
594		//    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
595		Query.ExecSQL;
596	+	Query.SQL.Text := 'CREATE INDEX idsrcid ON rawmap (src_id);';
597	+	Query.ExecSQL;
598		Query.SQL.Text :=
599		'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
600		'name STRING(128), contenttype INTEGER, size INTEGER, ' +
#	Line 631 | Line 631 | begin
631		DoStep('Writing .dat-fileslist');
632		Application.ProcessMessages;
633
634	+	FileTime := Time;
635		Database.StartTransaction;
636		for FileID := 0 to Connection.GetFileCount - 1 do
637		begin
#	Line 705 | Line 706 | begin
706		end;
707		if ((FileID mod 10) = 0) and (FileID >= 100) then
708		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
709	<	(Time - BeginTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
709	>	(Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
710		progress.Position := FileID;
711		lbl_progress.Caption := 'Files done: ' + IntToStr(FileID) + '/' + IntToStr(progress.Max);
712		Application.ProcessMessages;

Diff Legend

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