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

try

Browse source
This commit is contained in:
Mayank Mohapatra 2025-02-22 10:49:36 +00:00
parent b568305b00
commit be5ba61297
1 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
d2layouts/d2cycle/layout.go
View file

@ -66,44 +66,64 @@ func positionObjects(objects []*d2graph.Object, radius float64) {
} }
func createCircularArc(edge *d2graph.Edge) { func createCircularArc(edge *d2graph.Edge) {
if edge.Src == nil || edge.Dst == nil { if edge.Src == nil || edge.Dst == nil {
return return
} }
srcCenter := edge.Src.Center() srcCenter := edge.Src.Center()
dstCenter := edge.Dst.Center() dstCenter := edge.Dst.Center()
srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) // Calculate the radius based on the distance from origin to the centers
dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) srcRadius := math.Hypot(srcCenter.X, srcCenter.Y)
if dstAngle < srcAngle { dstRadius := math.Hypot(dstCenter.X, dstCenter.Y)
dstAngle += 2 * math.Pi
}
arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) // Use average radius for more consistent arcs
path := make([]*geo.Point, 0, ARC_STEPS+1)
for i := 0; i <= ARC_STEPS; i++ {
t := float64(i) / float64(ARC_STEPS)
angle := srcAngle + t*(dstAngle-srcAngle)
x := arcRadius * math.Cos(angle)
y := arcRadius * math.Sin(angle)
path = append(path, geo.NewPoint(x, y))
}
path[0] = srcCenter
path[len(path)-1] = dstCenter
// Clamp endpoints to the boundaries of the source and destination boxes. // Calculate angles but preserve relative positioning
_, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) srcAngle := math.Atan2(srcCenter.Y, srcCenter.X)
_, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X)
path[0] = newSrc
path[len(path)-1] = newDst
// Trim redundant path points that fall inside node boundaries. // Ensure we take the shorter path around the circle
path = trimPathPoints(path, edge.Src.Box) if dstAngle < srcAngle {
path = trimPathPoints(path, edge.Dst.Box) if srcAngle - dstAngle > math.Pi {
dstAngle += 2 * math.Pi
}
} else {
if dstAngle - srcAngle > math.Pi {
srcAngle += 2 * math.Pi
}
}
edge.Route = path path := make([]*geo.Point, 0, ARC_STEPS+1)
edge.IsCurve = true for i := 0; i <= ARC_STEPS; i++ {
t := float64(i) / float64(ARC_STEPS)
angle := srcAngle + t*(dstAngle-srcAngle)
// Use interpolated radius for smoother transition
radius := srcRadius + t*(dstRadius-srcRadius)
x := radius * math.Cos(angle)
y := radius * math.Sin(angle)
path = append(path, geo.NewPoint(x, y))
}
// Ensure exact endpoints
path[0] = srcCenter
path[len(path)-1] = dstCenter
// Clamp endpoints to the boundaries of the source and destination boxes
_, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0)
_, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1)
path[0] = newSrc
path[len(path)-1] = newDst
// Trim redundant path points that fall inside node boundaries
path = trimPathPoints(path, edge.Src.Box)
path = trimPathPoints(path, edge.Dst.Box)
edge.Route = path
edge.IsCurve = true
} }
// clampPointOutsideBox walks forward along the path until it finds a point outside the box, // clampPointOutsideBox walks forward along the path until it finds a point outside the box,