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

Merge pull request #2186 from alixander/fix-circle-fit-2

Browse source 
fix circle fit again
This commit is contained in:
Alexander Wang 2024-10-31 14:17:00 -06:00 committed by GitHub
commit a814db60b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/shape/shape_circle.go
View file

@ -43,13 +43,13 @@ func (s shapeCircle) GetDimensionsToFit(width, height, paddingX, paddingY float6
} }
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 r := s.GetBox().Width / 2
r := s.Box.Width / 2 halfLength := r * math.Sqrt2 / 2.
// we want to offset r-padding/2 away from the center p := geo.Point{
return geo.Point{ X: s.GetBox().TopLeft.X + math.Ceil(r-halfLength+paddingX/2.),
X: s.Box.TopLeft.X + math.Ceil(r-project45*(r-paddingX/2)), Y: s.GetBox().TopLeft.Y + math.Ceil(r-halfLength+paddingY/2.),
Y: s.Box.TopLeft.Y + math.Ceil(r-project45*(r-paddingY/2)),
} }
return p
} }
func (s shapeCircle) Perimeter() []geo.Intersectable { func (s shapeCircle) Perimeter() []geo.Intersectable {