|
|
@@ -1,4 +1,4 @@
|
|
|
-class Circle(var posX: Float, var posY: Float, var radius: Float) : Figure(0), Transforming, Movable {
|
|
|
+class Circle(var posX: Int, var posY: Int, var radius: Int) : Figure(0), Transforming, Movable {
|
|
|
override fun area(): Float {
|
|
|
return Math.PI.toFloat() * radius * radius
|
|
|
}
|
|
|
@@ -22,8 +22,8 @@ class Circle(var posX: Float, var posY: Float, var radius: Float) : Figure(0), T
|
|
|
val rotatedY = translatedX * Math.sin(angle) + translatedY * Math.cos(angle)
|
|
|
|
|
|
// Перемещаем точку обратно
|
|
|
- posX = rotatedX.toFloat() + centerX
|
|
|
- posY = rotatedY.toFloat() + centerY
|
|
|
+ posX = Math.round(rotatedX + centerX).toInt()
|
|
|
+ posY = Math.round(rotatedY + centerY).toInt()
|
|
|
}
|
|
|
|
|
|
|