Merge pull request #6577 from Ultimaker/litho_alpha

make lithophane alpha channel control total final width multiplier.
This commit is contained in:
ninovanhooff 2019-12-16 14:21:15 +01:00 committed by GitHub
commit ed838baafa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,7 +5,7 @@ import numpy
import math
from PyQt5.QtGui import QImage, qRed, qGreen, qBlue
from PyQt5.QtGui import QImage, qRed, qGreen, qBlue, qAlpha
from PyQt5.QtCore import Qt
from UM.Mesh.MeshReader import MeshReader
@ -138,6 +138,11 @@ class ImageReader(MeshReader):
height_data *= scale_vector.y
height_data += base_height
if img.hasAlphaChannel():
for x in range(0, width):
for y in range(0, height):
height_data[y, x] *= qAlpha(img.pixel(x, y)) / 255.0
heightmap_face_count = 2 * height_minus_one * width_minus_one
total_face_count = heightmap_face_count + (width_minus_one * 2) * (height_minus_one * 2) + 2