From e94c045ab75e4e4394293d94b9b0c951f7bdd1e1 Mon Sep 17 00:00:00 2001 From: Daniel Evans Date: Sun, 30 Jun 2013 06:41:04 +0100 Subject: [PATCH] Quick unpalettising code --- datadump/main.cpp | 19 +++++++++++++++++++ framework/rwbinarystream.h | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/datadump/main.cpp b/datadump/main.cpp index 61774df1..30551b2e 100644 --- a/datadump/main.cpp +++ b/datadump/main.cpp @@ -218,12 +218,31 @@ void dumpTextureDictionary(char* data, size_t& dataI) auto native = readStructure(data, dataI); std::cout << "Texture Info" << std::endl; + std::cout << " Platform = " << std::hex << (native.platform) << std::endl; std::cout << " Width = " << std::dec << native.width << std::endl; std::cout << " Height = " << std::dec << native.height << std::endl; std::cout << " UV Wrap = " << std::hex << (native.wrapU+0) << "/" << (native.wrapV+0) << std::endl; std::cout << " Format = " << std::hex << (native.rasterformat) << std::endl; std::cout << " Name = " << std::string(native.diffuseName, 32) << std::endl; std::cout << " Alpha = " << std::string(native.alphaName, 32) << std::endl; + std::cout << " DXT = " << std::hex << (native.dxttype+0) << std::endl; + + if(native.rasterformat & BSTextureNative::FORMAT_EXT_PAL8) + { + // Read the palette + auto palette = readStructure(data, dataI); + + // We can just do this for the time being until we need to compress or something + uint32_t fullcolor[native.width * native.height]; + + for(size_t y = 0; y < native.height; ++y) + { + for(size_t x = 0; x < native.width; ++x) + { + fullcolor[(y*native.width)+x] = palette.palette[static_cast(data[dataI+(y*native.width)+x])]; + } + } + }; dataI = basloc + textureHeader.size; } diff --git a/framework/rwbinarystream.h b/framework/rwbinarystream.h index 34ad1fd3..2ff24d72 100644 --- a/framework/rwbinarystream.h +++ b/framework/rwbinarystream.h @@ -223,6 +223,12 @@ namespace RW FORMAT_EXT_MIPMAP = 0x8000 // Mipmaps included }; }; + + struct BSPaletteData + { + uint32_t palette[256]; + uint32_t rastersize; + }; }; #endif \ No newline at end of file