diff options
| author | aap <aap@papnet.eu> | 2021-05-23 17:55:55 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-24 20:45:21 +0200 |
| commit | e014bb5359ae464f14a413dd5ee98f0b5a385f67 (patch) | |
| tree | 0a687f497f318c4a849e7054f05851a73f2f0c0c /src/render | |
| parent | Undef PS2_AUDIO_CHANNELS for SQUEEZE_PERFORMANCE and VANILLA_DEFINES (diff) | |
| download | re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar.gz re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar.bz2 re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar.lz re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar.xz re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.tar.zst re3-e014bb5359ae464f14a413dd5ee98f0b5a385f67.zip | |
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/Coronas.cpp | 6 | ||||
| -rw-r--r-- | src/render/Occlusion.cpp | 4 | ||||
| -rw-r--r-- | src/render/Shadows.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp index 8b137aad..1ac3263c 100644 --- a/src/render/Coronas.cpp +++ b/src/render/Coronas.cpp @@ -913,9 +913,9 @@ CEntity::ProcessLightsForEntity(void) effect->light.shadowSize, 0.0f, 0.0f, -effect->light.shadowSize, 128, - effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f, - effect->col.g*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f, - effect->col.b*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f, + effect->col.r, + effect->col.g, + effect->col.b, 15.0f, 1.0f, 40.0f, false, 0.0f); }else if(lightFlickering){ CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, diff --git a/src/render/Occlusion.cpp b/src/render/Occlusion.cpp index 3ea5678c..ec7101a6 100644 --- a/src/render/Occlusion.cpp +++ b/src/render/Occlusion.cpp @@ -513,8 +513,8 @@ bool CEntity::IsEntityOccluded(void) { } if (COcclusion::aActiveOccluders[i].IsPointWithinOcclusionArea(coors.x, coors.y, 0.0f)) { - CVector min = m_matrix * CModelInfo::GetModelInfo(GetModelIndex())->GetColModel()->boundingBox.min; - CVector max = m_matrix * CModelInfo::GetModelInfo(GetModelIndex())->GetColModel()->boundingBox.max; + CVector min = m_matrix * CModelInfo::GetColModel(m_modelIndex)->boundingBox.min; + CVector max = m_matrix * CModelInfo::GetColModel(m_modelIndex)->boundingBox.max; if (CalcScreenCoors(min, &coors) && !COcclusion::aActiveOccluders[i].IsPointWithinOcclusionArea(coors.x, coors.y, 0.0f)) continue; if (CalcScreenCoors(CVector(max.x, max.y, min.z), &coors) && !COcclusion::aActiveOccluders[i].IsPointWithinOcclusionArea(coors.x, coors.y, 0.0f)) continue; diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp index 64b09395..ae4cf724 100644 --- a/src/render/Shadows.cpp +++ b/src/render/Shadows.cpp @@ -1406,7 +1406,7 @@ CShadows::CastShadowSectorList(CPtrList &PtrList, float fStartX, float fStartY, { pEntity->m_scanCode = CWorld::GetCurrentScanCode(); - if ( pEntity->bUsesCollision && !pEntity->m_flagE2 ) + if ( pEntity->bUsesCollision && !pEntity->bDontCastShadowsOn) { if ( IsAreaVisible(pEntity->m_area) ) { |