diff options
author | Perttu Ahola <celeron55@gmail.com> | 2010-12-13 21:32:35 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2010-12-13 21:32:35 +0200 |
commit | 3ac2abb0b5f84819abe6feea9d7b883b40369610 (patch) | |
tree | 2fad297e30cdae1b205d77dc559b25d9e5a0efc7 /src/mapblock.h | |
parent | 22037459e321cfe51719c58f492145d39b48c196 (diff) | |
download | minetest-3ac2abb0b5f84819abe6feea9d7b883b40369610.tar.gz minetest-3ac2abb0b5f84819abe6feea9d7b883b40369610.tar.bz2 minetest-3ac2abb0b5f84819abe6feea9d7b883b40369610.zip |
commit before content-tile separation
Diffstat (limited to 'src/mapblock.h')
-rw-r--r-- | src/mapblock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapblock.h b/src/mapblock.h index 76465903b..f725aa1f5 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -46,7 +46,7 @@ enum{ struct FastFace { - u8 material; + u16 tile; video::S3DVertex vertices[4]; // Precalculated vertices }; @@ -283,7 +283,7 @@ public: setNode(x0+x, y0+y, z0+z, node); } - static FastFace * makeFastFace(u8 material, u8 light, v3f p, + static FastFace * makeFastFace(u16 tile, u8 light, v3f p, v3f dir, v3f scale, v3f posRelative_f); u8 getFaceLight(v3s16 p, v3s16 face_dir); |