X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_textures.pas;h=53ad6c64ee378ac6512170b2cb32243ec289b18c;hb=8558702f560e3faf9be93f96dfffbf4b6ba34c90;hp=e53a3ef263fdd9033c454fe49b70b929c0f74685;hpb=ac201b02f10ef558087d50f6b03b4519ab567558;p=d2df-sdl.git diff --git a/src/engine/e_textures.pas b/src/engine/e_textures.pas index e53a3ef..53ad6c6 100644 --- a/src/engine/e_textures.pas +++ b/src/engine/e_textures.pas @@ -1,3 +1,18 @@ +(* 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) {$MODE DELPHI} unit e_textures; @@ -8,7 +23,8 @@ unit e_textures; interface uses - GL, GLExt, SysUtils, e_log; + GL, GLExt, SysUtils, e_log, + ImagingTypes, Imaging, ImagingUtility; type GLTexture = record @@ -16,30 +32,29 @@ type width, height: Word; // real glwidth, glheight: Word; // powerof2 u, v: Single; // usually 1.0 + fmt: GLuint; end; var e_DummyTextures: Boolean = False; TEXTUREFILTER: Integer = GL_NEAREST; -function CreateTexture(var tex: GLTexture; Width, Height, aFormat: Word; pData: Pointer ): Boolean; +function CreateTexture (var tex: GLTexture; Width, Height, aFormat: Word; pData: Pointer): Boolean; // Standard set of images loading functions -function LoadTexture( Filename: String; var Texture: GLTexture; - var pWidth, pHeight: Word; Fmt: PWord = nil ): Boolean; - -function LoadTextureEx( Filename: String; var Texture: GLTexture; - fX, fY, fWidth, fHeight: Word; Fmt: PWord = nil ): Boolean; +function LoadTexture (Filename: String; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; +function LoadTextureEx (Filename: String; var Texture: GLTexture; fX, fY, fWidth, fHeight: Word; Fmt: PWord=nil): Boolean; +function LoadTextureMem (pData: Pointer; dataSize: LongInt; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; +function LoadTextureMemEx (pData: Pointer; dataSize: LongInt; var Texture: GLTexture; fX, fY, fWidth, fHeight: Word; Fmt: PWord=nil): Boolean; -function LoadTextureMem( pData: Pointer; var Texture: GLTexture; - var pWidth, pHeight: Word; Fmt: PWord = nil ): Boolean; +// `img` must be valid! +function LoadTextureImg (var img: TImageData; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; -function LoadTextureMemEx( pData: Pointer; var Texture: GLTexture; - fX, fY, fWidth, fHeight: Word; Fmt: PWord = nil ): Boolean; implementation -uses BinEditor, g_options; +uses + Classes, BinEditor, g_options, utils; function AlignP2 (n: Word): Word; @@ -55,46 +70,31 @@ begin end; -type - TTGAHeader = packed record - FileType: Byte; - ColorMapType: Byte; - ImageType: Byte; - ColorMapSpec: array[0..4] of Byte; - OrigX: array[0..1] of Byte; - OrigY: array[0..1] of Byte; - Width: array[0..1] of Byte; - Height: array[0..1] of Byte; - BPP: Byte; - ImageInfo: Byte; - end; - // This is auxiliary function that creates OpenGL texture from raw image data function CreateTexture (var tex: GLTexture; Width, Height, aFormat: Word; pData: Pointer): Boolean; var Texture: GLuint; + fmt: GLenum; + buf: PByte; + f, c: Integer; begin tex.width := Width; tex.height := Height; + tex.glwidth := Width; + tex.glheight := Height; + tex.u := 1; + tex.v := 1; + if glLegacyNPOT then begin tex.glwidth := AlignP2(Width); tex.glheight := AlignP2(Height); - end - else - begin - tex.glwidth := Width; - tex.glheight := Height; + if tex.glwidth <> tex.width then tex.u := (tex.width+0.0)/(tex.glwidth+0.0); + if tex.glheight <> tex.height then tex.v := (tex.height+0.0)/(tex.glheight+0.0); end; - tex.u := 1; - tex.v := 1; - if tex.glwidth <> tex.width then tex.u := (tex.width+0.0)/(tex.glwidth+0.0); - if tex.glheight <> tex.height then tex.v := (tex.height+0.0)/(tex.glheight+0.0); - if (tex.glwidth <> tex.width) or (tex.glheight <> tex.height) then - begin - e_WriteLog(Format('NPOT: orig is %ux%u; gl is %ux%u; u=%f; v=%f', [Width, Height, tex.glwidth, tex.glheight, tex.u, tex.v]), MSG_NOTIFY); - end; + //if (tex.glwidth <> tex.width) or (tex.glheight <> tex.height) then + // e_WriteLog(Format('NPOT: orig is %ux%u; gl is %ux%u; u=%f; v=%f', [Width, Height, tex.glwidth, tex.glheight, tex.u, tex.v]), MSG_NOTIFY); if e_DummyTextures then begin @@ -107,6 +107,9 @@ begin tex.id := Texture; glBindTexture(GL_TEXTURE_2D, Texture); + if (tex.glwidth <> tex.width) or (tex.glheight <> tex.height) then + e_WriteLog(Format('NPOT: %u is %ux%u; gl is %ux%u; u=%f; v=%f', [tex.id, Width, Height, tex.glwidth, tex.glheight, tex.u, tex.v]), MSG_NOTIFY); + // texture blends with object background glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // texture does NOT blend with object background @@ -128,414 +131,244 @@ begin glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, TEXTUREFILTER); // create empty texture - if aFormat = GL_RGBA then - begin - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.glwidth, tex.glheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nil); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, pData); - end - else - begin - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tex.glwidth, tex.glheight, 0, GL_RGB, GL_UNSIGNED_BYTE, nil); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, Width, Height, GL_RGB, GL_UNSIGNED_BYTE, pData); - end; - - // the following is ok too - //bindTexture(0); - //glTextureSubImage2D(tid, 0, 0, 0, img.width, img.height, GL_RGBA, GL_UNSIGNED_BYTE, img.imageData.bytes.ptr); - - { - if (tex.glwidth = tex.glwidth) and (tex.glheight = tex.height) then - // easy case - if aFormat = GL_RGBA then + if aFormat = GL_RGBA then fmt := GL_RGBA else fmt := GL_RGB; // silly, yeah? + glTexImage2D(GL_TEXTURE_2D, 0, fmt, tex.glwidth, tex.glheight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nil); + + (* + GetMem(buf, tex.glwidth*4*tex.glheight); + try + FillChar(buf^, tex.glwidth*4*tex.glheight, 255); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tex.glwidth, tex.glheight, fmt, GL_UNSIGNED_BYTE, buf); + if (tex.glheight = 128) and (tex.height = 80) then begin - glTexImage2D(GL_TEXTURE_2D, 0, 4, Width, Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pData); - end - else - begin - glTexImage2D(GL_TEXTURE_2D, 0, 3, Width, Height, 0, GL_RGB, GL_UNSIGNED_BYTE, pData); + for f := 0 to tex.glheight-1 do + begin + for c := 0 to tex.glwidth-1 do + begin + buf[f*(tex.glwidth*4)+c*4+0] := 255; + buf[f*(tex.glwidth*4)+c*4+1] := 127; + buf[f*(tex.glwidth*4)+c*4+2] := 0; + end; + end; + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 82, tex.glwidth, {tex.glheight}1, fmt, GL_UNSIGNED_BYTE, buf); end; - end - } + finally + FreeMem(buf); + end; + *) + + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, Width, Height, fmt, GL_UNSIGNED_BYTE, pData); + //glTexSubImage2D(GL_TEXTURE_2D, 0, 0, tex.glheight-tex.height, Width, Height, fmt, GL_UNSIGNED_BYTE, pData); glBindTexture(GL_TEXTURE_2D, 0); Result := true; end; -function LoadTextureMem( pData: Pointer; var Texture: GLTexture; - var pWidth, pHeight: Word; Fmt: PWord = nil ): Boolean; +// `img` must be valid! +function LoadTextureImg (var img: TImageData; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; var - TGAHeader: TTGAHeader; - image: Pointer; - Width, Height: Integer; - ImageSize: Integer; - i: Integer; - Front: ^Byte; - Back: ^Byte; - Temp: Byte; - BPP: Byte; - TFmt: Word; - + image, ii: PByte; + width, height: Integer; + imageSize: Integer; + x, y: Integer; + clr: TColor32Rec; begin - Result := False; + result := false; pWidth := 0; pHeight := 0; + if Fmt <> nil then Fmt^ := GL_RGBA; // anyway - CopyMemory( @TGAHeader, pData, SizeOf(TGAHeader) ); - - if ( TGAHeader.ImageType <> 2 ) then - begin - e_WriteLog( 'Error loading texture: Bad ImageType', MSG_WARNING ); - Exit; - end; - - if ( TGAHeader.ColorMapType <> 0 ) then - begin - e_WriteLog( 'Error loading texture: Bad ColorMapType', MSG_WARNING ); - Exit; - end; - - if ( TGAHeader.BPP < 24 ) then - begin - e_WriteLog( 'Error loading texture: BPP less than 24', MSG_WARNING ); - Exit; - end; - - if (TGAHeader.ImageInfo and $c0) <> 0 then + if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then begin - e_WriteLog('Error loading texture: interleaved TGA', MSG_WARNING); - Exit; + e_WriteLog('Error loading texture: invalid image dimensions', MSG_WARNING); + exit; end; - - Width := TGAHeader.Width[0] + TGAHeader.Width[1] * 256; - Height := TGAHeader.Height[0] + TGAHeader.Height[1] * 256; - BPP := TGAHeader.BPP; - - ImageSize := Width * Height * (BPP div 8); - - GetMem( Image, ImageSize ); - CopyMemory( Image, PByte(pData) + SizeOf(TGAHeader), ImageSize ); - - for i := 0 to Width * Height - 1 do - begin - Front := PByte(Image) + i*(BPP div 8); - Back := PByte(Image) + i*(BPP div 8) + 2; - Temp := Front^; - Front^ := Back^; - Back^ := Temp; + //ConvertImage(img, ifA8R8G8B8); + width := img.width; + height := img.height; + pWidth := width; + pHeight := height; + imageSize := Width*Height*4; + GetMem(image, imageSize); + try + // it's slow, but i don't care for now + ii := image; + for y := height-1 downto 0 do + begin + for x := 0 to width-1 do + begin + clr := GetPixel32(img, x, y); + ii^ := clr.r; Inc(ii); + ii^ := clr.g; Inc(ii); + ii^ := clr.b; Inc(ii); + ii^ := clr.a; Inc(ii); + end; + end; + CreateTexture(Texture, width, height, GL_RGBA, image); + result := true; + finally + FreeMem(image); end; - - //if (TGAHeader.ImageInfo and $20) <> 0 then UpsideDown(Image, Width, Height); - - if ( BPP = 24 ) then - TFmt := GL_RGB - else - TFmt := GL_RGBA; - - CreateTexture(Texture, Width, Height, TFmt, Image ); - - FreeMem( Image ); - - if Fmt <> nil then Fmt^ := TFmt; - - pWidth := Width; - pHeight := Height; - - Result := True; end; -function LoadTextureMemEx( pData: Pointer; var Texture: GLTexture; - fX, fY, fWidth, fHeight: Word; Fmt: PWord = nil ): Boolean; -var - TGAHeader: TTGAHeader; - image, image2: Pointer; - Width, Height: Integer; - ImageSize: Integer; - i, a, b: Integer; - Front: ^Byte; - Back: ^Byte; - Temp: Byte; - BPP: Byte; - Base: PByte; - TFmt: Word; +function LoadTextureMem (pData: Pointer; dataSize: LongInt; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; +var + image, ii: PByte; + width, height: Integer; + imageSize: Integer; + img: TImageData; + x, y: Integer; + clr: TColor32Rec; begin - Result := False; - - CopyMemory( @TGAHeader, pData, SizeOf(TGAHeader) ); - - if ( TGAHeader.ImageType <> 2 ) then - begin - e_WriteLog( 'Error loading texture: Bad ImageType', MSG_WARNING ); - Exit; - end; + result := false; + pWidth := 0; + pHeight := 0; + if Fmt <> nil then Fmt^ := GL_RGBA; // anyway - if ( TGAHeader.ColorMapType <> 0 ) then + InitImage(img); + if not LoadImageFromMemory(pData, dataSize, img) then begin - e_WriteLog( 'Error loading texture: Bad ColorMapType', MSG_WARNING ); - Exit; + e_WriteLog('Error loading texture: unknown image format', MSG_WARNING); + exit; end; - - if ( TGAHeader.BPP < 24 ) then - begin - e_WriteLog( 'Error loading texture: BPP less than 24', MSG_WARNING ); - Exit; + try + result := LoadTextureImg(img, Texture, pWidth, pHeight, Fmt); + finally + FreeImage(img); end; +end; - if (TGAHeader.ImageInfo and $c0) <> 0 then - begin - e_WriteLog('Error loading texture: interleaved TGA', MSG_WARNING); - Exit; - end; - - Width := TGAHeader.Width[0] + TGAHeader.Width[1] * 256; - Height := TGAHeader.Height[0] + TGAHeader.Height[1] * 256; - BPP := TGAHeader.BPP; - - if fX > Width then Exit; - if fY > Height then Exit; - if fX+fWidth > Width then Exit; - if fY+fHeight > Height then Exit; - - ImageSize := Width * Height * (BPP div 8); - GetMem( Image2, ImageSize ); - CopyMemory( Image2, PByte(pData) + SizeOf(TGAHeader), ImageSize ); - a := BPP div 8; +function LoadTextureMemEx (pData: Pointer; dataSize: LongInt; var Texture: GLTexture; fX, fY, fWidth, fHeight: Word; Fmt: PWord=nil): Boolean; +var + image, ii: PByte; + width, height: Integer; + imageSize: Integer; + img: TImageData; + x, y: Integer; + clr: TColor32Rec; +begin + result := false; + if Fmt <> nil then Fmt^ := GL_RGBA; // anyway - for i := 0 to Width * Height - 1 do + InitImage(img); + if not LoadImageFromMemory(pData, dataSize, img) then begin - Front := PByte(Image2) + i * a; - Back := PByte(Image2) + i * a + 2; - Temp := Front^; - Front^ := Back^; - Back^ := Temp; + e_WriteLog('Error loading texture: unknown image format', MSG_WARNING); + exit; + end; + try + if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then + begin + e_WriteLog('Error loading texture: invalid image dimensions', MSG_WARNING); + exit; + end; + //ConvertImage(img, ifA8R8G8B8); + if fX > img.width then exit; + if fY > img.height then exit; + if fX+fWidth > img.width then exit; + if fY+fHeight > img.height then exit; + //writeln('fX=', fX, '; fY=', fY, '; fWidth=', fWidth, '; fHeight=', fHeight); + imageSize := img.width*img.height*4; + GetMem(image, imageSize); + try + // it's slow, but i don't care for now + ii := image; + for y := fY+fHeight-1 downto fY do + begin + for x := fX to fX+fWidth-1 do + begin + clr := GetPixel32(img, x, y); + ii^ := clr.r; Inc(ii); + ii^ := clr.g; Inc(ii); + ii^ := clr.b; Inc(ii); + ii^ := clr.a; Inc(ii); + end; + end; + CreateTexture(Texture, fWidth, fHeight, GL_RGBA, image); + result := true; + finally + FreeMem(image); + end; + finally + FreeImage(img); end; - - fY := Height - (fY + fHeight); - - ImageSize := fHeight * fWidth * (BPP div 8); - GetMem( Image, ImageSize ); - - Base := PByte( Image2 ) + fY * Width * (BPP div 8) + fX * (BPP div 8); - a := fWidth * (BPP div 8); - b := Width * (BPP div 8); - - for i := 0 to fHeight-1 do - CopyMemory( PByte(image) + a*i, Base + b*i, a ); - - //if (TGAHeader.ImageInfo and $20) <> 0 then UpsideDown(Image, Width, Height); - - if ( BPP = 24 ) then - TFmt := GL_RGB - else - TFmt := GL_RGBA; - - CreateTexture(Texture, fWidth, fHeight, TFmt, Image ); - - FreeMem( Image ); - FreeMem( Image2 ); - - if Fmt <> nil then Fmt^ := TFmt; - - Result := True; end; -function LoadTexture( Filename: String; var Texture: GLTexture; - var pWidth, pHeight: Word; Fmt: PWord = nil ): Boolean; -var - TGAHeader: TTGAHeader; - TGAFile: File; - bytesRead: Integer; - image: Pointer; - Width, Height: Integer; - ImageSize: Integer; - i: Integer; - Front: ^Byte; - Back: ^Byte; - Temp: Byte; - BPP: Byte; - TFmt: Word; +function LoadTexture (filename: AnsiString; var Texture: GLTexture; var pWidth, pHeight: Word; Fmt: PWord=nil): Boolean; +var + fs: TStream; + img: Pointer; + imageSize: LongInt; begin - Result := False; + result := False; pWidth := 0; pHeight := 0; + if Fmt <> nil then Fmt^ := GL_RGBA; // anyway + fs := nil; - if not FileExists(Filename) then - begin - e_WriteLog('Texture ' + Filename + ' not found', MSG_WARNING); - Exit; + try + fs := openDiskFileRO(filename); + except + fs := nil; end; - - AssignFile( TGAFile, Filename ); - Reset( TGAFile, 1 ); - BlockRead( TGAFile, TGAHeader, SizeOf(TGAHeader) ); - - if ( TGAHeader.ImageType <> 2 ) then + if fs = nil then begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: Bad ImageType', MSG_WARNING ); - Exit; - end; - - if ( TGAHeader.ColorMapType <> 0 ) then - begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: Bad ColorMapType', MSG_WARNING ); - Exit; + e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING); + exit; end; - if ( TGAHeader.BPP < 24 ) then - begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: BPP less than 24', MSG_WARNING ); - Exit; - end; - - Width := TGAHeader.Width[0] + TGAHeader.Width[1] * 256; - Height := TGAHeader.Height[0] + TGAHeader.Height[1] * 256; - BPP := TGAHeader.BPP; - - ImageSize := Width * Height * (BPP div 8); - - GetMem( Image, ImageSize ); - - BlockRead( TGAFile, image^, ImageSize, bytesRead ); - if ( bytesRead <> ImageSize ) then - begin - CloseFile( TGAFile ); - Exit; - end; - - CloseFile( TGAFile ); - - for i := 0 to Width * Height - 1 do - begin - Front := PByte(Image) + i * (BPP div 8); - Back := PByte(Image) + i * (BPP div 8) + 2; - Temp := Front^; - Front^ := Back^; - Back^ := Temp; + try + imageSize := fs.size; + GetMem(img, imageSize); + try + fs.readBuffer(img^, imageSize); + result := LoadTextureMem(img, imageSize, Texture, pWidth, pHeight, Fmt); + finally + FreeMem(img); + end; + finally + fs.Free(); end; - - if ( BPP = 24 ) then - TFmt := GL_RGB - else - TFmt := GL_RGBA; - - CreateTexture(Texture, Width, Height, TFmt, Image ); - - FreeMem( Image ); - - if Fmt <> nil then Fmt^ := TFmt; - - pWidth := Width; - pHeight := Height; - - Result := True; end; -function LoadTextureEx( Filename: String; var Texture: GLTexture; - fX, fY, fWidth, fHeight: Word; Fmt: PWord = nil ): Boolean; -var - TGAHeader: TTGAHeader; - TGAFile: File; - image, image2: Pointer; - Width, Height: Integer; - ImageSize: Integer; - i: Integer; - Front: ^Byte; - Back: ^Byte; - Temp: Byte; - BPP: Byte; - Base: PByte; - TFmt: Word; +function LoadTextureEx (filename: AnsiString; var Texture: GLTexture; fX, fY, fWidth, fHeight: Word; Fmt: PWord=nil): Boolean; +var + fs: TStream; + img: Pointer; + imageSize: LongInt; begin - Result := False; - - if not FileExists(Filename) then - begin - e_WriteLog( 'Texture ' + Filename + ' not found', MSG_WARNING ); - Exit; - end; - - AssignFile( TGAFile, Filename ); - Reset( TGAFile, 1 ); - BlockRead( TGAFile, TGAHeader, SizeOf(TGAHeader) ); - - if ( TGAHeader.ImageType <> 2 ) then - begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: Bad ImageType', MSG_WARNING ); - Exit; + result := False; + if Fmt <> nil then Fmt^ := GL_RGBA; // anyway + fs := nil; + + try + fs := openDiskFileRO(filename); + except + fs := nil; end; - - if ( TGAHeader.ColorMapType <> 0 ) then + if fs = nil then begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: Bad ColorMapType', MSG_WARNING ); - Exit; + e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING); + exit; end; - if ( TGAHeader.BPP < 24 ) then - begin - CloseFile( TGAFile ); - e_WriteLog( 'Error loading texture: BPP less than 24', MSG_WARNING ); - Exit; - end; - - Width := TGAHeader.Width[0] + TGAHeader.Width[1] * 256; - Height := TGAHeader.Height[0] + TGAHeader.Height[1] * 256; - BPP := TGAHeader.BPP; - - if fX > Width then Exit; - if fY > Height then Exit; - if fX+fWidth > Width then Exit; - if fY+fHeight > Height then Exit; - - ImageSize := Width * Height * (BPP div 8); - GetMem( Image2, ImageSize ); - BlockRead( TGAFile, Image2^, ImageSize ); - - CloseFile( TGAFile ); - - for i := 0 to Width * Height - 1 do - begin - Front := PByte(Image2) + i * (BPP div 8); - Back := PByte(Image2) + i * (BPP div 8) + 2; - Temp := Front^; - Front^ := Back^; - Back^ := Temp; - end; - - fY := Height - (fY + fHeight); - - ImageSize := fHeight * fWidth * (BPP div 8); - GetMem( Image, ImageSize ); - - Base := PByte(Image2) + fY * Width * (BPP div 8) + fX * (BPP div 8); - - for i := 0 to fHeight-1 do - begin - CopyMemory( PByte(image) + fWidth * (BPP div 8) * i, - Base + Width * (BPP div 8) * i, fWidth * (BPP div 8) ); + try + imageSize := fs.size; + GetMem(img, imageSize); + try + fs.readBuffer(img^, imageSize); + result := LoadTextureMemEx(img, imageSize, Texture, fX, fY, fWidth, fHeight, Fmt); + finally + FreeMem(img); + end; + finally + fs.Free(); end; - - if ( BPP = 24 ) then - TFmt := GL_RGB - else - TFmt := GL_RGBA; - - CreateTexture(Texture, fWidth, fHeight, TFmt, Image ); - - FreeMem( Image ); - FreeMem( Image2 ); - - if Fmt <> nil then Fmt^ := TFmt; - - Result := True; end; end.