added conversion of indexed rasters for d3d8; fixed clump connection for lights and cameras

This commit is contained in:
aap 2016-02-24 23:56:27 +01:00
parent 63521d903f
commit 41226ef0c6
4 changed files with 71 additions and 4 deletions

View File

@ -763,6 +763,7 @@ Light::create(int32 type)
light->minusCosAngle = 1.0f; light->minusCosAngle = 1.0f;
light->object.privateFlags = 1; light->object.privateFlags = 1;
light->object.flags = LIGHTATOMICS | LIGHTWORLD; light->object.flags = LIGHTATOMICS | LIGHTWORLD;
light->clump = NULL;
light->inClump.init(); light->inClump.init();
light->constructPlugins(); light->constructPlugins();
return light; return light;
@ -772,6 +773,8 @@ void
Light::destroy(void) Light::destroy(void)
{ {
this->destructPlugins(); this->destructPlugins();
if(this->clump)
this->inClump.remove();
free(this); free(this);
} }
@ -869,6 +872,8 @@ Camera::create(void)
cam->farPlane = 10.0f; cam->farPlane = 10.0f;
cam->fogPlane = 5.0f; cam->fogPlane = 5.0f;
cam->projection = Camera::PERSPECTIVE; cam->projection = Camera::PERSPECTIVE;
cam->clump = NULL;
cam->inClump.init();
cam->constructPlugins(); cam->constructPlugins();
return cam; return cam;
} }
@ -893,6 +898,8 @@ void
Camera::destroy(void) Camera::destroy(void)
{ {
this->destructPlugins(); this->destructPlugins();
if(this->clump)
this->inClump.remove();
free(this); free(this);
} }

View File

@ -16,6 +16,8 @@ using namespace std;
namespace rw { namespace rw {
namespace d3d { namespace d3d {
bool32 isP8supported = 1;
#ifdef RW_D3D9 #ifdef RW_D3D9
IDirect3DDevice9 *device = NULL; IDirect3DDevice9 *device = NULL;
#else #else

View File

@ -405,6 +405,54 @@ makeMatFXPipeline(void)
// Native Texture and Raster // Native Texture and Raster
// only handles 4 and 8 bit textures right now
Raster*
readAsImage(Stream *stream, int32 width, int32 height, int32 depth, int32 format, int32 numLevels)
{
uint8 palette[256*4];
uint8 *data;
Image *img = Image::create(width, height, 32);
img->allocate();
if(format & Raster::PAL4)
stream->read(palette, 4*32);
else if(format & Raster::PAL8)
stream->read(palette, 4*256);
// Only read one mipmap
for(int32 i = 0; i < numLevels; i++){
uint32 size = stream->readU32();
if(i == 0){
data = new uint8[size];
stream->read(data, size);
}else
stream->seek(size);
}
if(format & (Raster::PAL4 | Raster::PAL8)){
uint8 *idx = data;
uint8 *pixels = img->pixels;
for(int y = 0; y < img->height; y++){
uint8 *line = pixels;
for(int x = 0; x < img->width; x++){
line[0] = palette[*idx*4+0];
line[1] = palette[*idx*4+1];
line[2] = palette[*idx*4+2];
line[3] = palette[*idx*4+3];
line += 4;
idx++;
}
pixels += img->stride;
}
}
delete[] data;
Raster *ras = Raster::createFromImage(img);
img->destroy();
return ras;
}
Texture* Texture*
readNativeTexture(Stream *stream) readNativeTexture(Stream *stream)
{ {
@ -427,6 +475,16 @@ readNativeTexture(Stream *stream)
int32 type = stream->readU8(); int32 type = stream->readU8();
int32 compression = stream->readU8(); int32 compression = stream->readU8();
int32 pallength = 0;
if(format & Raster::PAL4 || format & Raster::PAL8){
pallength = format & Raster::PAL4 ? 32 : 256;
if(!d3d::isP8supported){
tex->raster = readAsImage(stream, width, height, depth, format|type, numLevels);
tex->streamReadPlugins(stream);
return tex;
}
}
Raster *raster; Raster *raster;
D3dRaster *ras; D3dRaster *ras;
if(compression){ if(compression){
@ -442,10 +500,8 @@ readNativeTexture(Stream *stream)
// TODO: check if format supported and convert if necessary // TODO: check if format supported and convert if necessary
if(raster->format & Raster::PAL4) if(pallength != 0)
stream->read(ras->palette, 4*32); stream->read(ras->palette, 4*pallength);
else if(raster->format & Raster::PAL8)
stream->read(ras->palette, 4*256);
uint32 size; uint32 size;
uint8 *data; uint8 *data;

View File

@ -5,6 +5,8 @@
namespace rw { namespace rw {
namespace d3d { namespace d3d {
extern bool32 isP8supported;
#ifdef RW_D3D9 #ifdef RW_D3D9
extern IDirect3DDevice9 *device; extern IDirect3DDevice9 *device;
#else #else