update circle fitting

This commit is contained in:
Gavin Nishizawa 2023-01-24 13:43:06 -08:00
parent cc8c7756ab
commit c12e71af15
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD

View file

@ -34,7 +34,7 @@ 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) {
diameter := math.Ceil(math.Sqrt(2 * math.Pow(math.Max(width+paddingX, height+paddingY), 2))) diameter := math.Ceil(math.Sqrt(math.Pow(width+paddingX, 2) + math.Pow(height+paddingY, 2)))
return diameter, diameter return diameter, diameter
} }
@ -47,5 +47,5 @@ func (s shapeCircle) Perimeter() []geo.Intersectable {
} }
func (s shapeCircle) GetDefaultPadding() (paddingX, paddingY float64) { func (s shapeCircle) GetDefaultPadding() (paddingX, paddingY float64) {
return defaultPadding / 2, defaultPadding / 2 return defaultPadding / math.Sqrt2, defaultPadding / math.Sqrt2
} }