Macintosh-Tools/Pomme
1
0
Fork 0
mirror of https://github.com/jorio/Pomme.git synced 2024-11-23 06:32:14 +00:00
Code Issues Projects Releases Wiki Activity

QD3D: Remove glTextureName from TQ3Pixmap

Browse Source
This commit is contained in:
Iliyas Jorio 2021-06-23 20:55:15 +02:00
parent 3675306be7
commit f1c5bbae35
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/QD3D/3DMFParser.cpp
View File

@ -515,7 +515,6 @@ uint32_t Q3MetaFileParser::Parse_txmm_or_txpm(uint32_t chunkType, uint32_t chunk
metaFile.textures[newTextureID] = __Q3Alloc<TQ3Pixmap>(1, 'PXMP');
TQ3Pixmap& texture = *metaFile.textures[newTextureID];
texture.glTextureName = 0;
texture.pixelType = pixelType;
texture.bitOrder = bitOrder;
texture.byteOrder = byteOrder;

4
src/QD3D/QD3D.cpp
View File

@ -36,11 +36,7 @@ void Q3MetaFile_Dispose(TQ3MetaFile* metaFile)
__Q3GetCookie(metaFile, '3DMF');
for (int i = 0; i < metaFile->numTextures; i++)
{
if (metaFile->textures[i]->glTextureName)
glDeleteTextures(1, &metaFile->textures[i]->glTextureName);
Q3Pixmap_Dispose(metaFile->textures[i]);
}
for (int i = 0; i < metaFile->numMeshes; i++)
Q3TriMeshData_Dispose(metaFile->meshes[i]);

2
src/QD3D/QD3D.h
View File

@ -306,7 +306,6 @@ typedef struct TQ3CameraPlacement
TQ3Vector3D upVector;
} TQ3CameraPlacement;
// WARNING: this structure differs from QD3D.
typedef struct TQ3Pixmap
{
uint8_t *image;
@ -317,7 +316,6 @@ typedef struct TQ3Pixmap
uint32_t pixelType;
uint32_t bitOrder;
uint32_t byteOrder;
uint32_t glTextureName;
} TQ3Pixmap;
// WARNING: this structure does not exist in QD3D.