diff --git a/outputHightMap.py b/outputHightMap.py index 0625a11..2c47025 100755 --- a/outputHightMap.py +++ b/outputHightMap.py @@ -13,12 +13,45 @@ from PIL import Image logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO) +def sort(array): + #sort by zDim column, first to last. + logging.debug(f'zDim sliced points is\n{array[:,zDim]}') + #the [::-1] reverses the resulting array, so that sortedPoints will be from biggest to smallest. + ind = np.argsort(array[:,zDim])[::-1] + sortedPoints = array[ind] + logging.debug(f'sortedPoints is\n{sortedPoints}') + return sortedPoints + +def scale(array, xRange, yRange, maxX, maxY): + logging.debug(f'xRange is {xRange} and yRange is {yRange}') + xScale = maxX/xRange + yScale = maxY/yRange + + scaledArray = sortedPoints[:, 0:3] + scaledArray[:,xDim]=scaledArray[:,xDim]-mins[xDim] + scaledArray[:,xDim]=scaledArray[:,xDim]*xScale + logging.debug(f'xmin in scaledArray is {scaledArray[:,xDim].min()}') + logging.debug(f'xmin in scaledArray is {scaledArray[:,xDim].max()}') + + scaledArray[:,yDim]=scaledArray[:,yDim]-mins[yDim] + scaledArray[:,yDim]=scaledArray[:,yDim]*yScale + logging.debug(f'ymin in scaledArray is {scaledArray[:,yDim].min()}') + logging.debug(f'ymin in scaledArray is {scaledArray[:,yDim].max()}') + logging.debug(f'scaledArray is\n{scaledArray}') + return scaledArray + +def isInxyRange(xMin, xMax, yMin, yMax, xVal, yVal): + return (xMin<=xVal) and (xVal