mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 10:10:01 +00:00
Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami: fuck bletch fixed anisotropic filtering; updated librw fix
This commit is contained in:
commit
06d8860d42
|
@ -265,6 +265,7 @@ enum Config {
|
||||||
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
|
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
|
||||||
//#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
|
//#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
|
||||||
#define DISABLE_VSYNC_ON_TEXTURE_CONVERSION // make texture conversion work faster by disabling vsync
|
#define DISABLE_VSYNC_ON_TEXTURE_CONVERSION // make texture conversion work faster by disabling vsync
|
||||||
|
#define ANISOTROPIC_FILTERING // set all textures to max anisotropic filtering
|
||||||
//#define USE_TEXTURE_POOL
|
//#define USE_TEXTURE_POOL
|
||||||
#ifdef LIBRW
|
#ifdef LIBRW
|
||||||
#define EXTENDED_COLOURFILTER // more options for colour filter (replaces mblur)
|
#define EXTENDED_COLOURFILTER // more options for colour filter (replaces mblur)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "rphanim.h"
|
#include "rphanim.h"
|
||||||
#include "rpskin.h"
|
#include "rpskin.h"
|
||||||
#include "rtbmp.h"
|
#include "rtbmp.h"
|
||||||
#ifndef LIBRW
|
#ifdef ANISOTROPIC_FILTERING
|
||||||
#include "rpanisot.h"
|
#include "rpanisot.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -406,7 +406,7 @@ PluginAttach(void)
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#ifndef LIBRW
|
#ifdef ANISOTROPIC_FILTERING
|
||||||
RpAnisotPluginAttach();
|
RpAnisotPluginAttach();
|
||||||
#endif
|
#endif
|
||||||
#ifdef EXTENDED_PIPELINES
|
#ifdef EXTENDED_PIPELINES
|
||||||
|
|
|
@ -967,3 +967,12 @@ RtCharset *RtCharsetSetColors(RtCharset * charSet, const RwRGBA * foreGround,
|
||||||
RtCharset *RtCharsetGetDesc(RtCharset * charset, RtCharsetDesc * desc) { *desc = charset->desc; return charset; }
|
RtCharset *RtCharsetGetDesc(RtCharset * charset, RtCharsetDesc * desc) { *desc = charset->desc; return charset; }
|
||||||
RtCharset *RtCharsetCreate(const RwRGBA * foreGround, const RwRGBA * backGround) { return Charset::create(foreGround, backGround); }
|
RtCharset *RtCharsetCreate(const RwRGBA * foreGround, const RwRGBA * backGround) { return Charset::create(foreGround, backGround); }
|
||||||
RwBool RtCharsetDestroy(RtCharset * charSet) { charSet->destroy(); return true; }
|
RwBool RtCharsetDestroy(RtCharset * charSet) { charSet->destroy(); return true; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include <rpanisot.h>
|
||||||
|
|
||||||
|
RwInt8 RpAnisotGetMaxSupportedMaxAnisotropy(void) { return rw::getMaxSupportedMaxAnisotropy(); }
|
||||||
|
RwTexture *RpAnisotTextureSetMaxAnisotropy(RwTexture *tex, RwInt8 val) { tex->setMaxAnisotropy(val); return tex; }
|
||||||
|
RwInt8 RpAnisotTextureGetMaxAnisotropy(RwTexture *tex) { return tex->getMaxAnisotropy(); }
|
||||||
|
RwBool RpAnisotPluginAttach(void) { rw::registerAnisotropyPlugin(); return true; }
|
||||||
|
|
6
src/fakerw/rpanisot.h
Normal file
6
src/fakerw/rpanisot.h
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
RwInt8 RpAnisotGetMaxSupportedMaxAnisotropy(void);
|
||||||
|
RwTexture *RpAnisotTextureSetMaxAnisotropy(RwTexture *tex, RwInt8 val);
|
||||||
|
RwInt8 RpAnisotTextureGetMaxAnisotropy(RwTexture *tex);
|
||||||
|
RwBool RpAnisotPluginAttach(void);
|
|
@ -6334,7 +6334,6 @@ CPed::PositionAnyPedOutOfCollision(void)
|
||||||
int smallestDistNearVeh = 999;
|
int smallestDistNearVeh = 999;
|
||||||
int smallestDistSomewhereClose = 999;
|
int smallestDistSomewhereClose = 999;
|
||||||
|
|
||||||
CVector vehPos = m_pMyVehicle->GetPosition();
|
|
||||||
CVector potentialPos;
|
CVector potentialPos;
|
||||||
potentialPos.y = GetPosition().y - 3.5f;
|
potentialPos.y = GetPosition().y - 3.5f;
|
||||||
potentialPos.z = GetPosition().z;
|
potentialPos.z = GetPosition().z;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#define WITHD3D
|
#define WITHD3D
|
||||||
#endif
|
#endif
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#ifndef LIBRW
|
#ifdef ANISOTROPIC_FILTERING
|
||||||
#include "rpanisot.h"
|
#include "rpanisot.h"
|
||||||
#endif
|
#endif
|
||||||
#include "crossplatform.h"
|
#include "crossplatform.h"
|
||||||
|
@ -55,12 +55,9 @@ RwTextureGtaStreamRead(RwStream *stream)
|
||||||
texNumLoaded++;
|
texNumLoaded++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(tex == nil)
|
#ifdef ANISOTROPIC_FILTERING
|
||||||
return nil;
|
if(tex && RpAnisotGetMaxSupportedMaxAnisotropy() > 1) // BUG? this was RpAnisotTextureGetMaxAnisotropy, but that doesn't make much sense
|
||||||
|
RpAnisotTextureSetMaxAnisotropy(tex, RpAnisotGetMaxSupportedMaxAnisotropy());
|
||||||
#ifndef LIBRW
|
|
||||||
if(RpAnisotTextureGetMaxAnisotropy(tex) > 1)
|
|
||||||
RpAnisotTextureSetMaxAnisotropy(tex, RpAnisotTextureGetMaxAnisotropy(tex));
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return tex;
|
return tex;
|
||||||
|
|
2
vendor/librw
vendored
2
vendor/librw
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 9260bddc66f70eb51adf0749fa835fed1562c178
|
Subproject commit 60a5ace16309ccd3d174a3ec14a1062540934066
|
Loading…
Reference in a new issue