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

final changes

Browse source
This commit is contained in:
Daniel Suh 2024-05-14 18:44:43 -04:00
parent 49df5b81c0
commit 97975425e1
No known key found for this signature in database
GPG key ID: 7548E646186EFE39
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2renderers/d2svg/d2svg.go
View file

@ -495,8 +495,8 @@ func makeLabelMask(labelTL *geo.Point, width, height int, opacity float64) strin
) )
} }
// Given control points p1, p2, p3, p4, calculate the segment of this bezier curve from t0 -> t1 where {0 <= t0 < t1 <= 1}
func bezierCurveSegment(p1, p2, p3, p4 *geo.Point, t0, t1 float64) (geo.Point, geo.Point, geo.Point, geo.Point) { func bezierCurveSegment(p1, p2, p3, p4 *geo.Point, t0, t1 float64) (geo.Point, geo.Point, geo.Point, geo.Point) {
// Given control points p1, p2, p3, p4, calculate the bezier segment from t0 -> t1 where {0 <= t0 < t1 <= 1}
u0, u1 := 1-t0, 1-t1 u0, u1 := 1-t0, 1-t1
q1 := geo.Point{ q1 := geo.Point{
@ -519,29 +519,31 @@ func bezierCurveSegment(p1, p2, p3, p4 *geo.Point, t0, t1 float64) (geo.Point, g
return q1, q2, q3, q4 return q1, q2, q3, q4
} }
func addToPath(path *string, pathType *string, i int, pathData []string) int { // Adds a certain line/curve to an existing SVG path string. offsetIdx and pathData provides the points needed
func addToPath(path *string, pathType *string, offsetIdx int, pathData []string) int {
var increment int var increment int
switch *pathType { switch *pathType {
case "M": case "M":
*path += fmt.Sprintf("M %s %s ", pathData[i+1], pathData[i+2]) *path += fmt.Sprintf("M %s %s ", pathData[offsetIdx+1], pathData[offsetIdx+2])
increment = 3 increment = 3
case "L": case "L":
*path += fmt.Sprintf("L %s %s ", pathData[i+1], pathData[i+2]) *path += fmt.Sprintf("L %s %s ", pathData[offsetIdx+1], pathData[offsetIdx+2])
increment = 3 increment = 3
case "C": case "C":
*path += fmt.Sprintf("C %s %s %s %s %s %s ", pathData[i+1], pathData[i+2], pathData[i+3], pathData[i+4], pathData[i+5], pathData[i+6]) *path += fmt.Sprintf("C %s %s %s %s %s %s ", pathData[offsetIdx+1], pathData[offsetIdx+2], pathData[offsetIdx+3], pathData[offsetIdx+4], pathData[offsetIdx+5], pathData[offsetIdx+6])
increment = 7 increment = 7
case "S": case "S":
*path += fmt.Sprintf("S %s %s %s %s ", pathData[i+1], pathData[i+2], pathData[i+3], pathData[i+4]) *path += fmt.Sprintf("S %s %s %s %s ", pathData[offsetIdx+1], pathData[offsetIdx+2], pathData[offsetIdx+3], pathData[offsetIdx+4])
increment = 5 increment = 5
default: default:
panic(fmt.Sprintf("unknown svg path command \"%s\"", pathData[i])) panic(fmt.Sprintf("unknown svg path command \"%s\"", pathData[offsetIdx]))
} }
return increment return increment
} }
// This function finds the length of a path in SVG notation
func pathLength(pathData []string) float64 { func pathLength(pathData []string) float64 {
var x, y, pathLength float64 var x, y, pathLength float64
var increment int var increment int
@ -586,13 +588,14 @@ func pathLength(pathData []string) float64 {
return pathLength return pathLength
} }
// Splits a SVG path into two SVG paths, with the first path being ~{percentage}% of the path
func splitPath(path string, percentage float64) (string, string) { func splitPath(path string, percentage float64) (string, string) {
var sumPathLens, curPathLen, x, y float64 var sumPathLens, curPathLen, x, y float64
var prevPosition geo.Point var prevPosition geo.Point
var path1, path2 string var path1, path2 string
var increment int var increment int
var pastHalf bool = false
pastHalf := false
pathData := strings.Split(path, " ") pathData := strings.Split(path, " ")
pathLen := pathLength(pathData) pathLen := pathLength(pathData)