index 4db41dc091005e56b554d52f581c6fc822130758..e4ffca316d70101e641265c4ac13eeb2f9a9f228 100644 (file)
--- a/src/engine/e_texture.pas
+++ b/src/engine/e_texture.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
*
* 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
interface
uses
interface
uses
- GL, GLExt, SysUtils, e_log,
- ImagingTypes, Imaging, ImagingUtility;
+ {$INCLUDE ../nogl/noGLuses.inc}
+ SysUtils, e_log, ImagingTypes, Imaging, ImagingUtility;
type
GLTexture = record
type
GLTexture = record
glBindTexture(GL_TEXTURE_2D, Texture);
if (tex.glwidth <> tex.width) or (tex.glheight <> tex.height) then
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);
+ 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]), TMsgType.Notify);
// texture blends with object background
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
// texture blends with object background
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then
begin
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);
+ e_WriteLog('Error loading texture: invalid image dimensions', TMsgType.Warning);
exit;
end;
//ConvertImage(img, ifA8R8G8B8);
exit;
end;
//ConvertImage(img, ifA8R8G8B8);
InitImage(img);
if not LoadImageFromMemory(pData, dataSize, img) then
begin
InitImage(img);
if not LoadImageFromMemory(pData, dataSize, img) then
begin
- e_WriteLog('Error loading texture: unknown image format', MSG_WARNING);
+ e_WriteLog('Error loading texture: unknown image format', TMsgType.Warning);
exit;
end;
try
exit;
end;
try
InitImage(img);
if not LoadImageFromMemory(pData, dataSize, img) then
begin
InitImage(img);
if not LoadImageFromMemory(pData, dataSize, img) then
begin
- e_WriteLog('Error loading texture: unknown image format', MSG_WARNING);
+ e_WriteLog('Error loading texture: unknown image format', TMsgType.Warning);
exit;
end;
try
if (img.width < 1) or (img.width > 32768) or (img.height < 1) or (img.height > 32768) then
begin
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);
+ e_WriteLog('Error loading texture: invalid image dimensions', TMsgType.Warning);
exit;
end;
//ConvertImage(img, ifA8R8G8B8);
exit;
end;
//ConvertImage(img, ifA8R8G8B8);
end;
if fs = nil then
begin
end;
if fs = nil then
begin
- e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING);
+ e_WriteLog('Texture "'+filename+'" not found', TMsgType.Warning);
exit;
end;
exit;
end;
end;
if fs = nil then
begin
end;
if fs = nil then
begin
- e_WriteLog('Texture "'+filename+'" not found', MSG_WARNING);
+ e_WriteLog('Texture "'+filename+'" not found', TMsgType.Warning);
exit;
end;
exit;
end;