random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-20 17:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

redid the plugin system; some engine init stuff

Browse Source
This commit is contained in:
aap
2016-06-25 17:58:52 +02:00
parent e3fa1fcc7f
commit a906d58bcb
21 changed files with 399 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/d3d/d3d8.cpp
View File

@@ -510,7 +510,7 @@ readNativeTexture(Stream *stream)
pallength = format & Raster::PAL4 ? 32 : 256;
if(!d3d::isP8supported){
tex->raster = readAsImage(stream, width, height, depth, format|type, numLevels);
tex->streamReadPlugins(stream);
Texture::s_plglist.streamRead(stream, tex);
return tex;
}
}
@@ -544,7 +544,7 @@ readNativeTexture(Stream *stream)
}else
stream->seek(size);
}
tex->streamReadPlugins(stream);
Texture::s_plglist.streamRead(stream, tex);
return tex;
}
@@ -552,7 +552,7 @@ void
writeNativeTexture(Texture *tex, Stream *stream)
{
int32 chunksize = getSizeNativeTexture(tex);
int32 plgsize = tex->streamGetPluginSize();
int32 plgsize = Texture::s_plglist.streamGetSize(tex);
writeChunkHeader(stream, ID_TEXTURENATIVE, chunksize);
writeChunkHeader(stream, ID_STRUCT, chunksize-24-plgsize);
stream->writeU32(PLATFORM_D3D8);
@@ -608,7 +608,7 @@ writeNativeTexture(Texture *tex, Stream *stream)
stream->write(data, size);
raster->unlock(i);
}
tex->streamWritePlugins(stream);
Texture::s_plglist.streamWrite(stream, tex);
}
uint32
@@ -622,7 +622,7 @@ getSizeNativeTexture(Texture *tex)
size += 4*256;
for(int32 i = 0; i < levels; i++)
size += 4 + getLevelSize(tex->raster, i);
size += 12 + tex->streamGetPluginSize();
size += 12 + Texture::s_plglist.streamGetSize(tex);
return size;
}

8
src/d3d/d3d9.cpp
View File

@@ -653,7 +653,7 @@ readNativeTexture(Stream *stream)
}else
stream->seek(size);
}
tex->streamReadPlugins(stream);
Texture::s_plglist.streamRead(stream, tex);
return tex;
}
@@ -661,7 +661,7 @@ void
writeNativeTexture(Texture *tex, Stream *stream)
{
int32 chunksize = getSizeNativeTexture(tex);
int32 plgsize = tex->streamGetPluginSize();
int32 plgsize = Texture::s_plglist.streamGetSize(tex);
writeChunkHeader(stream, ID_TEXTURENATIVE, chunksize);
writeChunkHeader(stream, ID_STRUCT, chunksize-24-plgsize);
stream->writeU32(PLATFORM_D3D9);
@@ -705,7 +705,7 @@ writeNativeTexture(Texture *tex, Stream *stream)
stream->write(data, size);
raster->unlock(i);
}
tex->streamWritePlugins(stream);
Texture::s_plglist.streamWrite(stream, tex);
}
uint32
@@ -719,7 +719,7 @@ getSizeNativeTexture(Texture *tex)
size += 4*256;
for(int32 i = 0; i < levels; i++)
size += 4 + getLevelSize(tex->raster, i);
size += 12 + tex->streamGetPluginSize();
size += 12 + Texture::s_plglist.streamGetSize(tex);
return size;
}

8
src/d3d/xbox.cpp
View File

@@ -979,7 +979,7 @@ readNativeTexture(Stream *stream)
stream->read(data, totalSize);
raster->unlock(0);
tex->streamReadPlugins(stream);
Texture::s_plglist.streamRead(stream, tex);
return tex;
}
@@ -987,7 +987,7 @@ void
writeNativeTexture(Texture *tex, Stream *stream)
{
int32 chunksize = getSizeNativeTexture(tex);
int32 plgsize = tex->streamGetPluginSize();
int32 plgsize = Texture::s_plglist.streamGetSize(tex);
writeChunkHeader(stream, ID_TEXTURENATIVE, chunksize);
writeChunkHeader(stream, ID_STRUCT, chunksize-24-plgsize);
stream->writeU32(PLATFORM_XBOX);
@@ -1027,7 +1027,7 @@ writeNativeTexture(Texture *tex, Stream *stream)
stream->write(data, totalSize);
raster->unlock(0);
tex->streamWritePlugins(stream);
Texture::s_plglist.streamWrite(stream, tex);
}
uint32
@@ -1042,7 +1042,7 @@ getSizeNativeTexture(Texture *tex)
size += 4*32;
else if(tex->raster->format & Raster::PAL8)
size += 4*256;
size += 12 + tex->streamGetPluginSize();
size += 12 + Texture::s_plglist.streamGetSize(tex);
return size;
}