From 288e0fd9d600ac7b32645cc86d2fb5fd5d85e898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 9 Nov 2017 20:18:42 +0100 Subject: [PATCH] don't flatten. keep triangles. --- src/c3nav/mapdata/render/engines/base3d.py | 2 +- src/c3nav/mapdata/render/engines/opengl.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c3nav/mapdata/render/engines/base3d.py b/src/c3nav/mapdata/render/engines/base3d.py index 2c7f2516..987c3036 100644 --- a/src/c3nav/mapdata/render/engines/base3d.py +++ b/src/c3nav/mapdata/render/engines/base3d.py @@ -32,4 +32,4 @@ class Base3DEngine(RenderEngine): def _place_geometry(self, geometry: HybridGeometry, append=None): faces = np.vstack(tuple(chain(geometry.faces, *geometry.add_faces.values()))) vertices = faces * self.np_scale + self.np_offset - return self._append_to_vertices(vertices, append).flatten() + return self._append_to_vertices(vertices, append) diff --git a/src/c3nav/mapdata/render/engines/opengl.py b/src/c3nav/mapdata/render/engines/opengl.py index 95973f87..1d63b4a0 100644 --- a/src/c3nav/mapdata/render/engines/opengl.py +++ b/src/c3nav/mapdata/render/engines/opengl.py @@ -169,13 +169,13 @@ class OpenGLEngine(Base3DEngine): triangles = np.dstack((vertices[faces], np.full((faces.size, 1), fill_value=altitude).reshape((-1, 3, 1)))) triangles = triangles.astype(np.float32) * self.np_scale + self.np_offset - return self._append_to_vertices(triangles, append).flatten() + return self._append_to_vertices(triangles, append) worker = OpenGLWorker() def render(self) -> bytes: return self.worker.render(self.width, self.height, self.background_rgb, - np.hstack(self.vertices).astype(np.float32).tobytes() if self.vertices else b'') + np.vstack(self.vertices).astype(np.float32).tobytes() if self.vertices else b'') OpenGLEngine.worker.start()