Merge pull request #38 from GeoplexGIS/duck-fix

Support paletted textures from trimesh

Author: mmatl

examples/duck.py

@@ -0,0 +1,13 @@
+from pyrender import Mesh, Scene, Viewer
+from io import BytesIO
+import numpy as np
+import trimesh
+import requests
+
+duck_source = "https://github.com/KhronosGroup/glTF-Sample-Models/raw/master/2.0/Duck/glTF-Binary/Duck.glb"
+
+duck = trimesh.load(BytesIO(requests.get(duck_source).content), file_type='glb')
+duckmesh = Mesh.from_trimesh(list(duck.geometry.values())[0])
+scene = Scene(ambient_light=np.array([1.0, 1.0, 1.0, 1.0]))
+scene.add(duckmesh)
+Viewer(scene)

pyrender/utils.py

@@ -56,7 +56,10 @@ def format_texture_source(texture, target_channels='RGB'):
 
     # Convert PIL images into numpy arrays
     if isinstance(texture, Image.Image):
-        texture = np.array(texture)
+        if texture.mode == 'P' and target_channels in ('RGB', 'RGBA'):
+            texture = np.array(texture.convert(target_channels))
+        else:
+            texture = np.array(texture)
 
     # Format numpy arrays
     if isinstance(texture, np.ndarray):

tests/data/Duck.glb

@@ -123,3 +123,11 @@ def test_meshes():
 
     # From point cloud
     x = Mesh.from_points(fm.vertices)
+
+def test_duck():
+    bm = trimesh.load('tests/data/Duck.glb').dump()[0]
+    x = Mesh.from_trimesh(bm)
+    assert x.primitives[0].material.baseColorTexture is not None
+    pixel = x.primitives[0].material.baseColorTexture.source[100, 100]
+    yellowish = np.array([1.0, 0.7411765, 0.0, 1.0])
+    assert np.allclose(pixel, yellowish)