luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update renderDoubleOval function

Browse source
This commit is contained in:
OneRain2333 2022-12-31 14:17:34 +08:00
parent fd7f30d1c3
commit f1b7f2706d
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2renderers/d2sketch/sketch.go
View file

@ -134,23 +134,23 @@ func Oval(r *Runner, shape d2target.Shape) (string, error) {
} }
func DoubleOval(r *Runner, shape d2target.Shape) (string, error) { func DoubleOval(r *Runner, shape d2target.Shape) (string, error) {
js_big_circle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { jsBigCircle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, {
fill: "%s", fill: "%s",
stroke: "%s", stroke: "%s",
strokeWidth: %d, strokeWidth: %d,
%s %s
});`, shape.Width/2, shape.Height/2, shape.Width, shape.Height, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) });`, shape.Width/2, shape.Height/2, shape.Width, shape.Height, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps)
js_small_circle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { jsSmallCircle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, {
fill: "%s", fill: "%s",
stroke: "%s", stroke: "%s",
strokeWidth: %d, strokeWidth: %d,
%s %s
});`, shape.Width/2, shape.Height/2, shape.Width-15, shape.Height-15, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) });`, shape.Width/2, shape.Height/2, shape.Width-15, shape.Height-15, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps)
paths_big_circle, err := computeRoughPaths(r, js_big_circle) paths_big_circle, err := computeRoughPaths(r, jsBigCircle)
if err != nil { if err != nil {
return "", err return "", err
} }
paths_small_circle, err := computeRoughPaths(r, js_small_circle) paths_small_circle, err := computeRoughPaths(r, jsSmallCircle)
if err != nil { if err != nil {
return "", err return "", err
} }

9
d2renderers/d2svg/d2svg.go
View file

@ -494,14 +494,7 @@ func renderOval(tl *geo.Point, width, height float64, style string) string {
} }
func renderDoubleCircle(tl *geo.Point, width, height float64, style string) string { func renderDoubleCircle(tl *geo.Point, width, height float64, style string) string {
rx := width / 2 return renderOval(tl, width, height, style) + renderOval(&geo.Point{X: tl.X + 5, Y: tl.Y + 5}, width-10, height-10, style)
ry := height / 2
cx := tl.X + rx
cy := tl.Y + ry
return fmt.Sprintf(`<ellipse class="shape" cx="%f" cy="%f" rx="%f" ry="%f" style="%s" />
<ellipse class="shape" cx="%f" cy="%f" rx="%f" ry="%f" style="%s" />`,
cx, cy, rx-2, ry-2, style,
cx, cy, rx-10, ry-10, style)
} }
func defineShadowFilter(writer io.Writer) { func defineShadowFilter(writer io.Writer) {