diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-28 15:24:37 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-06-28 15:24:37 +0200 |
commit | 209b7891d10f93754540114de34b0e4734c26630 (patch) | |
tree | 3008aa7db2bca46434ed99f7165e31e19a9462b1 | |
parent | fix (diff) | |
parent | renamed 2dfx shadowRange to Size (diff) | |
download | re3-209b7891d10f93754540114de34b0e4734c26630.tar re3-209b7891d10f93754540114de34b0e4734c26630.tar.gz re3-209b7891d10f93754540114de34b0e4734c26630.tar.bz2 re3-209b7891d10f93754540114de34b0e4734c26630.tar.lz re3-209b7891d10f93754540114de34b0e4734c26630.tar.xz re3-209b7891d10f93754540114de34b0e4734c26630.tar.zst re3-209b7891d10f93754540114de34b0e4734c26630.zip |
-rw-r--r-- | src/core/FileLoader.cpp | 2 | ||||
-rw-r--r-- | src/entities/Entity.cpp | 10 | ||||
-rw-r--r-- | src/render/2dEffect.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index a1fb5ace..3c4ed040 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -945,7 +945,7 @@ CFileLoader::Load2dEffect(const char *line) &effect->light.dist, &effect->light.range, &effect->light.size, - &effect->light.shadowRange, + &effect->light.shadowSize, &shadowIntens, &lightType, &roadReflection, &flare, &flags); effect->light.corona = RwTextureRead(corona, nil); effect->light.shadow = RwTextureRead(shadow, nil); diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index a9b6b2b8..31da489f 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -803,12 +803,12 @@ CEntity::ProcessLightsForEntity(void) } // Light shadow - if(effect->light.shadowRange != 0.0f){ + if(effect->light.shadowSize != 0.0f){ if(lightOn){ CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, effect->light.shadow, &pos, - effect->light.shadowRange, 0.0f, - 0.0f, -effect->light.shadowRange, + 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, @@ -817,8 +817,8 @@ CEntity::ProcessLightsForEntity(void) }else if(lightFlickering){ CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, effect->light.shadow, &pos, - effect->light.shadowRange, 0.0f, - 0.0f, -effect->light.shadowRange, + effect->light.shadowSize, 0.0f, + 0.0f, -effect->light.shadowSize, 0, 0.0f, 0.0f, 0.0f, 15.0f, 1.0f, 40.0f, false, 0.0f); } diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h index 4256a0ac..628d64c2 100644 --- a/src/render/2dEffect.h +++ b/src/render/2dEffect.h @@ -44,7 +44,7 @@ public: float dist; float range; // of pointlight float size; - float shadowRange; + float shadowSize; uint8 lightType; // LIGHT_ uint8 roadReflection; uint8 flareType; |