diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-01-17 14:57:37 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-17 14:57:37 +0200 |
| commit | 0fa0e0752a28eeb43195f2288c018d5c0b24520b (patch) | |
| tree | 72c05dc4cd98663d92a6a312c6b8128c18791590 /src/mapblock.cpp | |
| parent | bd26be262d30eeb0ca818b634891704de4365893 (diff) | |
| download | minetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.tar.gz minetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.tar.bz2 minetest-0fa0e0752a28eeb43195f2288c018d5c0b24520b.zip | |
old water removed, some fixes here and there
Diffstat (limited to 'src/mapblock.cpp')
| -rw-r--r-- | src/mapblock.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mapblock.cpp b/src/mapblock.cpp index 9f91f0583..cf9114b20 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -570,8 +570,9 @@ void MapBlock::updateMesh(u32 daynight_ratio) } #endif - // 4-21ms - //TimeTaker timer1("updateMesh()", g_device); + // 4-21ms for MAP_BLOCKSIZE=16 + // 24-155ms for MAP_BLOCKSIZE=32 + //TimeTaker timer1("updateMesh()"); core::array<FastFace> fastfaces_new; @@ -691,7 +692,7 @@ void MapBlock::updateMesh(u32 daynight_ratio) // This will lead to infinite memory usage because or irrlicht. //mesh_new->setHardwareMappingHint(scene::EHM_STATIC); - /*std::cout<<"MapBlock has "<<fastfaces_new->getSize()<<" faces " + /*std::cout<<"MapBlock has "<<fastfaces_new.size()<<" faces " <<"and uses "<<mesh_new->getMeshBufferCount() <<" materials (meshbuffers)"<<std::endl;*/ } @@ -906,12 +907,12 @@ bool MapBlock::propagateSunlight(core::map<v3s16, bool> & light_sources, else { MapNode n = getNode(v3s16(x, MAP_BLOCKSIZE-1, z)); - if(n.d == CONTENT_WATER || n.d == CONTENT_OCEAN) + if(n.d == CONTENT_WATER || n.d == CONTENT_WATERSOURCE) { no_sunlight = true; } } - // NOTE: As of now, it just would make everything dark. + // NOTE: As of now, this just would make everything dark. // No sunlight here //no_sunlight = true; } |