mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 12:09:02 +00:00
Code Issues Projects Releases Wiki Activity

renamed 2dfx shadowRange to Size

Browse source
This commit is contained in:
aap 2020-06-28 12:05:31 +02:00
parent d6e111bb67
commit 418bee9c22
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/FileLoader.cpp
View file

@ -945,7 +945,7 @@ CFileLoader::Load2dEffect(const char *line)
&effect->light.dist, &effect->light.dist,
&effect->light.range, &effect->light.range,
&effect->light.size, &effect->light.size,
&effect->light.shadowRange, &effect->light.shadowSize,
&shadowIntens, &lightType, &roadReflection, &flare, &flags); &shadowIntens, &lightType, &roadReflection, &flare, &flags);
effect->light.corona = RwTextureRead(corona, nil); effect->light.corona = RwTextureRead(corona, nil);
effect->light.shadow = RwTextureRead(shadow, nil); effect->light.shadow = RwTextureRead(shadow, nil);

10
src/entities/Entity.cpp
View file

@ -803,12 +803,12 @@ CEntity::ProcessLightsForEntity(void)
} }
// Light shadow // Light shadow
if(effect->light.shadowRange != 0.0f){ if(effect->light.shadowSize != 0.0f){
if(lightOn){ if(lightOn){
CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
effect->light.shadow, &pos, effect->light.shadow, &pos,
effect->light.shadowRange, 0.0f, effect->light.shadowSize, 0.0f,
0.0f, -effect->light.shadowRange, 0.0f, -effect->light.shadowSize,
128, 128,
effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f, effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
effect->col.g*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){ }else if(lightFlickering){
CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
effect->light.shadow, &pos, effect->light.shadow, &pos,
effect->light.shadowRange, 0.0f, effect->light.shadowSize, 0.0f,
0.0f, -effect->light.shadowRange, 0.0f, -effect->light.shadowSize,
0, 0.0f, 0.0f, 0.0f, 0, 0.0f, 0.0f, 0.0f,
15.0f, 1.0f, 40.0f, false, 0.0f); 15.0f, 1.0f, 40.0f, false, 0.0f);
} }

2
src/render/2dEffect.h
View file

@ -44,7 +44,7 @@ public:
float dist; float dist;
float range; // of pointlight float range; // of pointlight
float size; float size;
float shadowRange; float shadowSize;
uint8 lightType; // LIGHT_ uint8 lightType; // LIGHT_
uint8 roadReflection; uint8 roadReflection;
uint8 flareType; uint8 flareType;