jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2025-01-01 16:53:01 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factorize weapon and muzzleflash rendering into separate options

Browse source
This commit is contained in:
Silent 2019-03-06 21:59:14 +01:00
parent 6b2ad034cb
commit e94fec9c6f
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
3 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
SilentPatchSA/PedSA.cpp
View file

@ -41,7 +41,7 @@ void CPed::ResetGunFlashAlpha()
} }
} }
void CPed::RenderWeapon(bool bMuzzleFlash, bool bForShadow) void CPed::RenderWeapon(bool bWeapon, bool bMuzzleFlash, bool bForShadow)
{ {
if ( m_pWeaponObject ) if ( m_pWeaponObject )
{ {
@ -62,14 +62,20 @@ void CPed::RenderWeapon(bool bMuzzleFlash, bool bForShadow)
RwFrameUpdateObjects(pFrame); RwFrameUpdateObjects(pFrame);
if ( bForShadow ) if ( bForShadow )
RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pWeaponObject), ShadowCameraRenderCB); RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pWeaponObject), ShadowCameraRenderCB);
else if ( !bMuzzleFlash ) else
{
if ( bWeapon )
{
RpClumpRender(reinterpret_cast<RpClump*>(m_pWeaponObject)); RpClumpRender(reinterpret_cast<RpClump*>(m_pWeaponObject));
else if ( m_pMuzzleFlashFrame ) }
if ( bMuzzleFlash && m_pMuzzleFlashFrame != nullptr )
{ {
SetGunFlashAlpha(false); SetGunFlashAlpha(false);
RpAtomic* atomic = reinterpret_cast<RpAtomic*>(GetFirstObject(m_pMuzzleFlashFrame)); RpAtomic* atomic = reinterpret_cast<RpAtomic*>(GetFirstObject(m_pMuzzleFlashFrame));
RpAtomicRender( atomic ); RpAtomicRender( atomic );
} }
}
// Dual weapons // Dual weapons
if ( CWeaponInfo::GetWeaponInfo(weaponSlots[m_bActiveWeapon].m_eWeaponType, GetWeaponSkill())->hexFlags >> 11 & 1 ) if ( CWeaponInfo::GetWeaponInfo(weaponSlots[m_bActiveWeapon].m_eWeaponType, GetWeaponSkill())->hexFlags >> 11 & 1 )
@ -84,15 +90,21 @@ void CPed::RenderWeapon(bool bMuzzleFlash, bool bForShadow)
RwFrameUpdateObjects(pFrame); RwFrameUpdateObjects(pFrame);
if ( bForShadow ) if ( bForShadow )
RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pWeaponObject), ShadowCameraRenderCB); RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pWeaponObject), ShadowCameraRenderCB);
else if ( !bMuzzleFlash ) else
{
if ( bWeapon )
{
RpClumpRender(reinterpret_cast<RpClump*>(m_pWeaponObject)); RpClumpRender(reinterpret_cast<RpClump*>(m_pWeaponObject));
else if ( m_pMuzzleFlashFrame ) }
if ( bMuzzleFlash && m_pMuzzleFlashFrame != nullptr )
{ {
SetGunFlashAlpha(true); SetGunFlashAlpha(true);
RpAtomic* atomic = reinterpret_cast<RpAtomic*>(GetFirstObject(m_pMuzzleFlashFrame)); RpAtomic* atomic = reinterpret_cast<RpAtomic*>(GetFirstObject(m_pMuzzleFlashFrame));
RpAtomicRender( atomic ); RpAtomicRender( atomic );
} }
} }
}
if ( bMuzzleFlash ) if ( bMuzzleFlash )
ResetGunFlashAlpha(); ResetGunFlashAlpha();
} }
@ -101,7 +113,7 @@ void CPed::RenderWeapon(bool bMuzzleFlash, bool bForShadow)
void CPed::RenderForShadow() void CPed::RenderForShadow()
{ {
RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pRwObject), ShadowCameraRenderCB); RpClumpForAllAtomics(reinterpret_cast<RpClump*>(m_pRwObject), ShadowCameraRenderCB);
RenderWeapon(false, true); RenderWeapon(true, false, true);
// Render jetpack // Render jetpack
auto* pJetPackTask = pPedIntelligence->GetTaskJetPack(); auto* pJetPackTask = pPedIntelligence->GetTaskJetPack();

2
SilentPatchSA/PedSA.h
View file

@ -314,7 +314,7 @@ public:
void SetGunFlashAlpha(bool bSecondWeapon); void SetGunFlashAlpha(bool bSecondWeapon);
void Say(uint16_t phrase, uint32_t param2 = 0, float volume = 1.0f, bool param4 = false, bool param5 = false, bool param6 = false); void Say(uint16_t phrase, uint32_t param2 = 0, float volume = 1.0f, bool param4 = false, bool param5 = false, bool param6 = false);
void RenderWeapon(bool bMuzzleFlash, bool bForShadow); void RenderWeapon(bool bWeapon, bool bMuzzleFlash, bool bForShadow);
void RenderForShadow(); void RenderForShadow();
static void (CPed::*orgGiveWeapon)(uint32_t weapon, uint32_t ammo, bool flag); static void (CPed::*orgGiveWeapon)(uint32_t weapon, uint32_t ammo, bool flag);

4
SilentPatchSA/SilentPatchSA.cpp
View file

@ -440,7 +440,7 @@ void RenderVehicleHiDetailAlphaCB_HunterDoor(RpAtomic* pAtomic)
void RenderWeapon(CPed* pPed) void RenderWeapon(CPed* pPed)
{ {
pPed->RenderWeapon(false, false); pPed->RenderWeapon(true, false, false);
ms_weaponPedsForPC.Insert(pPed); ms_weaponPedsForPC.Insert(pPed);
} }
@ -456,7 +456,7 @@ void RenderWeaponPedsForPC()
{ {
CPed* ped = **it; CPed* ped = **it;
ped->SetupLighting(); ped->SetupLighting();
ped->RenderWeapon(true, false); ped->RenderWeapon(false, true, false);
ped->RemoveLighting(); ped->RemoveLighting();
} }
} }