2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

don't flatten. keep triangles.

Browse source
This commit is contained in:
Laura Klünder 2017-11-09 20:18:42 +01:00
parent 0f60449cb0
commit 288e0fd9d6
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mapdata/render/engines/base3d.py
View file

@ -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)

4
src/c3nav/mapdata/render/engines/opengl.py
View file

@ -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()