eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 05:09:20 +02:00
Code Issues 150 Wiki Activity

fix(tools): metalness is checked on a nearest sample of the B channel instead of a box-averaged one, so thin metal strips with B only 0 or 255 are no longer reported as half metal because downscaling averages their edges with the paint around them

Browse Source
This commit is contained in:
maj00r
2026-10-14 23:42:43 +02:00
parent a2d5e36d51
commit adf1b1736f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/materials/validate_materials.py
View File

@@ -183,6 +183,7 @@ class Images:
if image.mode != 'RGBA': if image.mode != 'RGBA':
image = image.convert('RGBA') image = image.convert('RGBA')
channels = [np.asarray(c.resize((SIZE, SIZE), Image.BOX), dtype=np.float32) / 255 for c in image.split()] channels = [np.asarray(c.resize((SIZE, SIZE), Image.BOX), dtype=np.float32) / 255 for c in image.split()]
channels.append(np.asarray(image.split()[2].resize((SIZE, SIZE), Image.NEAREST), dtype=np.float32) / 255)
result = np.dstack(channels) result = np.dstack(channels)
except Exception as e: except Exception as e:
result = str(e) result = str(e)
@@ -323,8 +324,9 @@ def check(mat, values, nested, shaders, resolver, images, rel):
reflect = max(reflect, 0.5) reflect = max(reflect, 0.5)
if reflect < METAL_REFLECTIVITY_MIN: if reflect < METAL_REFLECTIVITY_MIN:
add(WARN, 'metal z odbiciem %.2f (alfa normalmapy * param_reflection, norma >= %.1f): bez otoczenia jest ciemny' % (reflect, METAL_REFLECTIVITY_MIN)) add(WARN, 'metal z odbiciem %.2f (alfa normalmapy * param_reflection, norma >= %.1f): bez otoczenia jest ciemny' % (reflect, METAL_REFLECTIVITY_MIN))
middle = ((B > 0.15) & (B < 0.85) & mask) Bn = sg[..., 4]
anymetal = ((B > 0.15) & mask) middle = ((Bn > 0.15) & (Bn < 0.85) & mask)
anymetal = ((Bn > 0.15) & mask)
if anymetal.sum() > 0.01 * mask.sum() and middle.sum() > 0.3 * anymetal.sum(): if anymetal.sum() > 0.01 * mask.sum() and middle.sum() > 0.3 * anymetal.sum():
add(WARN, 'B (metalicznosc) nie jest 0/1 na %d%% metalu' % (100 * middle.sum() / anymetal.sum())) add(WARN, 'B (metalicznosc) nie jest 0/1 na %d%% metalu' % (100 * middle.sum() / anymetal.sum()))
bb = blur(B, 3) bb = blur(B, 3)