v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2 

[MDL HL1] Removed texture dimensions limitation.
pull/2990/head
Kim Kulling 2020-02-06 17:24:01 +01:00 committed by GitHub
parent fa60ae2885 b33272b1c8
commit 355131e261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
code/MDL/HalfLife/HL1MDLLoader.cpp
View File

@ -340,39 +340,13 @@ void HL1MDLLoader::load_sequence_groups_files() {
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
/** @brief Read an MDL texture. // Read an MDL texture.
*
* @note This method is taken from HL1 source code.
* source: file: studio_utils.c
* function(s): UploadTexture
*/
void HL1MDLLoader::read_texture(const Texture_HL1 *ptexture, void HL1MDLLoader::read_texture(const Texture_HL1 *ptexture,
uint8_t *data, uint8_t *pal, aiTexture *pResult, uint8_t *data, uint8_t *pal, aiTexture *pResult,
aiColor3D &last_palette_color) { aiColor3D &last_palette_color) {
int outwidth, outheight;
int i, j;
static const size_t BuffenLen = 256;
int row1[BuffenLen], row2[BuffenLen], col1[BuffenLen], col2[BuffenLen];
unsigned char *pix1, *pix2, *pix3, *pix4;
// convert texture to power of 2
for (outwidth = 1; outwidth < ptexture->width; outwidth <<= 1)
;
if ( outwidth > static_cast<int>(BuffenLen)) {
outwidth = BuffenLen;
}
for (outheight = 1; outheight < ptexture->height; outheight <<= 1)
;
if (static_cast<size_t>(outheight) > BuffenLen) {
outheight = BuffenLen;
}
pResult->mFilename = ptexture->name; pResult->mFilename = ptexture->name;
pResult->mWidth = outwidth; pResult->mWidth = static_cast<unsigned int>(ptexture->width);
pResult->mHeight = outheight; pResult->mHeight = static_cast<unsigned int>(ptexture->height);
pResult->achFormatHint[0] = 'r'; pResult->achFormatHint[0] = 'r';
pResult->achFormatHint[1] = 'g'; pResult->achFormatHint[1] = 'g';
pResult->achFormatHint[2] = 'b'; pResult->achFormatHint[2] = 'b';
@ -383,31 +357,15 @@ void HL1MDLLoader::read_texture(const Texture_HL1 *ptexture,
pResult->achFormatHint[7] = '8'; pResult->achFormatHint[7] = '8';
pResult->achFormatHint[8] = '\0'; pResult->achFormatHint[8] = '\0';
aiTexel *out = pResult->pcData = new aiTexel[outwidth * outheight]; const size_t num_pixels = pResult->mWidth * pResult->mHeight;
aiTexel *out = pResult->pcData = new aiTexel[num_pixels];
for (i = 0; i < outwidth; i++) { // Convert indexed 8 bit to 32 bit RGBA.
col1[i] = (int)((i + 0.25) * (ptexture->width / (float)outwidth)); for (size_t i = 0; i < num_pixels; ++i, ++out) {
col2[i] = (int)((i + 0.75) * (ptexture->width / (float)outwidth)); out->r = pal[data[i] * 3];
} out->g = pal[data[i] * 3 + 1];
out->b = pal[data[i] * 3 + 2];
for (i = 0; i < outheight; i++) { out->a = 255;
row1[i] = (int)((i + 0.25) * (ptexture->height / (float)outheight)) * ptexture->width;
row2[i] = (int)((i + 0.75) * (ptexture->height / (float)outheight)) * ptexture->width;
}
// scale down and convert to 32bit RGB
for (i = 0; i < outheight; i++) {
for (j = 0; j < outwidth; j++, out++) {
pix1 = &pal[data[row1[i] + col1[j]] * 3];
pix2 = &pal[data[row1[i] + col2[j]] * 3];
pix3 = &pal[data[row2[i] + col1[j]] * 3];
pix4 = &pal[data[row2[i] + col2[j]] * 3];
out->r = (pix1[0] + pix2[0] + pix3[0] + pix4[0]) >> 2;
out->g = (pix1[1] + pix2[1] + pix3[1] + pix4[1]) >> 2;
out->b = (pix1[2] + pix2[2] + pix3[2] + pix4[2]) >> 2;
out->a = 0xFF;
}
} }
// Get the last palette color. // Get the last palette color.