X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=19f2deb3279445e51d7e3b3ab95f77761c6c6f28;hb=6929206bc29960b0fab8c0a0a65a48992cfff398;hp=d68a8db0211eb7bd14afed2b0988e9c9962275dc;hpb=9f882bf74d452521cb7fb1806ab453aaa28da343;p=oweals%2Fminetest.git diff --git a/src/voxel.cpp b/src/voxel.cpp index d68a8db02..19f2deb32 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -1,28 +1,28 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "voxel.h" #include "map.h" - -// For TimeTaker -#include "utility.h" #include "gettime.h" +#include "nodedef.h" +#include "util/timetaker.h" +#include // memcpy, memset /* Debug stuff @@ -41,7 +41,6 @@ VoxelManipulator::VoxelManipulator(): m_data(NULL), m_flags(NULL) { - m_disable_water_climb = false; } VoxelManipulator::~VoxelManipulator() @@ -65,13 +64,14 @@ void VoxelManipulator::clear() m_flags = NULL; } -void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) +void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef, + VoxelPrintMode mode) { v3s16 em = m_area.getExtent(); v3s16 of = m_area.MinEdge; o<<"size: "<=m_area.MinEdge.Y; y--) { if(em.X >= 3 && em.Y >= 3) @@ -88,15 +88,14 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) { u8 f = m_flags[m_area.index(x,y,z)]; char c; - if(f & VOXELFLAG_NOT_LOADED) + if(f & VOXELFLAG_NO_DATA) c = 'N'; - else if(f & VOXELFLAG_INEXISTENT) - c = 'I'; else { c = 'X'; - u8 m = m_data[m_area.index(x,y,z)].d; - u8 pr = m_data[m_area.index(x,y,z)].param2; + MapNode n = m_data[m_area.index(x,y,z)]; + content_t m = n.getContent(); + u8 pr = n.param2; if(mode == VOXELPRINT_MATERIAL) { if(m <= 9) @@ -104,7 +103,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) } else if(mode == VOXELPRINT_WATERPRESSURE) { - if(m == CONTENT_WATER) + if(ndef->get(m).isLiquid()) { c = 'w'; if(pr <= 9) @@ -119,6 +118,21 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) c = '#'; } } + else if(mode == VOXELPRINT_LIGHT_DAY) + { + if(ndef->get(m).light_source != 0) + c = 'S'; + else if(ndef->get(m).light_propagates == false) + c = 'X'; + else + { + u8 light = n.getLight(LIGHTBANK_DAY, ndef); + if(light < 10) + c = '0' + light; + else + c = 'a' + (light-10); + } + } } o< & light_sources) + std::set & light_sources, INodeDefManager *nodemgr) { v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -275,42 +309,42 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, v3s16(0,-1,0), // bottom v3s16(-1,0,0), // left }; - - emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); + + addArea(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); // Loop through 6 neighbors for(u16 i=0; i<6; i++) { // Get the position of the neighbor node v3s16 n2pos = p + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + /* If the neighbor is dimmer than what was specified as oldlight (the light of the previous node) */ - if(n2.getLight(bank) < oldlight) + u8 light2 = n2.getLight(bank, nodemgr); + if(light2 < oldlight) { /* And the neighbor is transparent and it has some light */ - if(n2.light_propagates() && n2.getLight(bank) != 0) + if(nodemgr->get(n2).light_propagates && light2 != 0) { /* Set light to 0 and add to queue */ - u8 current_light = n2.getLight(bank); - n2.setLight(bank, 0); - - unspreadLight(bank, n2pos, current_light, light_sources); - + n2.setLight(bank, 0, nodemgr); + + unspreadLight(bank, n2pos, light2, light_sources, nodemgr); + /* Remove from light_sources if it is there NOTE: This doesn't happen nearly at all @@ -323,7 +357,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, } } else{ - light_sources.insert(n2pos, true); + light_sources.insert(n2pos); } } } @@ -347,24 +381,16 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, values of from_nodes are lighting values. */ void VoxelManipulator::unspreadLight(enum LightBank bank, - core::map & from_nodes, - core::map & light_sources) + std::map & from_nodes, + std::set & light_sources, INodeDefManager *nodemgr) { if(from_nodes.size() == 0) return; - - core::map::Iterator j; - j = from_nodes.getIterator(); - for(; j.atEnd() == false; j++) + for(std::map::iterator j = from_nodes.begin(); + j != from_nodes.end(); ++j) { - v3s16 pos = j.getNode()->getKey(); - - //MapNode &n = m_data[m_area.index(pos)]; - - u8 oldlight = j.getNode()->getValue(); - - unspreadLight(bank, pos, oldlight, light_sources); + unspreadLight(bank, j->first, j->second, light_sources, nodemgr); } } #endif @@ -399,10 +425,10 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16(0,-1,0), // bottom v3s16(-1,0,0), // left }; - + if(from_nodes.size() == 0) return; - + core::map unlighted_nodes; core::map::Iterator j; j = from_nodes.getIterator(); @@ -410,46 +436,46 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, for(; j.atEnd() == false; j++) { v3s16 pos = j.getNode()->getKey(); - - emerge(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); + + addArea(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); //MapNode &n = m_data[m_area.index(pos)]; - + u8 oldlight = j.getNode()->getValue(); - + // Loop through 6 neighbors for(u16 i=0; i<6; i++) { // Get the position of the neighbor node v3s16 n2pos = pos + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + /* If the neighbor is dimmer than what was specified as oldlight (the light of the previous node) */ - if(n2.getLight(bank) < oldlight) + if(n2.getLight(bank, nodemgr) < oldlight) { /* And the neighbor is transparent and it has some light */ - if(n2.light_propagates() && n2.getLight(bank) != 0) + if(nodemgr->get(n2).light_propagates && n2.getLight(bank, nodemgr) != 0) { /* Set light to 0 and add to queue */ - u8 current_light = n2.getLight(bank); + u8 current_light = n2.getLight(bank, nodemgr); n2.setLight(bank, 0); unlighted_nodes.insert(n2pos, current_light); - + /* Remove from light_sources if it is there NOTE: This doesn't happen nearly at all @@ -471,13 +497,14 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, < 0) unspreadLight(bank, unlighted_nodes, light_sources); } #endif -void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p) +void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p, + INodeDefManager *nodemgr) { const v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -488,16 +515,16 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p) v3s16(-1,0,0), // left }; - emerge(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); + addArea(VoxelArea(p - v3s16(1,1,1), p + v3s16(1,1,1))); u32 i = m_area.index(p); - - if(m_flags[i] & VOXELFLAG_INEXISTENT) + + if(m_flags[i] & VOXELFLAG_NO_DATA) return; MapNode &n = m_data[i]; - u8 oldlight = n.getLight(bank); + u8 oldlight = n.getLight(bank, nodemgr); u8 newlight = diminish_light(oldlight); // Loop through 6 neighbors @@ -505,48 +532,53 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p) { // Get the position of the neighbor node v3s16 n2pos = p + dirs[i]; - + u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + + u8 light2 = n2.getLight(bank, nodemgr); + /* If the neighbor is brighter than the current node, add to list (it will light up this node on its turn) */ - if(n2.getLight(bank) > undiminish_light(oldlight)) + if(light2 > undiminish_light(oldlight)) { - spreadLight(bank, n2pos); + spreadLight(bank, n2pos, nodemgr); } /* If the neighbor is dimmer than how much light this node would spread on it, add to list */ - if(n2.getLight(bank) < newlight) + if(light2 < newlight) { - if(n2.light_propagates()) + if(nodemgr->get(n2).light_propagates) { - n2.setLight(bank, newlight); - spreadLight(bank, n2pos); + n2.setLight(bank, newlight, nodemgr); + spreadLight(bank, n2pos, nodemgr); } } } } -#if 1 +#if 0 /* Lights neighbors of from_nodes, collects all them and then goes on recursively. + + NOTE: This is faster on small areas but will overflow the + stack on large areas. Thus it is not used. */ void VoxelManipulator::spreadLight(enum LightBank bank, core::map & from_nodes) { if(from_nodes.size() == 0) return; - + core::map lighted_nodes; core::map::Iterator j; j = from_nodes.getIterator(); @@ -560,13 +592,13 @@ void VoxelManipulator::spreadLight(enum LightBank bank, } #endif -#if 0 +#if 1 /* Lights neighbors of from_nodes, collects all them and then goes on recursively. */ void VoxelManipulator::spreadLight(enum LightBank bank, - core::map & from_nodes) + std::set & from_nodes, INodeDefManager *nodemgr) { const v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -579,25 +611,24 @@ void VoxelManipulator::spreadLight(enum LightBank bank, if(from_nodes.size() == 0) return; - - core::map lighted_nodes; - core::map::Iterator j; - j = from_nodes.getIterator(); - for(; j.atEnd() == false; j++) + std::set lighted_nodes; + + for(std::set::iterator j = from_nodes.begin(); + j != from_nodes.end(); ++j) { - v3s16 pos = j.getNode()->getKey(); + v3s16 pos = *j; - emerge(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); + addArea(VoxelArea(pos - v3s16(1,1,1), pos + v3s16(1,1,1))); u32 i = m_area.index(pos); - - if(m_flags[i] & VOXELFLAG_INEXISTENT) + + if(m_flags[i] & VOXELFLAG_NO_DATA) continue; MapNode &n = m_data[i]; - u8 oldlight = n.getLight(bank); + u8 oldlight = n.getLight(bank, nodemgr); u8 newlight = diminish_light(oldlight); // Loop through 6 neighbors @@ -605,34 +636,36 @@ void VoxelManipulator::spreadLight(enum LightBank bank, { // Get the position of the neighbor node v3s16 n2pos = pos + dirs[i]; - + try { u32 n2i = m_area.index(n2pos); - if(m_flags[n2i] & VOXELFLAG_INEXISTENT) + if(m_flags[n2i] & VOXELFLAG_NO_DATA) continue; MapNode &n2 = m_data[n2i]; - + + u8 light2 = n2.getLight(bank, nodemgr); + /* If the neighbor is brighter than the current node, add to list (it will light up this node on its turn) */ - if(n2.getLight(bank) > undiminish_light(oldlight)) + if(light2 > undiminish_light(oldlight)) { - lighted_nodes.insert(n2pos, true); + lighted_nodes.insert(n2pos); } /* If the neighbor is dimmer than how much light this node would spread on it, add to list */ - if(n2.getLight(bank) < newlight) + if(light2 < newlight) { - if(n2.light_propagates()) + if(nodemgr->get(n2).light_propagates) { - n2.setLight(bank, newlight); - lighted_nodes.insert(n2pos, true); + n2.setLight(bank, newlight, nodemgr); + lighted_nodes.insert(n2pos); } } } @@ -647,9 +680,9 @@ void VoxelManipulator::spreadLight(enum LightBank bank, < 0) - spreadLight(bank, lighted_nodes); + spreadLight(bank, lighted_nodes, nodemgr); } #endif