mirror of https://github.com/zeldaret/oot.git
-> BLEND_RATE_AND_FOG_NEAR
This commit is contained in:
parent
b57da0041d
commit
739eddc7a1
|
@ -155,7 +155,7 @@ typedef struct CurrentEnvLightSettings {
|
|||
// The blendRate determines how fast the current light settings fade to the next one
|
||||
// (under LIGHT_MODE_SETTINGS, otherwise unused).
|
||||
|
||||
#define ENV_LIGHT_SETTINGS_BLEND_RATE_AND_FOG_NEAR_PACK(blendRate, fogNear) (s16)((((blendRate) / 4) << 10) | (fogNear))
|
||||
#define BLEND_RATE_AND_FOG_NEAR(blendRate, fogNear) (s16)((((blendRate) / 4) << 10) | (fogNear))
|
||||
|
||||
// Get blend rate from `EnvLightSettings.blendRateAndFogNear` in 0-255 range
|
||||
#define ENV_LIGHT_SETTINGS_BLEND_RATE_U8(blendRateAndFogNear) (u8)(((blendRateAndFogNear) >> 10) * 4)
|
||||
|
|
|
@ -296,7 +296,7 @@ class EnvLightSettingsListResource(CDataArrayNamedLengthResource):
|
|||
if blendRate < 0:
|
||||
blendRate += 0x100
|
||||
fogNear = v & 0x3FF
|
||||
return f"ENV_LIGHT_SETTINGS_BLEND_RATE_AND_FOG_NEAR_PACK({blendRate}, {fogNear})"
|
||||
return f"BLEND_RATE_AND_FOG_NEAR({blendRate}, {fogNear})"
|
||||
|
||||
elem_cdata_ext = CDataExt_Struct(
|
||||
(
|
||||
|
|
Loading…
Reference in New Issue