X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_textures.pas;h=1c470fa6b3fe997e483e451bbaa4b9a19ab42c1e;hb=ff104a8cdc79693b7546d839605ec73ae135d904;hp=504b3fb0cb07af035fbaff8068c022066bab9d87;hpb=5c5095104dd746b4bb39c30e3971fa4388955ab5;p=d2df-sdl.git diff --git a/src/engine/e_textures.pas b/src/engine/e_textures.pas index 504b3fb..1c470fa 100644 --- a/src/engine/e_textures.pas +++ b/src/engine/e_textures.pas @@ -13,8 +13,8 @@ var fUseMipmaps: Boolean = False; TEXTUREFILTER: Integer = GL_NEAREST; -function CreateTexture( Width, Height, Format: Word; pData: Pointer ): Integer; - +function CreateTexture( Width, Height, Format: Word; pData: Pointer ): Integer; + // Standard set of images loading functions function LoadTexture( Filename: String; var Texture: GLuint; var pWidth, pHeight: Word; Fmt: PWord = nil ): Boolean; @@ -83,7 +83,7 @@ begin glTexImage2D( GL_TEXTURE_2D, 0, 3, Width, Height, 0, GL_RGB, GL_UNSIGNED_BYTE, pData ); end; - + glBindTexture(GL_TEXTURE_2D, 0); Result := Texture; @@ -150,11 +150,11 @@ begin TFmt := GL_RGB else TFmt := GL_RGBA; - + Texture := CreateTexture( Width, Height, TFmt, Image ); FreeMem( Image ); - + if Fmt <> nil then Fmt^ := TFmt; pWidth := Width; @@ -241,12 +241,12 @@ begin TFmt := GL_RGB else TFmt := GL_RGBA; - + Texture := CreateTexture( fWidth, fHeight, TFmt, Image ); FreeMem( Image ); FreeMem( Image2 ); - + if Fmt <> nil then Fmt^ := TFmt; Result := True; @@ -334,11 +334,11 @@ begin TFmt := GL_RGB else TFmt := GL_RGBA; - + Texture := CreateTexture( Width, Height, TFmt, Image ); FreeMem( Image ); - + if Fmt <> nil then Fmt^ := TFmt; pWidth := Width; @@ -362,7 +362,7 @@ var BPP: Byte; Base: PByte; TFmt: Word; - + begin Result := False; @@ -450,4 +450,3 @@ begin end; end. -