memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

PUSH - Ajout section ÉQUIPEMENT/ARME pour le HUD. +1 texture (gun01.png).

Browse Source
This commit is contained in:
Mathieu Duval
2023-09-16 00:12:14 -04:00
parent 8faa67596e
commit 54ae0b087a
6 changed files with 98 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SQCSim2021/texture.cpp
View File

@@ -13,8 +13,7 @@ Texture::~Texture()
glDeleteTextures(1, &m_textureId);
}
bool Texture::Load(const std::string& filename)
bool Texture::Load(const std::string& filename, bool useMipMaps)
{
// Initialize Devil only once:
static bool alreadyInitialized = false;
@@ -42,8 +41,14 @@ bool Texture::Load(const std::string& filename)
glGenTextures(1, &m_textureId);
glBindTexture(GL_TEXTURE_2D, m_textureId);
gluBuild2DMipmaps(GL_TEXTURE_2D, 4, ilGetInteger(IL_IMAGE_WIDTH), ilGetInteger(IL_IMAGE_HEIGHT), ilGetInteger(IL_IMAGE_FORMAT), GL_UNSIGNED_BYTE, ilGetData());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
if (useMipMaps) {
gluBuild2DMipmaps(GL_TEXTURE_2D, 4, ilGetInteger(IL_IMAGE_WIDTH), ilGetInteger(IL_IMAGE_HEIGHT), ilGetInteger(IL_IMAGE_FORMAT), GL_UNSIGNED_BYTE, ilGetData());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
}
else {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ilGetInteger(IL_IMAGE_WIDTH), ilGetInteger(IL_IMAGE_HEIGHT), 0, ilGetInteger(IL_IMAGE_FORMAT), GL_UNSIGNED_BYTE, ilGetData());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
ilDeleteImages(1, &texid);