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

change circle fit formula

Browse source
This commit is contained in:
Alexander Wang 2024-10-30 19:54:11 -06:00
parent 3d3925447f
commit 0570f5cd7e
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/shape/shape_circle.go
View file

@ -37,18 +37,22 @@ func (s shapeCircle) AspectRatio1() bool {
} }
func (s shapeCircle) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) { func (s shapeCircle) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) {
length := math.Max(width+paddingX, height+paddingY) effectiveWidth := width + 2*paddingX
diameter := math.Ceil(math.Sqrt2 * length) effectiveHeight := height + 2*paddingY
diameter := math.Ceil(math.Max(effectiveWidth, effectiveHeight))
return diameter, diameter return diameter, diameter
} }
func (s shapeCircle) GetInsidePlacement(width, height, paddingX, paddingY float64) geo.Point { func (s shapeCircle) GetInsidePlacement(width, height, paddingX, paddingY float64) geo.Point {
project45 := 1 / math.Sqrt2 centerX := s.Box.TopLeft.X + paddingX
r := s.Box.Width / 2 centerY := s.Box.TopLeft.Y + paddingY
// we want to offset r-padding/2 away from the center r := s.Box.Width / 2.
x := centerX - r
y := centerY - r
return geo.Point{ return geo.Point{
X: s.Box.TopLeft.X + math.Ceil(r-project45*(r-paddingX/2)), X: math.Ceil(x),
Y: s.Box.TopLeft.Y + math.Ceil(r-project45*(r-paddingY/2)), Y: math.Ceil(y),
} }
} }