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
} // Use average radius for more consistent arcs
arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) // Calculate angles but preserve relative positioning
srcAngle := math.Atan2(srcCenter.Y, srcCenter.X)
dstAngle := math.Atan2(dstCenter.Y, dstCenter.X)
path := make([]*geo.Point, 0, ARC_STEPS+1) // Ensure we take the shorter path around the circle
for i := 0; i <= ARC_STEPS; i++ { if dstAngle < srcAngle {
t := float64(i) / float64(ARC_STEPS) if srcAngle - dstAngle > math.Pi {
angle := srcAngle + t*(dstAngle-srcAngle) dstAngle += 2 * math.Pi
x := arcRadius * math.Cos(angle) }
y := arcRadius * math.Sin(angle) } else {
path = append(path, geo.NewPoint(x, y)) if dstAngle - srcAngle > math.Pi {
} srcAngle += 2 * math.Pi
path[0] = srcCenter }
path[len(path)-1] = dstCenter }
// Clamp endpoints to the boundaries of the source and destination boxes. path := make([]*geo.Point, 0, ARC_STEPS+1)
_, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) for i := 0; i <= ARC_STEPS; i++ {
_, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) t := float64(i) / float64(ARC_STEPS)
path[0] = newSrc angle := srcAngle + t*(dstAngle-srcAngle)
path[len(path)-1] = newDst
// 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
// Trim redundant path points that fall inside node boundaries. // Clamp endpoints to the boundaries of the source and destination boxes
path = trimPathPoints(path, edge.Src.Box) _, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0)
path = trimPathPoints(path, edge.Dst.Box) _, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1)
path[0] = newSrc
path[len(path)-1] = newDst
edge.Route = path // Trim redundant path points that fall inside node boundaries
edge.IsCurve = true 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,