summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.h
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2016-02-06 05:49:12 +0100
committerparamat <mat.gregory@virginmedia.com>2016-02-07 04:12:49 +0000
commitbf884e37a06e0a8dd6c31789a69921f07ec5a9a9 (patch)
treeb756a69e3208eeb2e6df382b024e78d20806b7a1 /src/mapblock_mesh.h
parent0e75eb4324ba71c3d685b2f22a8a36b3aa0c9ef5 (diff)
downloadminetest-bf884e37a06e0a8dd6c31789a69921f07ec5a9a9.tar.gz
minetest-bf884e37a06e0a8dd6c31789a69921f07ec5a9a9.tar.bz2
minetest-bf884e37a06e0a8dd6c31789a69921f07ec5a9a9.zip
Use tangent space meshes only when shaders are enabled
Diffstat (limited to 'src/mapblock_mesh.h')
-rw-r--r--src/mapblock_mesh.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index 8e994ec6b..9c4fb655a 100644
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -104,7 +104,7 @@ public:
// Returns true if anything has been changed.
bool animate(bool faraway, float time, int crack, u32 daynight_ratio);
- scene::SMesh *getMesh()
+ scene::IMesh *getMesh()
{
return m_mesh;
}
@@ -130,7 +130,7 @@ public:
void updateCameraOffset(v3s16 camera_offset);
private:
- scene::SMesh *m_mesh;
+ scene::IMesh *m_mesh;
MinimapMapblock *m_minimap_mapblock;
IGameDef *m_gamedef;
ITextureSource *m_tsrc;
@@ -177,7 +177,7 @@ struct PreMeshBuffer
{
TileSpec tile;
std::vector<u16> indices;
- std::vector<video::S3DVertexTangents> vertices;
+ std::vector<video::S3DVertex> vertices;
};
struct MeshCollector