mirror of
https://github.com/halpz/re3.git
synced 2025-06-28 01:46:22 +00:00
little support for gl3 textures; txd.img enabled again
This commit is contained in:
@ -191,7 +191,7 @@ enum Config {
|
||||
#define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
|
||||
#define MORE_LANGUAGES // Add more translations to the game
|
||||
#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
|
||||
//#define USE_TXD_CDIMAGE // generate and load textures from txd.img
|
||||
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
|
||||
//#define USE_TEXTURE_POOL
|
||||
//#define OPENAL
|
||||
|
||||
|
@ -294,6 +294,14 @@ static rw::Raster*
|
||||
ConvertTexRaster(rw::Raster *ras)
|
||||
{
|
||||
using namespace rw;
|
||||
|
||||
if(ras->platform == rw::platform)
|
||||
return ras;
|
||||
// compatible platforms
|
||||
if(ras->platform == PLATFORM_D3D8 && rw::platform == PLATFORM_D3D9 ||
|
||||
ras->platform == PLATFORM_D3D9 && rw::platform == PLATFORM_D3D8)
|
||||
return ras;
|
||||
|
||||
Image *img = ras->toImage();
|
||||
ras->destroy();
|
||||
img->unindex();
|
||||
@ -306,9 +314,7 @@ ConvertTexRaster(rw::Raster *ras)
|
||||
RwBool rwNativeTextureHackRead(RwStream *stream, RwTexture **tex, RwInt32 size)
|
||||
{
|
||||
*tex = Texture::streamReadNative(stream);
|
||||
#ifdef RW_GL3
|
||||
if(strcmp((*tex)->name, "copnu") == 0)
|
||||
tex = tex;
|
||||
#ifdef LIBRW
|
||||
(*tex)->raster = ConvertTexRaster((*tex)->raster);
|
||||
#endif
|
||||
return *tex != nil;
|
||||
@ -830,4 +836,10 @@ RwBool RtCharsetDestroy(RtCharset * charSet) { charSet->destroy(); return
|
||||
|
||||
|
||||
// fake shit
|
||||
RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags) { return 1; }
|
||||
RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags)
|
||||
{
|
||||
#ifdef RW_GL3
|
||||
return '3LGO';
|
||||
#endif
|
||||
return flags & 0xF00;
|
||||
}
|
||||
|
Reference in New Issue
Block a user