index 5958e93b498f15d27a74e878e4850d32bb835942..7d8ad75283212881d9f40d4963ab75de5ef27b1c 100644 (file)
--- a/src/game/g_textures.pas
+++ b/src/game/g_textures.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
function g_Texture_CreateWAD (var ID: LongWord; const Resource: AnsiString): Boolean;
function g_Texture_CreateFile (var ID: LongWord; const FileName: AnsiString): Boolean;
-function g_Texture_CreateWADEx (const textureName, Resource: AnsiString; const altrsrc: AnsiString=''): Boolean;
+function g_Texture_CreateWADEx (const textureName, Resource: AnsiString): Boolean;
function g_Texture_CreateFileEx (const textureName, FileName: AnsiString): Boolean;
function g_Texture_Get (const textureName: AnsiString; var ID: LongWord): Boolean;
+function g_Texture_GetSize (const textureName: AnsiString; var w, h: Integer): Boolean; overload;
+function g_Texture_GetSize (ID: LongWord; var w, h: Integer): Boolean; overload;
procedure g_Texture_Delete (const textureName: AnsiString);
procedure g_Texture_DeleteAll ();
implementation
uses
+ {$INCLUDE ../nogl/noGLuses.inc}
g_game, e_log, g_basic, g_console, wadreader,
- g_language, GL, utils, xstreams;
+ g_language, utils, xstreams;
type
_TTexture = record
if WAD.GetResource(g_ExtractFilePathName(Resource), TextureData, ResourceLength) then
begin
if e_CreateTextureMem(TextureData, ResourceLength, ID) then
- begin
result := true;
- end
- else
- begin
- FreeMem(TextureData);
- end;
+ FreeMem(TextureData)
end
else
begin
end;
-function texture_CreateWADExInternal (const textureName, Resource: AnsiString; showmsg: Boolean): Boolean;
+function g_Texture_CreateWADEx (const textureName, Resource: AnsiString): Boolean;
var
WAD: TWADFile;
FileName: AnsiString;
e_GetTextureSize(texturesArray[find_id].ID, @texturesArray[find_id].width, @texturesArray[find_id].height);
texturesArray[find_id].used := true;
texturesArray[find_id].Name := textureName;
- end
- else
- begin
- FreeMem(TextureData);
end;
+ FreeMem(TextureData)
end
else
begin
- if showmsg then
- begin
- e_WriteLog(Format('Error loading texture %s', [Resource]), TMsgType.Warning);
- end;
+ e_WriteLog(Format('Error loading texture %s', [Resource]), TMsgType.Warning);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
result := false;
end;
end;
-function g_Texture_CreateWADEx (const textureName, Resource: AnsiString; const altrsrc: AnsiString=''): Boolean;
-begin
- if (Length(altrsrc) > 0) then
- begin
- result := texture_CreateWADExInternal(textureName, altrsrc, false);
- if result then exit;
- end;
- result := texture_CreateWADExInternal(textureName, Resource, true);
-end;
-
-
function g_Texture_CreateFileEx (const textureName, FileName: AnsiString): Boolean;
var
find_id: LongWord;
end;
+function g_Texture_GetSize (const textureName: AnsiString; var w, h: Integer): Boolean; overload;
+var
+ a: Integer;
+begin
+ result := false;
+ w := 0;
+ h := 0;
+ if (Length(texturesArray) = 0) or (Length(textureName) = 0) then exit;
+ for a := 0 to High(texturesArray) do
+ begin
+ if (StrEquCI1251(texturesArray[a].name, textureName)) then
+ begin
+ w := texturesArray[a].width;
+ h := texturesArray[a].height;
+ result := true;
+ break;
+ end;
+ end;
+end;
+
+
+function g_Texture_GetSize (ID: LongWord; var w, h: Integer): Boolean; overload;
+var
+ a: Integer;
+begin
+ result := false;
+ w := 0;
+ h := 0;
+ if (Length(texturesArray) = 0) then exit;
+ for a := 0 to High(texturesArray) do
+ begin
+ if (texturesArray[a].id = ID) then
+ begin
+ w := texturesArray[a].width;
+ h := texturesArray[a].height;
+ result := true;
+ break;
+ end;
+ end;
+end;
+
+
procedure g_Texture_Delete (const textureName: AnsiString);
var
a: Integer;
if not CreateFramesMem(TextureData, ResourceLength, ID, Name, mWidth, mHeight, mCount, BackAnimation) then
begin
+ FreeMem(TextureData);
WAD.Free();
exit;
end;
+ FreeMem(TextureData);
WAD.Free();
result := true;
constructor TAnimation.Create (aframesID: LongWord; aloop: Boolean; aspeed: Byte);
begin
- if (aframesID >= Length(framesArray)) then raise Exception.Create('trying to create inexisting frame: something is very wrong here');
+ if (aframesID >= Length(framesArray)) then
+ begin
+ //raise Exception.Create('trying to create inexisting frame: something is very wrong here');
+ e_LogWritefln('trying to create inexisting frame %u of %u: something is very wrong here', [aframesID, LongWord(Length(framesArray))], TMsgType.Warning);
+ aframesID := 0;
+ if (Length(framesArray) = 0) then raise Exception.Create('trying to create inexisting frame: something is very wrong here');
+ end;
mId := aframesID;
mMinLength := 0;
mLoop := aloop;