AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor rename and refactor in copyBlocksIter

Browse Source
This commit is contained in:
David Vierra 2015-09-05 10:40:46 -10:00
parent f13de9c6aa
commit f7bed06003
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mceditlib/block_copy.py
View File

@ -146,23 +146,24 @@ def copyBlocksIter(destDim, sourceDim, sourceSelection, destinationPoint, blocks
# Read blocks
sourceBlocks = sourceSection.Blocks[sourceSlices]
sourceData = sourceSection.Data[sourceSlices]
sourceMaskPart = sourceMask[sourceSlices]
sourceMaskSliced = sourceMask[sourceSlices]
# Convert blocks
convertedSourceBlocks, convertedSourceData = convertBlocks(sourceBlocks, sourceData)
convertedSourceBlocksMasked = convertedSourceBlocks[sourceMaskPart]
convertedSourceBlocksMasked = convertedSourceBlocks[sourceMaskSliced]
convertedSourceDataMasked = convertedSourceData[sourceMaskSliced]
# Find blocks that need direct lighting update - block opacity or brightness changed
oldBrightness = destDim.blocktypes.brightness[destSection.Blocks[destSlices][sourceMaskPart]]
oldBrightness = destDim.blocktypes.brightness[destSection.Blocks[destSlices][sourceMaskSliced]]
newBrightness = destDim.blocktypes.brightness[convertedSourceBlocksMasked]
oldOpacity = destDim.blocktypes.opacity[destSection.Blocks[destSlices][sourceMaskPart]]
oldOpacity = destDim.blocktypes.opacity[destSection.Blocks[destSlices][sourceMaskSliced]]
newOpacity = destDim.blocktypes.opacity[convertedSourceBlocksMasked]
changedLight = (oldBrightness != newBrightness) | (oldOpacity != newOpacity)
# Write blocks
destSection.Blocks[destSlices][sourceMaskPart] = convertedSourceBlocks[sourceMaskPart]
destSection.Data[destSlices][sourceMaskPart] = convertedSourceData[sourceMaskPart]
destSection.Blocks[destSlices][sourceMaskSliced] = convertedSourceBlocksMasked
destSection.Data[destSlices][sourceMaskSliced] = convertedSourceDataMasked
if updateLights:
# Find coordinates of lighting updates