summaryrefslogtreecommitdiff
path: root/src/mapblock_mesh.cpp
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2012-03-19 02:59:12 +0100
committerPerttu Ahola <celeron55@gmail.com>2012-12-02 00:46:18 +0200
commit22e6fb7056dcc888e9ccf768fefb6c073077a3b5 (patch)
treef85461ee0449602fa12dde14b97c5c96cf813133 /src/mapblock_mesh.cpp
parente3258b78e263c3f95007e1fbc92fcc3a51646f69 (diff)
downloadminetest-22e6fb7056dcc888e9ccf768fefb6c073077a3b5.tar.gz
minetest-22e6fb7056dcc888e9ccf768fefb6c073077a3b5.tar.bz2
minetest-22e6fb7056dcc888e9ccf768fefb6c073077a3b5.zip
ShaderSource and silly example shaders
Diffstat (limited to 'src/mapblock_mesh.cpp')
-rw-r--r--src/mapblock_mesh.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index fdeb31f4d..cbc38ddb5 100644
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mesh.h"
#include "content_mapblock.h"
#include "noise.h"
+#include "shader.h"
#include "settings.h"
#include "util/directiontables.h"
@@ -1011,6 +1012,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
Convert MeshCollector to SMesh
Also store animation info
*/
+ video::E_MATERIAL_TYPE shadermat = m_gamedef->getShaderSource()->
+ getShader("the_darkness_of_light").material;
for(u32 i = 0; i < collector.prebuffers.size(); i++)
{
PreMeshBuffer &p = collector.prebuffers[i];
@@ -1077,6 +1080,9 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
material.setTexture(0, p.tile.texture.atlas);
p.tile.applyMaterialOptions(material);
+ //if(material.MaterialType == video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF)
+ material.MaterialType = shadermat;
+
// Create meshbuffer
// This is a "Standard MeshBuffer",