akko/diffvg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for distance approximation in tensorflow Path renderer

Browse Source
This commit is contained in:
Jerod Weinman
2020-12-23 05:57:27 -06:00
parent 734c1f3c12
commit 69610cfffd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pydiffvg_tensorflow/render_tensorflow.py
View File

@@ -136,6 +136,7 @@ def serialize_scene(canvas_width,
args.append(tf.identity(shape.num_control_points)) args.append(tf.identity(shape.num_control_points))
args.append(tf.identity(shape.points)) args.append(tf.identity(shape.points))
args.append(tf.constant(shape.is_closed)) args.append(tf.constant(shape.is_closed))
args.append(tf.constant(shape.use_distance_approx))
elif isinstance(shape, pydiffvg.Polygon): elif isinstance(shape, pydiffvg.Polygon):
assert(shape.points.shape[1] == 2) assert(shape.points.shape[1] == 2)
args.append(ShapeType.asTensor(diffvg.ShapeType.path)) args.append(ShapeType.asTensor(diffvg.ShapeType.path))
@@ -260,13 +261,15 @@ def forward(width,
current_index += 1 current_index += 1
is_closed = args[current_index] is_closed = args[current_index]
current_index += 1 current_index += 1
use_distance_approx = args[current_index]
current_index += 1
shape = diffvg.Path(diffvg.int_ptr(pydiffvg.data_ptr(num_control_points)), shape = diffvg.Path(diffvg.int_ptr(pydiffvg.data_ptr(num_control_points)),
diffvg.float_ptr(pydiffvg.data_ptr(points)), diffvg.float_ptr(pydiffvg.data_ptr(points)),
diffvg.float_ptr(0), # thickness diffvg.float_ptr(0), # thickness
num_control_points.shape[0], num_control_points.shape[0],
points.shape[0], points.shape[0],
is_closed, is_closed,
tf.constant(False)) # use_distance_approx use_distance_approx)
elif shape_type == diffvg.ShapeType.rect: elif shape_type == diffvg.ShapeType.rect:
p_min = args[current_index] p_min = args[current_index]
current_index += 1 current_index += 1
@@ -551,6 +554,7 @@ def render(*x):
d_args.append(None) # num_control_points d_args.append(None) # num_control_points
d_args.append(points) d_args.append(points)
d_args.append(None) # is_closed d_args.append(None) # is_closed
d_args.append(None) # use_distance_approx
elif d_shape.type == diffvg.ShapeType.rect: elif d_shape.type == diffvg.ShapeType.rect:
d_rect = d_shape.as_rect() d_rect = d_shape.as_rect()
p_min = tf.constant((d_rect.p_min.x, d_rect.p_min.y)) p_min = tf.constant((d_rect.p_min.x, d_rect.p_min.y))

3
pydiffvg_tensorflow/shape.py
View File

@@ -16,12 +16,13 @@ class Ellipse:
self.id = id self.id = id
class Path: class Path:
def __init__(self, num_control_points, points, is_closed, stroke_width = tf.constant(1.0), id = ''): def __init__(self, num_control_points, points, is_closed, stroke_width = tf.constant(1.0), id = '', use_distance_approx = False):
self.num_control_points = num_control_points self.num_control_points = num_control_points
self.points = points self.points = points
self.is_closed = is_closed self.is_closed = is_closed
self.stroke_width = stroke_width self.stroke_width = stroke_width
self.id = id self.id = id
self.use_distance_approx = use_distance_approx
class Polygon: class Polygon:
def __init__(self, points, is_closed, stroke_width = tf.constant(1.0), id = ''): def __init__(self, points, is_closed, stroke_width = tf.constant(1.0), id = ''):