diff options
| author | Kahrl <kahrl@gmx.net> | 2012-01-21 00:11:44 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-01-22 17:24:50 +0200 |
| commit | 157a4cf18cb9c098f465b8baecd7d2cd5705f2dd (patch) | |
| tree | a194b86e0452d1dc892aec6b3ac940327ce85e2a /src/light.h | |
| parent | f22c73f50169b978f13c0b6511805b9d4a1a6871 (diff) | |
| download | minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.tar.gz minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.tar.bz2 minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.zip | |
Node placement / mineral / serialization / iron freq / node_dig callback
- Node placement code moved to Lua
- Mineral system removed (added default:stone_with_coal and default:stone_with_iron).
- MapBlock and MapNode serialization updated.
- Mapgen: Frequency of iron increased.
- node_dig callback and related changes.
Diffstat (limited to 'src/light.h')
| -rw-r--r-- | src/light.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/light.h b/src/light.h index c1af7fa62..238acce43 100644 --- a/src/light.h +++ b/src/light.h @@ -75,16 +75,27 @@ inline u8 undiminish_light(u8 light) extern u8 light_decode_table[LIGHT_MAX+1]; +// 0 <= light <= LIGHT_SUN +// 0 <= return value <= 255 inline u8 decode_light(u8 light) { - if(light == LIGHT_SUN) - return light_decode_table[LIGHT_MAX]; - if(light > LIGHT_MAX) light = LIGHT_MAX; return light_decode_table[light]; } +// 0 <= daylight_factor <= 1000 +// 0 <= lightday, lightnight <= LIGHT_SUN +// 0 <= return value <= LIGHT_SUN +inline u8 blend_light(u32 daylight_factor, u8 lightday, u8 lightnight) +{ + u32 c = 1000; + u32 l = ((daylight_factor * lightday + (c-daylight_factor) * lightnight))/c; + if(l > LIGHT_SUN) + l = LIGHT_SUN; + return l; +} + #endif |