trotFunky/OpenGL-JIN
1
0
Fork 0
Code Releases Activity

Moved OpenGL texture generation to the Texture class

Browse source
This commit is contained in:
Teo-CD 2019-11-03 15:50:37 +01:00
parent d0b533608a
commit 37e525d6ee
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
example/main.cpp
View file

@ -103,17 +103,9 @@ int main(int argc, char** argv)
// Load and generate tree texture
tree_texture.load_rgba_tga("resources/arbre.tga","resources/arbre_masque.tga");
glGenTextures(1,tree_texture.opengl_id);
// TODO : Put in the Texture class
glBindTexture(GL_TEXTURE_2D,tree_texture.opengl_id[0]);
gluBuild2DMipmaps(GL_TEXTURE_2D,GL_RGBA8,tree_texture.width,tree_texture.height,GL_RGBA,GL_UNSIGNED_BYTE,tree_texture.image_data);
// Load and generate raptor texture
raptor_texture.load_rgb_tga("resources/RAPTOR.tga");
glGenTextures(1, raptor_texture.opengl_id);
// TODO : Put in the Texture class
glBindTexture(GL_TEXTURE_2D, raptor_texture.opengl_id[0]);
gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB8, raptor_texture.width, raptor_texture.height, GL_RGB, GL_UNSIGNED_BYTE, raptor_texture.image_data);
// Load raptor model
raptor.load_ascii_off_file("resources/RAPTOR.off");

16
src/DataHandling/Texture.cpp
View file

@ -73,6 +73,7 @@ bool Texture::load_rgb_tga(const std::string& rgb_filename)
{
bool return_value = load_tga(rgb_filename,image_data);
invert_channels(0,2);
generate_texture();
return return_value;
}
@ -118,9 +119,24 @@ bool Texture::load_rgba_tga(const std::string& rgb_filename, const std::string&
color_bits = 32;
invert_channels(0,2);
generate_texture();
return true;
}
void Texture::generate_texture()
{
glGenTextures(1,opengl_id);
glBindTexture(GL_TEXTURE_2D,opengl_id[0]);
if (color_bits == 24)
{
gluBuild2DMipmaps(GL_TEXTURE_2D,GL_RGB8,width,height,GL_RGB,GL_UNSIGNED_BYTE,image_data);
}
else if (color_bits == 32)
{
gluBuild2DMipmaps(GL_TEXTURE_2D,GL_RGBA8,width,height,GL_RGBA,GL_UNSIGNED_BYTE,image_data);
}
}
void Texture::invert_channels(uint8_t first_channel, uint8_t second_channel)
{
uint8_t increment = color_bits/8;

3
src/DataHandling/Texture.h
View file

@ -33,6 +33,9 @@ private:
/// Load and RGB TGA image file to an array
bool load_tga(const std::string& filename, uint8_t*& data_array);
/// Initialize the texture for OpenGL
void generate_texture();
void invert_channels(uint8_t first_channel,uint8_t second_channel);
};