summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.h
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-30 18:53:54 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-30 18:55:43 +0200
commit4ef9c7675ada82961d83601712a47ebad78b67b5 (patch)
treecdfd863219a8dc1031e727740e7d895296c5855d /src/mapblock_mesh.h
parentf69123050b62ada635751b7155bb6822b0a97a9b (diff)
parentdbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff)
downloadminetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.gz
minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.bz2
minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/mapblock_mesh.h')
-rw-r--r--src/mapblock_mesh.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index 591172bc9..d43c19a25 100644
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -121,6 +121,9 @@ private:
core::array<PreMeshBuffer> m_prebuffers;
};
+// Helper functions
+video::SColor MapBlock_LightColor(u8 alpha, u8 light);
+
class MapBlock;
struct MeshMakeData
@@ -137,6 +140,7 @@ struct MeshMakeData
void fill(u32 daynight_ratio, MapBlock *block);
};
+// This is the highest-level function in here
scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
#endif