diff options
| author | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
|---|---|---|
| committer | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
| commit | 77df09540c4d7eadef760779e123af88a48aafaa (patch) | |
| tree | febf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/mapblock_mesh.h | |
| parent | 3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff) | |
| parent | a1eb2836c0764829ebad1462432bb3c5f32750df (diff) | |
| download | minetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz | |
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts:
src/scriptapi.cpp
Diffstat (limited to 'src/mapblock_mesh.h')
| -rw-r--r-- | src/mapblock_mesh.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h index 36cc9be24..4d3e7d29d 100644 --- a/src/mapblock_mesh.h +++ b/src/mapblock_mesh.h @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "mapblock_nodemod.h" +#include "tile.h" #include "voxel.h" class IGameDef; @@ -125,6 +126,8 @@ private: // Helper functions video::SColor MapBlock_LightColor(u8 alpha, u8 light); +TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 face_dir, + NodeModMap *temp_mods, ITextureSource *tsrc, INodeDefManager *ndef); class MapBlock; @@ -140,6 +143,11 @@ struct MeshMakeData parent of block. */ void fill(u32 daynight_ratio, MapBlock *block); + + /* + Set up with only a single node at (1,1,1) + */ + void fillSingleNode(u32 daynight_ratio, MapNode *node); }; // This is the highest-level function in here |