summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.h
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2015-06-14 21:13:36 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2015-06-14 21:13:36 +0200
commit43fcfbfe05578d7471d40c8c087fd04e24b264b5 (patch)
tree7b26cc3c87f3255d36bfdee21f1f65785d274bef /src/mapblock_mesh.h
parentd105bf27dd9f570754f470c3bb6a46369c4aaaad (diff)
downloadminetest-43fcfbfe05578d7471d40c8c087fd04e24b264b5.tar.gz
minetest-43fcfbfe05578d7471d40c8c087fd04e24b264b5.tar.bz2
minetest-43fcfbfe05578d7471d40c8c087fd04e24b264b5.zip
Improved parallax mapping. Generate heightmaps on the fly.
Diffstat (limited to 'src/mapblock_mesh.h')
-rw-r--r--src/mapblock_mesh.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index b334ce469..72c90c3e5 100644
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <map>
class IGameDef;
+class IShaderSource;
/*
Mesh making stuff
@@ -123,6 +124,8 @@ public:
private:
scene::SMesh *m_mesh;
IGameDef *m_gamedef;
+ ITextureSource *m_tsrc;
+ IShaderSource *m_shdrsrc;
bool m_enable_shaders;
bool m_enable_highlighting;
@@ -165,13 +168,12 @@ struct PreMeshBuffer
{
TileSpec tile;
std::vector<u16> indices;
- std::vector<video::S3DVertex> vertices;
+ std::vector<video::S3DVertexTangents> vertices;
};
struct MeshCollector
{
std::vector<PreMeshBuffer> prebuffers;
-
void append(const TileSpec &material,
const video::S3DVertex *vertices, u32 numVertices,
const u16 *indices, u32 numIndices);