X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvoxel.cpp;h=bd06be877b67ae4a5de024aa538cb30bb5c63435;hb=347216d654e6f284119d9473db03e3393002b286;hp=d68a8db0211eb7bd14afed2b0988e9c9962275dc;hpb=9f882bf74d452521cb7fb1806ab453aaa28da343;p=oweals%2Fminetest.git diff --git a/src/voxel.cpp b/src/voxel.cpp index d68a8db02..bd06be877 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "voxel.h" #include "map.h" - -// For TimeTaker -#include "utility.h" +#include "utility.h" // For TimeTaker #include "gettime.h" +#include "nodedef.h" /* Debug stuff @@ -41,7 +40,6 @@ VoxelManipulator::VoxelManipulator(): m_data(NULL), m_flags(NULL) { - m_disable_water_climb = false; } VoxelManipulator::~VoxelManipulator() @@ -65,7 +63,8 @@ void VoxelManipulator::clear() m_flags = NULL; } -void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) +void VoxelManipulator::print(std::ostream &o, INodeDefManager *nodemgr, + VoxelPrintMode mode) { v3s16 em = m_area.getExtent(); v3s16 of = m_area.MinEdge; @@ -95,7 +94,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) else { c = 'X'; - u8 m = m_data[m_area.index(x,y,z)].d; + content_t m = m_data[m_area.index(x,y,z)].getContent(); u8 pr = m_data[m_area.index(x,y,z)].param2; if(mode == VOXELPRINT_MATERIAL) { @@ -104,7 +103,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode) } else if(mode == VOXELPRINT_WATERPRESSURE) { - if(m == CONTENT_WATER) + if(nodemgr->get(m).isLiquid()) { c = 'w'; if(pr <= 9) @@ -221,6 +220,22 @@ void VoxelManipulator::copyFrom(MapNode *src, VoxelArea src_area, } } +void VoxelManipulator::copyTo(MapNode *dst, VoxelArea dst_area, + v3s16 dst_pos, v3s16 from_pos, v3s16 size) +{ + for(s16 z=0; z & light_sources) + core::map & light_sources, INodeDefManager *nodemgr) { v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -295,21 +310,21 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, 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); + n2.setLight(bank, 0, nodemgr); - unspreadLight(bank, n2pos, current_light, light_sources); + unspreadLight(bank, n2pos, light2, light_sources, nodemgr); /* Remove from light_sources if it is there @@ -348,7 +363,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight, */ void VoxelManipulator::unspreadLight(enum LightBank bank, core::map & from_nodes, - core::map & light_sources) + core::map & light_sources, INodeDefManager *nodemgr) { if(from_nodes.size() == 0) return; @@ -364,7 +379,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, u8 oldlight = j.getNode()->getValue(); - unspreadLight(bank, pos, oldlight, light_sources); + unspreadLight(bank, pos, oldlight, light_sources, nodemgr); } } #endif @@ -434,18 +449,18 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, 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); @@ -477,7 +492,8 @@ void VoxelManipulator::unspreadLight(enum LightBank bank, } #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 @@ -497,7 +513,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p) 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 @@ -512,34 +528,39 @@ void VoxelManipulator::spreadLight(enum LightBank bank, v3s16 p) 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) @@ -560,13 +581,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) + core::map & from_nodes, INodeDefManager *nodemgr) { const v3s16 dirs[6] = { v3s16(0,0,1), // back @@ -597,7 +618,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, 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 @@ -614,12 +635,14 @@ void VoxelManipulator::spreadLight(enum LightBank bank, 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); } @@ -627,11 +650,11 @@ void VoxelManipulator::spreadLight(enum LightBank bank, 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); + n2.setLight(bank, newlight, nodemgr); lighted_nodes.insert(n2pos, true); } } @@ -649,7 +672,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank, < 0) - spreadLight(bank, lighted_nodes); + spreadLight(bank, lighted_nodes, nodemgr); } #endif