Dungeongen: Fix out-of-voxelmanip access segfault

[minetest.git] / src / light.h

diff --git a/src/light.h b/src/light.h
index 218af348e1a21419add94aecc622cd9051a4c50d..984e6d7c28d5d59b5e182b6f3f3e71f63c084497 100644 (file)
--- a/src/light.h
+++ b/src/light.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -21,24 +21,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LIGHT_HEADER
 
 #include "irrlichttypes.h"
-#include "debug.h"
-
-/*
-       Day/night cache:
-       Meshes are cached for different day-to-night transition values
-*/
-
-/*#define DAYNIGHT_CACHE_COUNT 3
-// First one is day, last one is night.
-extern u32 daynight_cache_ratios[DAYNIGHT_CACHE_COUNT];*/
 
 /*
        Lower level lighting stuff
 */
 
 // This directly sets the range of light.
-// Actually this is not the real maximum, and this is not the
-// brightest. The brightest is LIGHT_SUN.
+// Actually this is not the real maximum, and this is not the brightest, the
+// brightest is LIGHT_SUN.
+// If changed, this constant as defined in builtin/game/constants.lua must
+// also be changed.
 #define LIGHT_MAX 14
 // Light is stored as 4 bits, thus 15 is the maximum.
 // This brightness is reserved for sunlight
@@ -73,7 +65,21 @@ inline u8 undiminish_light(u8 light)
        return light + 1;
 }
 
-extern u8 light_decode_table[LIGHT_MAX+1];
+#ifndef SERVER
+
+/**
+ * \internal
+ *
+ * \warning DO NOT USE this directly; it is here simply so that decode_light()
+ * can be inlined.
+ *
+ * Array size is #LIGHTMAX+1
+ *
+ * The array is a lookup table to convert the internal representation of light
+ * (brightness) to the display brightness.
+ *
+ */
+extern const u8 *light_decode_table;
 
 // 0 <= light <= LIGHT_SUN
 // 0 <= return value <= 255
@@ -85,6 +91,28 @@ inline u8 decode_light(u8 light)
        return light_decode_table[light];
 }
 
+// 0.0 <= light <= 1.0
+// 0.0 <= return value <= 1.0
+inline float decode_light_f(float light_f)
+{
+       s32 i = (u32)(light_f * LIGHT_MAX + 0.5);
+
+       if(i <= 0)
+               return (float)light_decode_table[0] / 255.0;
+       if(i >= LIGHT_MAX)
+               return (float)light_decode_table[LIGHT_MAX] / 255.0;
+
+       float v1 = (float)light_decode_table[i-1] / 255.0;
+       float v2 = (float)light_decode_table[i] / 255.0;
+       float f0 = (float)i - 0.5;
+       float f = light_f * LIGHT_MAX - f0;
+       return f * v2 + (1.0 - f) * v1;
+}
+
+void set_light_table(float gamma);
+
+#endif // ifndef SERVER
+
 // 0 <= daylight_factor <= 1000
 // 0 <= lightday, lightnight <= LIGHT_SUN
 // 0 <= return value <= LIGHT_SUN