eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 22:39:18 +02:00
Code Issues 121 Wiki Activity

merge

Browse Source
This commit is contained in:
VB
2017-02-15 15:03:15 +01:00
parent 7c98a177da cf48989f39
commit 0f33b0abdb
11 changed files with 149 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Texture.cpp
View File

@@ -175,7 +175,7 @@ opengl_texture::load_DDS() {
data_width = ddsd.dwWidth;
data_height = ddsd.dwHeight;
data_mapcount = 1;// ddsd.dwMipMapCount;
data_mapcount = ddsd.dwMipMapCount;
int blockSize = ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ? 8 : 16 );
int offset = 0;
@@ -194,11 +194,13 @@ opengl_texture::load_DDS() {
data_state = resource_state::failed;
return;
}
int datasize = filesize - offset;
/*
// this approach loads only the first mipmap and relies on graphics card to fill the rest
data_mapcount = 1;
int datasize = ( ( data_width + 3 ) / 4 ) * ( ( data_height + 3 ) / 4 ) * blockSize;
*/
int datasize = filesize - offset;
/*
// calculate size of accepted data
// NOTE: this is a fallback, as we should be able to just move the file caret by calculated offset and read the rest
@@ -331,7 +333,8 @@ opengl_texture::load_TGA() {
int const pixelcount = data_width * data_height;
for( int i = 0; i < pixelcount; ++i ) {
file.read( (char *)buffer, sizeof( unsigned char ) );
file.read( (char *)&buffer[ 0 ], sizeof( unsigned char ) * bytesperpixel );
if( bytesperpixel == 1 ) {
// expand greyscale data
buffer[ 1 ] = buffer[ 0 ];
@@ -473,8 +476,8 @@ opengl_texture::create() {
datasize, (GLubyte *)&data[0] + dataoffset );
dataoffset += datasize;
datawidth = std::max( datawidth / 2, 4 );
dataheight = std::max( dataheight / 2, 4 );
datawidth = std::max( datawidth / 2, 1 );
dataheight = std::max( dataheight / 2, 1 );
}
else{
// uncompressed texture data