natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix minimaps blp export

Browse Source 
-default blp settings to blizzlike
-update dxt compression lib
This commit is contained in:
T1ti
2024-07-24 03:22:16 +02:00
parent fa74a34188
commit 8fb11412e0
4 changed files with 1140 additions and 1143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1680
src/external/PNG2BLP/libtxc_dxtn/txc_compress_dxtn.c vendored
View File

File diff suppressed because it is too large Load Diff

113
src/external/PNG2BLP/libtxc_dxtn/txc_dxtn.h vendored
View File

@@ -1,62 +1,51 @@
/*
* libtxc_dxtn
* Version: 0.1
*
* Copyright (C) 2004 Roland Scheidegger All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdint.h>
typedef uint8_t GLchan;
typedef int32_t GLint;
typedef uint8_t GLubyte;
typedef void GLvoid;
typedef uint32_t GLenum;
typedef uint8_t GLboolean;
typedef uint32_t GLuint;
typedef uint16_t GLushort;
typedef int16_t GLshort;
#define UBYTE_TO_CHAN(b) (b)
#define CHAN_MAX 255
#define RCOMP 0
#define GCOMP 1
#define BCOMP 2
#define ACOMP 3
#define GL_FALSE 0
#define GL_TRUE 1
#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0
#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 1
#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 2
#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 3
void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
const GLubyte *srcPixData, GLenum destformat,
GLubyte *dest, GLint dstRowStride);
/*
* libtxc_dxtn
* Version: 1.0
*
* Copyright (C) 2004 Roland Scheidegger All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef _TXC_DXTN_H
#define _TXC_DXTN_H
#include <GL/gl.h>
typedef GLubyte GLchan;
#define UBYTE_TO_CHAN(b) (b)
#define CHAN_MAX 255
#define RCOMP 0
#define GCOMP 1
#define BCOMP 2
#define ACOMP 3
void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel);
void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
const GLubyte *srcPixData, GLenum destformat,
GLubyte *dest, GLint dstRowStride);
#endif /* _TXC_DXTN_H */

486
src/external/PNG2BLP/libtxc_dxtn/txc_fetch_dxtn.c vendored
View File

@@ -1,243 +1,243 @@
/*
* libtxc_dxtn
* Version: 0.1
*
* Copyright (C) 2004 Roland Scheidegger All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include "txc_dxtn.h"
#define EXP5TO8R(packedcol) \
((((packedcol) >> 8) & 0xf8) | (((packedcol) >> 13) & 0x7))
#define EXP6TO8G(packedcol) \
((((packedcol) >> 3) & 0xfc) | (((packedcol) >> 9) & 0x3))
#define EXP5TO8B(packedcol) \
((((packedcol) << 3) & 0xf8) | (((packedcol) >> 2) & 0x7))
#define EXP4TO8(col) \
((col) | ((col) << 4))
/* inefficient. To be efficient, it would be necessary to decode 16 pixels at once */
static void dxt135_decode_imageblock ( const GLubyte *img_block_src,
GLint i, GLint j, GLuint dxt_type, GLvoid *texel ) {
GLchan *rgba = (GLchan *) texel;
const GLushort color0 = img_block_src[0] | (img_block_src[1] << 8);
const GLushort color1 = img_block_src[2] | (img_block_src[3] << 8);
const GLuint bits = img_block_src[4] | (img_block_src[5] << 8) |
(img_block_src[6] << 16) | (img_block_src[7] << 24);
/* What about big/little endian? */
GLubyte bit_pos = 2 * (j * 4 + i) ;
GLubyte code = (GLubyte) ((bits >> bit_pos) & 3);
rgba[ACOMP] = CHAN_MAX;
switch (code) {
case 0:
rgba[RCOMP] = UBYTE_TO_CHAN( EXP5TO8R(color0) );
rgba[GCOMP] = UBYTE_TO_CHAN( EXP6TO8G(color0) );
rgba[BCOMP] = UBYTE_TO_CHAN( EXP5TO8B(color0) );
break;
case 1:
rgba[RCOMP] = UBYTE_TO_CHAN( EXP5TO8R(color1) );
rgba[GCOMP] = UBYTE_TO_CHAN( EXP6TO8G(color1) );
rgba[BCOMP] = UBYTE_TO_CHAN( EXP5TO8B(color1) );
break;
case 2:
if (color0 > color1) {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) * 2 + EXP5TO8R(color1)) / 3) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) * 2 + EXP6TO8G(color1)) / 3) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) * 2 + EXP5TO8B(color1)) / 3) );
}
else {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) + EXP5TO8R(color1)) / 2) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) + EXP6TO8G(color1)) / 2) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) + EXP5TO8B(color1)) / 2) );
}
break;
case 3:
if ((dxt_type > 1) || (color0 > color1)) {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) + EXP5TO8R(color1) * 2) / 3) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) + EXP6TO8G(color1) * 2) / 3) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) + EXP5TO8B(color1) * 2) / 3) );
}
else {
rgba[RCOMP] = 0;
rgba[GCOMP] = 0;
rgba[BCOMP] = 0;
if (dxt_type == 1) rgba[ACOMP] = UBYTE_TO_CHAN(0);
}
break;
default:
/* CANNOT happen (I hope) */
break;
}
}
void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel)
{
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8);
dxt135_decode_imageblock(blksrc, (i&3), (j&3), 0, texel);
}
void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel)
{
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8);
dxt135_decode_imageblock(blksrc, (i&3), (j&3), 1, texel);
}
void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel) {
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
GLchan *rgba = (GLchan *) texel;
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 16);
#if 0
/* Simple 32bit version. */
/* that's pretty brain-dead for a single pixel, isn't it? */
const GLubyte bit_pos = 4 * ((j&3) * 4 + (i&3));
const GLuint alpha_low = blksrc[0] | (blksrc[1] << 8) | (blksrc[2] << 16) | (blksrc[3] << 24);
const GLuint alpha_high = blksrc[4] | (blksrc[5] << 8) | (blksrc[6] << 16) | (blksrc[7] << 24);
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
if (bit_pos < 32)
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8((alpha_low >> bit_pos) & 15)) );
else
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8((alpha_high >> (bit_pos - 32)) & 15)) );
#endif
#if 1
/* TODO test this! */
const GLubyte anibble = (blksrc[((j&3) * 4 + (i&3)) / 2] >> (4 * (i&1))) & 0xf;
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8(anibble)) );
#endif
}
void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel) {
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
GLchan *rgba = (GLchan *) texel;
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 16);
const GLubyte alpha0 = blksrc[0];
const GLubyte alpha1 = blksrc[1];
#if 0
const GLubyte bit_pos = 3 * ((j&3) * 4 + (i&3));
/* simple 32bit version */
const GLuint bits_low = blksrc[2] | (blksrc[3] << 8) | (blksrc[4] << 16) | (blksrc[5] << 24);
const GLuint bits_high = blksrc[6] | (blksrc[7] << 8);
GLubyte code;
if (bit_pos < 30)
code = (GLubyte) ((bits_low >> bit_pos) & 7);
else if (bit_pos == 30)
code = (GLubyte) ((bits_low >> 30) & 3) | ((bits_high << 2) & 4);
else
code = (GLubyte) ((bits_high >> (bit_pos - 32)) & 7);
#endif
#if 1
/* TODO test this! */
const GLubyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
const GLubyte acodelow = blksrc[2 + bit_pos / 8];
const GLubyte acodehigh = blksrc[3 + bit_pos / 8];
const GLubyte code = (acodelow >> (bit_pos & 0x7) |
(acodehigh << (8 - (bit_pos & 0x7)))) & 0x7;
#endif
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
#if 0
if (alpha0 > alpha1) {
switch (code) {
case 0:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
break;
case 1:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
break;
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
break;
}
}
else {
switch (code) {
case 0:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
break;
case 1:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
break;
case 2:
case 3:
case 4:
case 5:
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
break;
case 6:
rgba[ACOMP] = 0;
break;
case 7:
rgba[ACOMP] = CHAN_MAX;
break;
}
}
#endif
/* not sure. Which version is faster? */
#if 1
/* TODO test this */
if (code == 0)
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
else if (code == 1)
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
else if (alpha0 > alpha1)
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
else if (code < 6)
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
else if (code == 6)
rgba[ACOMP] = 0;
else
rgba[ACOMP] = CHAN_MAX;
#endif
}
/*
* libtxc_dxtn
* Version: 1.0
*
* Copyright (C) 2004 Roland Scheidegger All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include "txc_dxtn.h"
#define EXP5TO8R(packedcol) \
((((packedcol) >> 8) & 0xf8) | (((packedcol) >> 13) & 0x7))
#define EXP6TO8G(packedcol) \
((((packedcol) >> 3) & 0xfc) | (((packedcol) >> 9) & 0x3))
#define EXP5TO8B(packedcol) \
((((packedcol) << 3) & 0xf8) | (((packedcol) >> 2) & 0x7))
#define EXP4TO8(col) \
((col) | ((col) << 4))
/* inefficient. To be efficient, it would be necessary to decode 16 pixels at once */
static void dxt135_decode_imageblock ( const GLubyte *img_block_src,
GLint i, GLint j, GLuint dxt_type, GLvoid *texel ) {
GLchan *rgba = (GLchan *) texel;
const GLushort color0 = img_block_src[0] | (img_block_src[1] << 8);
const GLushort color1 = img_block_src[2] | (img_block_src[3] << 8);
const GLuint bits = img_block_src[4] | (img_block_src[5] << 8) |
(img_block_src[6] << 16) | (img_block_src[7] << 24);
/* What about big/little endian? */
GLubyte bit_pos = 2 * (j * 4 + i) ;
GLubyte code = (GLubyte) ((bits >> bit_pos) & 3);
rgba[ACOMP] = CHAN_MAX;
switch (code) {
case 0:
rgba[RCOMP] = UBYTE_TO_CHAN( EXP5TO8R(color0) );
rgba[GCOMP] = UBYTE_TO_CHAN( EXP6TO8G(color0) );
rgba[BCOMP] = UBYTE_TO_CHAN( EXP5TO8B(color0) );
break;
case 1:
rgba[RCOMP] = UBYTE_TO_CHAN( EXP5TO8R(color1) );
rgba[GCOMP] = UBYTE_TO_CHAN( EXP6TO8G(color1) );
rgba[BCOMP] = UBYTE_TO_CHAN( EXP5TO8B(color1) );
break;
case 2:
if ((dxt_type > 1) || (color0 > color1)) {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) * 2 + EXP5TO8R(color1)) / 3) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) * 2 + EXP6TO8G(color1)) / 3) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) * 2 + EXP5TO8B(color1)) / 3) );
}
else {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) + EXP5TO8R(color1)) / 2) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) + EXP6TO8G(color1)) / 2) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) + EXP5TO8B(color1)) / 2) );
}
break;
case 3:
if ((dxt_type > 1) || (color0 > color1)) {
rgba[RCOMP] = UBYTE_TO_CHAN( ((EXP5TO8R(color0) + EXP5TO8R(color1) * 2) / 3) );
rgba[GCOMP] = UBYTE_TO_CHAN( ((EXP6TO8G(color0) + EXP6TO8G(color1) * 2) / 3) );
rgba[BCOMP] = UBYTE_TO_CHAN( ((EXP5TO8B(color0) + EXP5TO8B(color1) * 2) / 3) );
}
else {
rgba[RCOMP] = 0;
rgba[GCOMP] = 0;
rgba[BCOMP] = 0;
if (dxt_type == 1) rgba[ACOMP] = UBYTE_TO_CHAN(0);
}
break;
default:
/* CANNOT happen (I hope) */
break;
}
}
void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel)
{
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8);
dxt135_decode_imageblock(blksrc, (i&3), (j&3), 0, texel);
}
void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel)
{
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8);
dxt135_decode_imageblock(blksrc, (i&3), (j&3), 1, texel);
}
void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel) {
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
GLchan *rgba = (GLchan *) texel;
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 16);
#if 0
/* Simple 32bit version. */
/* that's pretty brain-dead for a single pixel, isn't it? */
const GLubyte bit_pos = 4 * ((j&3) * 4 + (i&3));
const GLuint alpha_low = blksrc[0] | (blksrc[1] << 8) | (blksrc[2] << 16) | (blksrc[3] << 24);
const GLuint alpha_high = blksrc[4] | (blksrc[5] << 8) | (blksrc[6] << 16) | (blksrc[7] << 24);
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
if (bit_pos < 32)
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8((alpha_low >> bit_pos) & 15)) );
else
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8((alpha_high >> (bit_pos - 32)) & 15)) );
#endif
#if 1
/* TODO test this! */
const GLubyte anibble = (blksrc[((j&3) * 4 + (i&3)) / 2] >> (4 * (i&1))) & 0xf;
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
rgba[ACOMP] = UBYTE_TO_CHAN( (GLubyte)(EXP4TO8(anibble)) );
#endif
}
void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
GLint i, GLint j, GLvoid *texel) {
/* Extract the (i,j) pixel from pixdata and return it
* in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
*/
GLchan *rgba = (GLchan *) texel;
const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 16);
const GLubyte alpha0 = blksrc[0];
const GLubyte alpha1 = blksrc[1];
#if 0
const GLubyte bit_pos = 3 * ((j&3) * 4 + (i&3));
/* simple 32bit version */
const GLuint bits_low = blksrc[2] | (blksrc[3] << 8) | (blksrc[4] << 16) | (blksrc[5] << 24);
const GLuint bits_high = blksrc[6] | (blksrc[7] << 8);
GLubyte code;
if (bit_pos < 30)
code = (GLubyte) ((bits_low >> bit_pos) & 7);
else if (bit_pos == 30)
code = (GLubyte) ((bits_low >> 30) & 3) | ((bits_high << 2) & 4);
else
code = (GLubyte) ((bits_high >> (bit_pos - 32)) & 7);
#endif
#if 1
/* TODO test this! */
const GLubyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
const GLubyte acodelow = blksrc[2 + bit_pos / 8];
const GLubyte acodehigh = blksrc[3 + bit_pos / 8];
const GLubyte code = (acodelow >> (bit_pos & 0x7) |
(acodehigh << (8 - (bit_pos & 0x7)))) & 0x7;
#endif
dxt135_decode_imageblock(blksrc + 8, (i&3), (j&3), 2, texel);
#if 0
if (alpha0 > alpha1) {
switch (code) {
case 0:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
break;
case 1:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
break;
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
break;
}
}
else {
switch (code) {
case 0:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
break;
case 1:
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
break;
case 2:
case 3:
case 4:
case 5:
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
break;
case 6:
rgba[ACOMP] = 0;
break;
case 7:
rgba[ACOMP] = CHAN_MAX;
break;
}
}
#endif
/* not sure. Which version is faster? */
#if 1
/* TODO test this */
if (code == 0)
rgba[ACOMP] = UBYTE_TO_CHAN( alpha0 );
else if (code == 1)
rgba[ACOMP] = UBYTE_TO_CHAN( alpha1 );
else if (alpha0 > alpha1)
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
else if (code < 6)
rgba[ACOMP] = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
else if (code == 6)
rgba[ACOMP] = 0;
else
rgba[ACOMP] = CHAN_MAX;
#endif
}

4
src/noggit/rendering/WorldRender.cpp
View File

@@ -1734,7 +1734,9 @@ bool WorldRender::saveMinimap(TileIndex const& tile_idx, MinimapRenderSettings*
blp.load(reinterpret_cast<const void*>(bytes.constData()), bytes.size());
uint32_t file_size;
void* blp_image = blp.createBlpDxtInMemory(true, FORMAT_DXT5, file_size);
// void* blp_image = blp.createBlpDxtInMemory(true, FORMAT_DXT5, file_size);
// this mirrors blizzards : dxt1, no mipmap
void* blp_image = blp.createBlpDxtInMemory(false, FORMAT_DXT1, file_size);
// converts the texture name to an md5 hash like blizzard, this is used to avoid duplicates textures for ocean
// downside is that if the file gets updated regularly there will be a lot of duplicates in the project folder