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

implement SSAA

Browse source
This commit is contained in:
Laura Klünder 2017-11-08 14:31:37 +01:00
parent b54661ef78
commit 335970ffcc
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,11 +55,12 @@ class RenderTask:
""" """
Async Render Task Async Render Task
""" """
__slots__ = ('width', 'height', 'background_rgb', 'vertices', 'event', 'result') __slots__ = ('width', 'height', 'samples', 'background_rgb', 'vertices', 'event', 'result')
def __init__(self, width, height, background_rgb, vertices): def __init__(self, width, height, samples, background_rgb, vertices):
self.width = width self.width = width
self.height = height self.height = height
self.samples = samples
self.background_rgb = background_rgb self.background_rgb = background_rgb
self.vertices = vertices self.vertices = vertices
@ -102,7 +103,7 @@ class OpenGLWorker(threading.Thread):
while True: while True:
task = self._queue.get() task = self._queue.get()
ctx = self._get_ctx(task.width, task.height) ctx = self._get_ctx(task.width*task.samples, task.height*task.samples)
ctx.ctx.clear(*(i / 255 for i in task.background_rgb)) ctx.ctx.clear(*(i / 255 for i in task.background_rgb))
if task.vertices: if task.vertices:
@ -111,17 +112,19 @@ class OpenGLWorker(threading.Thread):
vao.render() vao.render()
img = Image.frombytes('RGB', (ctx.width, ctx.height), ctx.fbo.read(components=3)) img = Image.frombytes('RGB', (ctx.width, ctx.height), ctx.fbo.read(components=3))
img = img.resize((task.width, task.height), Image.BICUBIC)
f = io.BytesIO() f = io.BytesIO()
img.save(f, 'PNG') img.save(f, 'PNG')
f.seek(0) f.seek(0)
task.set_result(f.read()) task.set_result(f.read())
def render(self, width: int, height: int, background_rgb: Tuple[int, int, int], vertices: bytes) -> bytes: def render(self, width: int, height: int, samples: int,
background_rgb: Tuple[int, int, int], vertices: bytes) -> bytes:
""" """
Render image and return it as PNG bytes Render image and return it as PNG bytes
""" """
task = RenderTask(width, height, background_rgb, vertices) task = RenderTask(width, height, samples, background_rgb, vertices)
self._queue.put(task) self._queue.put(task)
return task.get_result() return task.get_result()
@ -135,6 +138,8 @@ class OpenGLEngine(RenderEngine):
scale_x = self.scale / self.width * 2 scale_x = self.scale / self.width * 2
scale_y = self.scale / self.height * 2 scale_y = self.scale / self.height * 2
self.samples = 4
self.np_scale = np.array((scale_x, -scale_y)) self.np_scale = np.array((scale_x, -scale_y))
self.np_offset = np.array((-self.minx * scale_x - 1, self.maxy * scale_y - 1)) self.np_offset = np.array((-self.minx * scale_x - 1, self.maxy * scale_y - 1))
@ -168,7 +173,7 @@ class OpenGLEngine(RenderEngine):
((geom.exterior, *geom.interiors) if isinstance(geom, Polygon) else (geom, )) ((geom.exterior, *geom.interiors) if isinstance(geom, Polygon) else (geom, ))
for geom in getattr(geometry, 'geoms', (geometry, )) for geom in getattr(geometry, 'geoms', (geometry, ))
))) )))
one_pixel = 1 / self.scale / 2 one_pixel = 1 / self.scale / 2 / self.samples
width = max(stroke.width, (stroke.min_px or 0) / self.scale) / 2 width = max(stroke.width, (stroke.min_px or 0) / self.scale) / 2
if width < one_pixel: if width < one_pixel:
alpha = width/one_pixel alpha = width/one_pixel
@ -183,7 +188,7 @@ class OpenGLEngine(RenderEngine):
worker = OpenGLWorker() worker = OpenGLWorker()
def get_png(self) -> bytes: def get_png(self) -> bytes:
return self.worker.render(self.width, self.height, self.background_rgb, return self.worker.render(self.width, self.height, self.samples, self.background_rgb,
np.hstack(self.vertices).astype(np.float32).tobytes()) np.hstack(self.vertices).astype(np.float32).tobytes())