Fix warnings and other misc. minor changes

[minetest.git] / src / mapblock_mesh.h

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index c5295499884d63c39d13080f85bf972c1488cb7b..be56d4c586a03e37ac20bcc7120f988073665b68 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -174,6 +174,10 @@ struct MeshCollector
        void append(const TileSpec &material,
                        const video::S3DVertex *vertices, u32 numVertices,
                        const u16 *indices, u32 numIndices);
+       void append(const TileSpec &material,
+                       const video::S3DVertex *vertices, u32 numVertices,
+                       const u16 *indices, u32 numIndices,
+                       v3f pos, video::SColor c);
 };
 
 // This encodes
@@ -191,6 +195,11 @@ u16 getInteriorLight(MapNode n, s32 increment, INodeDefManager *ndef);
 u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, INodeDefManager *ndef);
 u16 getSmoothLight(v3s16 p, v3s16 corner, MeshMakeData *data);
 
+// Converts from day + night color values (0..255)
+// and a given daynight_ratio to the final SColor shown on screen.
+void finalColorBlend(video::SColor& result,
+               u8 day, u8 night, u32 daynight_ratio);
+
 // Retrieves the TileSpec of a face of a node
 // Adds MATERIAL_FLAG_CRACK if the node is cracked
 TileSpec getNodeTileN(MapNode mn, v3s16 p, u8 tileindex, MeshMakeData *data);