From 83dba8e8957923e6a8f6541d7935345a59cf5bde Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Sun, 24 Apr 2016 13:43:14 +0300 Subject: [PATCH] animated textures loader simplified alot --- src/engine/e_log.pas | 2 +- src/game/g_main.pas | 2 + src/game/g_map.pas | 96 ++++++++++++++-------------------------- src/game/g_options.pas | 4 +- src/shared/wadreader.pas | 15 ++++--- 5 files changed, 49 insertions(+), 70 deletions(-) diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas index 6391f24..ef36fa5 100644 --- a/src/engine/e_log.pas +++ b/src/engine/e_log.pas @@ -252,5 +252,5 @@ end; begin - e_InitWritelnDriver(); + //e_InitWritelnDriver(); end. diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 969167f..e0ecce9 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -34,6 +34,8 @@ procedure Main(); var sdlflags: LongWord; begin + e_InitWritelnDriver(); + GetDir(0, GameDir); MapsDir := GameDir + '/maps/'; DataDir := GameDir + '/data/'; diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 6b6b59f..7babdd6 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -469,13 +469,9 @@ var TextureResource: String; _width, _height, _framecount, _speed: Integer; _backanimation: Boolean; - imgfmt: string; + //imgfmt: string; ia: TDynImageDataArray = nil; - il: TImageFileFormat = nil; - meta: TMetadata = nil; - f, c: Integer; - gf: TGIFFileFormat; - pf: TPNGFileFormat; + f, c, frdelay, frloop: Integer; begin result := -1; @@ -588,43 +584,17 @@ begin else begin // try animated image + { imgfmt := DetermineMemoryFormat(TextureWAD, ResLength); if length(imgfmt) = 0 then begin e_WriteLog(Format('Animated texture file "%s" has unknown format', [RecName]), MSG_WARNING); exit; end; - if imgfmt = 'gif' then - begin - meta := TMetadata.Create(); - gf := TGIFFileFormat.Create(meta); - gf.LoadAnimated := true; - il := gf; - end - else if imgfmt = 'png' then - begin - meta := TMetadata.Create(); - pf := TPNGFileFormat.Create(meta); - pf.LoadAnimated := true; - il := pf; - end; - if il <> nil then - begin - if not il.LoadFromMemory(TextureWAD, ResLength, ia) then - begin - e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); - exit; - end; - end - else if LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then - begin - if length(ia) > 1 then - begin - for f := 1 to High(ia) do FreeImage(ia[f]); - SetLength(ia, 1); - end; - end - else + } + GlobalMetadata.ClearMetaItems(); + GlobalMetadata.ClearMetaItemsForSaving(); + if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then begin e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); exit; @@ -643,36 +613,38 @@ begin _framecount := length(ia); _speed := 1; _backanimation := false; - if meta <> nil then + frdelay := -1; + frloop := -666; + if GlobalMetadata.HasMetaItem(SMetaFrameDelay) then begin - if meta.HasMetaItem(SMetaFrameDelay) then - begin - //writeln(' frame delay: ', meta.MetaItems[SMetaFrameDelay]); - try - f := meta.MetaItems[SMetaFrameDelay]; - if f < 0 then f := 0; - // rounding ;-) - c := f mod 28; - if c < 13 then c := 0 else c := 1; - f := (f div 28)+c; - if f < 1 then f := 1 else if f > 255 then f := 255; - _speed := f; - except - end; + //writeln(' frame delay: ', GlobalMetadata.MetaItems[SMetaFrameDelay]); + try + f := GlobalMetadata.MetaItems[SMetaFrameDelay]; + frdelay := f; + if f < 0 then f := 0; + // rounding ;-) + c := f mod 28; + if c < 13 then c := 0 else c := 1; + f := (f div 28)+c; + if f < 1 then f := 1 else if f > 255 then f := 255; + _speed := f; + except end; - if meta.HasMetaItem(SMetaAnimationLoops) then - begin - //writeln(' frame loop : ', meta.MetaItems[SMetaAnimationLoops]); - try - f := meta.MetaItems[SMetaAnimationLoops]; - if f <> 0 then _backanimation := true; - except - end; + end; + if GlobalMetadata.HasMetaItem(SMetaAnimationLoops) then + begin + //writeln(' frame loop : ', GlobalMetadata.MetaItems[SMetaAnimationLoops]); + try + f := GlobalMetadata.MetaItems[SMetaAnimationLoops]; + frloop := f; + if f <> 0 then _backanimation := true; // non-infinite looping == forth-and-back + except end; end; //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...'); //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height); - //e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d), %dx%d', [RecName, length(ia), _speed, _width, _height]), MSG_NOTIFY); + f := ord(_backanimation); + e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY); SetLength(Textures, Length(Textures)+1); // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê @@ -694,8 +666,6 @@ begin end; finally for f := 0 to High(ia) do FreeImage(ia[f]); - il.Free(); - //???meta.Free(); WAD.Free(); cfg.Free(); if TextureWAD <> nil then FreeMem(TextureWAD); diff --git a/src/game/g_options.pas b/src/game/g_options.pas index b308b04..c70af6d 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -103,7 +103,7 @@ implementation uses e_log, e_input, g_window, g_sound, g_gfx, g_player, Math, g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_textures, - g_items, GL, GLExt; + g_items, GL, GLExt, wadreader; procedure g_Options_SetDefault(); var @@ -335,7 +335,9 @@ begin gRevertPlayers := config.ReadBool('Game', 'RevertPlayers', False); gChatBubble := Min(Max(config.ReadInt('Game', 'ChatBubble', 4), 0), 4); gSFSDebug := config.ReadBool('Game', 'SFSDebug', False); + wadoptDebug := gSFSDebug; gSFSFastMode := config.ReadBool('Game', 'SFSFastMode', False); + wadoptFast := gSFSFastMode; // Ãåéìïëåé â ñâîåé èãðå gcMap := config.ReadStr('GameplayCustom', 'Map', ''); diff --git a/src/shared/wadreader.pas b/src/shared/wadreader.pas index 54e81b4..7aeef80 100644 --- a/src/shared/wadreader.pas +++ b/src/shared/wadreader.pas @@ -50,10 +50,15 @@ function g_ExtractFilePathName (resourceStr: AnsiString): AnsiString; function findDiskWad (fname: AnsiString): AnsiString; +var + wadoptDebug: Boolean = false; + wadoptFast: Boolean = false; + + implementation uses - SysUtils, Classes, BinEditor, e_log, g_options, utils, MAPSTRUCT; + SysUtils, Classes{, BinEditor}, e_log{, g_options}, utils, MAPSTRUCT; function findDiskWad (fname: AnsiString): AnsiString; @@ -368,7 +373,7 @@ begin {$ENDIF} result := true; {$IFDEF SFS_DWFAD_DEBUG} - if gSFSDebug then + if wadoptDebug then e_WriteLog(Format('DFWAD: file [%s] FOUND in [%s]; size is %d bytes', [name, fFileName, Len]), MSG_NOTIFY); {$ENDIF} exit; @@ -436,11 +441,11 @@ begin exit; end; {$IFDEF SFS_DWFAD_DEBUG} - if gSFSDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY); + if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY); {$ENDIF} // cache this wad try - if gSFSFastMode then + if wadoptFast then begin if not SFSAddDataFile(rfn, true) then exit; end @@ -455,7 +460,7 @@ begin if fIter = nil then Exit; fFileName := rfn; {$IFDEF SFS_DWFAD_DEBUG} - if gSFSDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY); + if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY); {$ENDIF} Result := True; end; -- 2.29.2