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 131 by alloc, Wed Mar 28 01:20:26 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 211 | Line 151 | begin
151		begin
152		ShowMessage('Couldn''t delete file. Aborting');
153		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;
154		end;
155	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
156	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
157	+	begin
158	+	ShowMessage('Couldn''t delete file. Aborting');
159	+	Exit;
160	+	end;
161	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
162	+	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
163	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
164	+	begin
165	+	ShowMessage('Couldn''t delete file. Aborting');
166	+	Exit;
167	+	end;
168		end else begin
169		ShowMessage('Aborting');
170		Exit;
#	Line 371 | Line 316 | begin
316		if RawLinks[i].RawSize > 0 then
317		begin
318		RawFileStream := TMemoryStream.Create;
319	<	if UpperCase(fileinfo.Extension) = 'TXMP' then
319	>	Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream));
320	>	RawFileStream.Seek(0, soFromBeginning);
321	>	if RawLinks[i].LocSep then
322		begin
323	<	DatFileStream.Seek($88, soFromBeginning);
324	<	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));
323	>	RawLinks[i].RawAddr := Stream_Sep.Size;
324	>	Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
325		end else begin
326	<	Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream));
326	>	RawLinks[i].RawAddr := Stream_Raw.Size;
327	>	Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
328		end;
405	–	RawFileStream.Seek(0, soFromBeginning);
329		end else
330		RawLinks[i].RawAddr := 0;
331	+	DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
332	+	DatFileStream.Write(RawLinks[i].RawAddr, 4);
333		end;
334		end;
335	<
336	<	{
412	<	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	<	//
335	>	DatFileStream.Seek(0, soFromBeginning);
336	>	Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
337		end
338		else
339		FilesHeader[i].DataAddr := 0;
#	Line 465 | Line 348 | begin
348		FilesHeader[i].FileSize := fileinfo.Size;
349		FilesHeader[i].FileType := fileinfo.FileType;
350
351	<	if ((i mod 10) = 0) and (i >= 100) then
351	>	if ((FileID mod 10) = 0) and (FileID >= 100) then
352		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
353	<	(Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
354	<	progress.Position := i + 1;
355	<	lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
353	>	(Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
354	>	progress.Position := FileID + 1;
355	>	lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
356		Application.ProcessMessages;
357		end;
358
#	Line 497 | Line 380 | begin
380		Stream_Body.Free;
381		Stream_Names.Free;
382		Stream_Raw.Free;
383	<	if OniDataConnection.OSisMac then
383	>
384	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
385		Stream_Sep.Free;
386
387		progress.Position      := progress.Max;
#	Line 513 | Line 397 | begin
397
398		converting := False;
399
400	<	CloseDataConnection(DataConnections[conIndex]);
400	>	//  CloseDataConnection(DataConnections[conIndex]);
401		end;
402
403
#	Line 523 | Line 407 | procedure TForm_LevelDB.HandleFile;
407		var
408		i: Byte;
409		begin
410	<	for i := 1 to Length(ConvertHandlers) do
410	>	{  for i := 1 to Length(ConvertHandlers) do
411		if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
412		if ConvertHandlers[i].needed then
413		begin
#	Line 532 | Line 416 | begin
416		end
417		else
418		Break;
419	<	end;
419	>	}end;
420
421
422
423
424		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
425	+	{
426		var
427		DataBase:    TABSDatabase;
428		Query:       TABSQuery;
#	Line 569 | Line 454 | const
454		else
455		group_progress.Caption := 'Creating DB (FINISHED)';
456		end;
457	+	}
458
459		begin
460	<	if CreateDataConnection(Source, ODB_Dat) = nil then
460	>	{  if CreateDataConnection(Source, ODB_Dat) = nil then
461		begin
462		ShowMessage('Could not connect to .dat-file');
463		Exit;
#	Line 774 | Line 660 | begin
660		database.Free;
661
662		CloseDataConnection(DataConnections[conIndex]);
663	+	}
664		end;
665
666
667
668
669	<	procedure TForm_LevelDB.stop_convert;
669	>	procedure TForm_LevelDB.StopConvert;
670		begin
671	<	btn_abortok.Caption := '&Close';
671	>	{  btn_abortok.Caption := '&Close';
672		btn_abortok.Default := True;
673		converting := False;
674		lbl_estimation.Caption := 'ABORTED';
#	Line 792 | Line 679 | begin
679		begin
680		DeleteFile(loaded_filename);
681		end;
682	<	end;
682	>	}end;
683
684
685
#	Line 815 | Line 702 | end;
702
703
704
705	<
705	>	{
706		procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
707		var
708		link: LongWord;
#	Line 1847 | Line 1734 | begin
1734		begin
1735		end;
1736		end;
1737	+	}
1738
1739
1740	<
1853	<
1740	>	{
1741		procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1742		begin
1743		SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
#	Line 1858 | Line 1745 | begin
1745		ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1746		ConvertHandlers[High(ConvertHandlers)].handler := handler;
1747		end;
1748	<
1748	>	}
1749		begin
1750	<	InsertHandler('ABNA', False, nil);
1750	>	{  InsertHandler('ABNA', False, nil);
1751		//  InsertHandler('AGDB',True,AGDB);
1752		InsertHandler('AGDB', False, nil);
1753		InsertHandler('AGQC', False, nil);
#	Line 1958 | Line 1845 | begin
1845		InsertHandler('WMM_', False, nil);
1846		InsertHandler('WMMB', True, WMMB);
1847		InsertHandler('WPGE', True, WPGE);
1848	<	end.
1848	>	}end.

Diff Legend

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