diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-04-22 09:54:05 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-04-22 09:54:05 +0300 |
| commit | b36e5c05088aca7b500bf5fe355f4b3c205a59a3 (patch) | |
| tree | a6982d07c47776de55764a330e8accbca579180d /src/mapblock.cpp | |
| parent | 983bf6677d495184e67bf8c4363467752c9f9c75 (diff) | |
| download | minetest-b36e5c05088aca7b500bf5fe355f4b3c205a59a3.tar.gz minetest-b36e5c05088aca7b500bf5fe355f4b3c205a59a3.tar.bz2 minetest-b36e5c05088aca7b500bf5fe355f4b3c205a59a3.zip | |
Removed IrrlichtWrapper
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index 5b8bc7b9f..6f7e7533e 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock.h" #include "map.h" -// For g_settings and g_irrlicht +// For g_settings #include "main.h" #include "light.h" #include <sstream> @@ -676,7 +676,6 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data) const u16 indices[] = {0,1,2,2,3,0}; - //video::ITexture *texture = g_irrlicht->getTexture(f.tile.spec); video::ITexture *texture = f.tile.texture.atlas; if(texture == NULL) continue; @@ -701,12 +700,10 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data) // Flowing water material video::SMaterial material_water1; material_water1.setFlag(video::EMF_LIGHTING, false); - //material_water1.setFlag(video::EMF_BACK_FACE_CULLING, false); + material_water1.setFlag(video::EMF_BACK_FACE_CULLING, false); material_water1.setFlag(video::EMF_BILINEAR_FILTER, false); material_water1.setFlag(video::EMF_FOG_ENABLE, true); material_water1.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; - //TODO - //material_water1.setTexture(0, g_irrlicht->getTexture("water.png")); AtlasPointer pa_water1 = g_texturesource->getTexture( g_texturesource->getTextureId("water.png")); material_water1.setTexture(0, pa_water1.atlas); @@ -718,8 +715,6 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data) material_leaves1.setFlag(video::EMF_BILINEAR_FILTER, false); material_leaves1.setFlag(video::EMF_FOG_ENABLE, true); material_leaves1.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - //TODO - //material_leaves1.setTexture(0, g_irrlicht->getTexture("leaves.png")); AtlasPointer pa_leaves1 = g_texturesource->getTexture( g_texturesource->getTextureId("leaves.png")); material_leaves1.setTexture(0, pa_leaves1.atlas); |