summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-07-23 04:10:17 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-07-23 04:10:17 +0300
commitd67cef0eb76c4c35cebb4c8f35d62f90c573b198 (patch)
tree6d83bcea95c6795ec1690c95406d20358f4745fc /src/mapblock_mesh.cpp
parent8993d9dd8321aad1243f4fb7fc55259c3747224f (diff)
downloadminetest-d67cef0eb76c4c35cebb4c8f35d62f90c573b198.tar.gz
minetest-d67cef0eb76c4c35cebb4c8f35d62f90c573b198.tar.bz2
minetest-d67cef0eb76c4c35cebb4c8f35d62f90c573b198.zip
Made dark places tint slightly in blue
Diffstat (limited to 'src/mapblock_mesh.cpp')
-rw-r--r--src/mapblock_mesh.cpp27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index 447716d00..bcbf37418 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -140,9 +140,24 @@ void getNodeVertexDirs(v3s16 dir, v3s16 *vertex_dirs)
}
}
-inline video::SColor lightColor(u8 alpha, u8 light)
+video::SColor MapBlock_LightColor(u8 alpha, u8 light)
{
+#if 0
return video::SColor(alpha,light,light,light);
+#endif
+ //return video::SColor(alpha,light,light,MYMAX(0, (s16)light-25)+25);
+ /*return video::SColor(alpha,light,light,MYMAX(0,
+ pow((float)light/255.0, 0.8)*255.0));*/
+#if 1
+ // Emphase blue a bit in darker places
+ float lim = 80;
+ float power = 0.7;
+ if(light > lim)
+ return video::SColor(alpha,light,light,light);
+ else
+ return video::SColor(alpha,light,light,MYMAX(0,
+ pow((float)light/lim, power)*lim));
+#endif
}
struct FastFace
@@ -198,7 +213,7 @@ void makeFastFace(TileSpec tile, u8 li0, u8 li1, u8 li2, u8 li3, v3f p,
float w = tile.texture.size.X;
float h = tile.texture.size.Y;
- /*video::SColor c = lightColor(alpha, li);
+ /*video::SColor c = MapBlock_LightColor(alpha, li);
face.vertices[0] = video::S3DVertex(vertex_pos[0], v3f(0,1,0), c,
core::vector2d<f32>(x0+w*abs_scale, y0+h));
@@ -210,16 +225,16 @@ void makeFastFace(TileSpec tile, u8 li0, u8 li1, u8 li2, u8 li3, v3f p,
core::vector2d<f32>(x0+w*abs_scale, y0));*/
face.vertices[0] = video::S3DVertex(vertex_pos[0], v3f(0,1,0),
- lightColor(alpha, li0),
+ MapBlock_LightColor(alpha, li0),
core::vector2d<f32>(x0+w*abs_scale, y0+h));
face.vertices[1] = video::S3DVertex(vertex_pos[1], v3f(0,1,0),
- lightColor(alpha, li1),
+ MapBlock_LightColor(alpha, li1),
core::vector2d<f32>(x0, y0+h));
face.vertices[2] = video::S3DVertex(vertex_pos[2], v3f(0,1,0),
- lightColor(alpha, li2),
+ MapBlock_LightColor(alpha, li2),
core::vector2d<f32>(x0, y0));
face.vertices[3] = video::S3DVertex(vertex_pos[3], v3f(0,1,0),
- lightColor(alpha, li3),
+ MapBlock_LightColor(alpha, li3),
core::vector2d<f32>(x0+w*abs_scale, y0));
face.tile = tile;