Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented basic PS2 rasters - no mipmaps yet

Browse Source
This commit is contained in:
aap
2016-01-03 19:45:51 +01:00
parent 8b5b64d639
commit fab7f20c6d
9 changed files with 612 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tools/rsltest/rsltest.cpp
View File

@ -265,7 +265,7 @@ getTexelPS2(RslRaster *raster, int32 n)
void
convertCLUT(uint8 *texels, uint32 w, uint32 h)
{
uint8 map[4] = { 0, 16, 8, 24 };
static uint8 map[4] = { 0x00, 0x10, 0x08, 0x18 };
for (uint32 i = 0; i < w*h; i++)
texels[i] = (texels[i] & ~0x18) | map[(texels[i] & 0x18) >> 3];
}
@ -309,19 +309,32 @@ unswizzle16(uint16 *dst, uint16 *src, int32 w, int32 h)
}
}
bool32 unswizzle = 1;
void
convertTo32(uint8 *out, uint8 *pal, uint8 *tex,
uint32 w, uint32 h, uint32 d, bool32 swiz)
{
uint32 x;
if(d == 32){
memcpy(out, tex, w*h*4);
//unswizzle16((uint16*)out, (uint16*)tex, w, h);
//uint32 *dat = new uint32[w*h];
//if(swiz && unswizzle)
// unswizzle8_hack(dat, (uint32*)tex, w, h);
//else
// memcpy(dat, tex, w*h*4);
//tex = (uint8*)dat;
for(uint32 i = 0; i < w*h; i++){
out[i*4+0] = tex[i*4+0];
out[i*4+1] = tex[i*4+1];
out[i*4+2] = tex[i*4+2];
out[i*4+3] = tex[i*4+3]*255/128;
}
//delete[] dat;
}
if(d == 16) return; // TODO
if(d == 8){
uint8 *dat = new uint8[w*h];
if(swiz)
if(swiz && unswizzle)
unswizzle8(dat, tex, w, h);
else
memcpy(dat, tex, w*h);
@ -343,7 +356,7 @@ convertTo32(uint8 *out, uint8 *pal, uint8 *tex,
dat[i*2+0] = tex[i] & 0xF;
dat[i*2+1] = tex[i] >> 4;
}
if(swiz){
if(swiz && unswizzle){
uint8 *tmp = new uint8[w*h];
unswizzle8(tmp, dat, w, h);
delete[] dat;
@ -385,8 +398,6 @@ RslTexture *dumpTextureCB(RslTexture *texture, void *pData)
return texture;
}
bool32 unswizzle = 1;
RslTexture*
convertTexturePS2(RslTexture *texture, void *pData)
{
@ -487,9 +498,9 @@ convertTexturePS2(RslTexture *texture, void *pData)
else if(d == 32){
// texture is fucked, but pretend it isn't
for(uint32 i = 0; i < w*h; i++){
data[i*4+0] = texels[i*4+0];
data[i*4+2] = texels[i*4+0];
data[i*4+1] = texels[i*4+1];
data[i*4+2] = texels[i*4+2];
data[i*4+0] = texels[i*4+2];
data[i*4+3] = texels[i*4+3]*255/128;
}
}else
@ -513,8 +524,9 @@ convertTXD(RslTexDictionary *txd)
void
usage(void)
{
fprintf(stderr, "%s [-t] [-s] input [output.txd]\n", argv0);
fprintf(stderr, "%s [-v version] [-x] [-s] input [output.txd]\n", argv0);
fprintf(stderr, "\t-v RW version, e.g. 33004 for 3.3.0.4\n");
fprintf(stderr, "\t-x extract to tga\n");
fprintf(stderr, "\t-s don't unswizzle\n");
exit(1);
}
@ -526,6 +538,7 @@ main(int argc, char *argv[])
rw::version = 0x34003;
assert(sizeof(void*) == 4);
int extract = 0;
ARGBEGIN{
case 'v':
@ -534,6 +547,9 @@ main(int argc, char *argv[])
case 's':
unswizzle = 0;
break;
case 'x':
extract++;
break;
default:
usage();
}ARGEND;
@ -643,7 +659,8 @@ main(int argc, char *argv[])
}else if(rslstr->ident == TEX_IDENT){
txd = (RslTexDictionary*)rslstr->data;
writeTxd:
//RslTexDictionaryForAllTextures(txd, dumpTextureCB, NULL);
if(extract)
RslTexDictionaryForAllTextures(txd, dumpTextureCB, NULL);
TexDictionary *rwtxd = convertTXD(txd);
if(argc > 1)
assert(stream.open(argv[1], "wb"));

76
tools/txdwrite/txdwrite.cpp
View File

@ -5,11 +5,26 @@
#include <new>
#include <rw.h>
#include <args.h>
#include <src/gtaplg.h>
char *argv0;
using namespace std;
using namespace rw;
struct {
char *str;
uint32 val;
} platforms[] = {
{ "mobile", PLATFORM_OGL },
{ "ps2", PLATFORM_PS2 },
{ "xbox", PLATFORM_XBOX },
{ "d3d8", PLATFORM_D3D8 },
{ "d3d9", PLATFORM_D3D9 },
{ NULL, 0 }
};
Raster*
xboxToD3d8(Raster *raster)
{
@ -64,43 +79,80 @@ xboxToD3d8(Raster *raster)
return newras;
}
void
usage(void)
{
fprintf(stderr, "usage: %s [-v version] [-o platform] in.txd [out.txd]\n", argv0);
fprintf(stderr, "\t-v RW version, e.g. 33004 for 3.3.0.4\n");
fprintf(stderr, "\t-o output platform. ps2, xbox, mobile, d3d8, d3d9\n");
exit(1);
}
int
main(int argc, char *argv[])
{
gta::attachPlugins();
rw::version = 0x33002;
// rw::platform = rw::PLATFORM_PS2;
rw::version = 0;
rw::platform = rw::PLATFORM_PS2;
// rw::platform = rw::PLATFORM_OGL;
// rw::platform = rw::PLATFORM_XBOX;
// rw::platform = rw::PLATFORM_D3D8;
// rw::platform = rw::PLATFORM_D3D9;
int outplatform = rw::PLATFORM_PS2;
if(argc < 2){
printf("usage (%d): %s in.txd\n", rw::platform, argv[0]);
return 0;
}
char *s;
ARGBEGIN{
case 'v':
sscanf(EARGF(usage()), "%x", &rw::version);
break;
case 'o':
s = EARGF(usage());
for(int i = 0; platforms[i].str; i++){
if(strcmp(platforms[i].str, s) == 0){
outplatform = platforms[i].val;
goto found;
}
}
printf("unknown platform %s\n", s);
outplatform = PLATFORM_D3D8;
found:
break;
default:
usage();
}ARGEND;
if(argc < 1)
usage();
rw::StreamFile in;
if(in.open(argv[1], "rb") == NULL){
if(in.open(argv[0], "rb") == NULL){
printf("couldn't open file %s\n", argv[1]);
return 1;
}
rw::findChunk(&in, rw::ID_TEXDICTIONARY, NULL, NULL);
ChunkHeaderInfo header;
readChunkHeaderInfo(&in, &header);
assert(header.type == ID_TEXDICTIONARY);
rw::TexDictionary *txd;
txd = rw::TexDictionary::streamRead(&in);
assert(txd);
in.close();
rw::currentTexDictionary = txd;
for(Texture *tex = txd->first; tex; tex = tex->next)
tex->raster = xboxToD3d8(tex->raster);
if(rw::version == 0){
rw::version = header.version;
rw::build = header.build;
}
if(outplatform == PLATFORM_D3D8)
for(Texture *tex = txd->first; tex; tex = tex->next)
tex->raster = xboxToD3d8(tex->raster);
// for(Texture *tex = txd->first; tex; tex = tex->next)
// tex->filterAddressing = (tex->filterAddressing&~0xF) | 0x2;
rw::StreamFile out;
if(argc > 2)
out.open(argv[2], "wb");
if(argc > 1)
out.open(argv[1], "wb");
else
out.open("out.txd", "wb");
txd->streamWrite(&out);