aboutsummaryrefslogtreecommitdiffstats
path: root/src/base/UTexture.pas
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-10-28 20:16:05 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-10-28 20:16:05 +0000
commit6585afce2ccd8e7c5ccb3bb3599d4723b00a0433 (patch)
tree463f04cca3f1a041569286559b2987698a457a54 /src/base/UTexture.pas
parent4025ea3e81b0d2ec4492f3a0b3e374ce1568bdf5 (diff)
downloadusdx-6585afce2ccd8e7c5ccb3bb3599d4723b00a0433.tar.gz
usdx-6585afce2ccd8e7c5ccb3bb3599d4723b00a0433.tar.xz
usdx-6585afce2ccd8e7c5ccb3bb3599d4723b00a0433.zip
some compiler warnings/hints removed
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1485 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/base/UTexture.pas')
-rw-r--r--src/base/UTexture.pas17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/base/UTexture.pas b/src/base/UTexture.pas
index 0f0117ff..4f33b78a 100644
--- a/src/base/UTexture.pas
+++ b/src/base/UTexture.pas
@@ -251,7 +251,6 @@ end;
function TTextureUnit.LoadTexture(const Identifier: string; Typ: TTextureType; Col: LongWord): TTexture;
var
TexSurface: PSDL_Surface;
- MipmapSurface: PSDL_Surface;
newWidth, newHeight: Cardinal;
oldWidth, oldHeight: Cardinal;
ActTex: GLuint;
@@ -299,7 +298,6 @@ begin
FitImage(TexSurface, newWidth, newHeight);
// at this point we have the image in memory...
- // scaled to be at most 1024x1024 pixels large
// scaled so that dimensions are powers of 2
// and converted to either RGB or RGBA
@@ -375,7 +373,6 @@ end;
function TTextureUnit.GetTexture(const Name: string; Typ: TTextureType; Col: LongWord; FromCache: boolean): TTexture;
var
TextureIndex: integer;
- CoverIndex: integer;
begin
if (Name = '') then
begin
@@ -386,18 +383,6 @@ begin
if (FromCache) then
begin
- (*
- // use cache texture
- CoverIndex := Covers.FindCover(Name);
-
- if TextureDatabase.Texture[TextureIndex].TextureCache.TexNum = 0 then
- begin
- // load texture
- Covers.PrepareData(Name);
- TextureDatabase.Texture[TextureIndex].TextureCache := CreateTexture(Covers.Data, Name, Covers.Cover[CoverIndex].Width, Covers.Cover[CoverIndex].Height, 24);
- end;
- *)
-
// use texture
TextureIndex := TextureDatabase.FindTexture(Name, Typ, Col);
if (TextureIndex > -1) then
@@ -432,7 +417,7 @@ end;
function TTextureUnit.CreateTexture(Data: PChar; const Name: string; Width, Height: word; BitsPerPixel: byte): TTexture;
var
- Error: integer;
+ //Error: integer;
ActTex: GLuint;
begin
glGenTextures(1, @ActTex); // ActText = new texture number