star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Update Circle.kt

Browse Source
This commit is contained in:
bluefireoly
2020-09-15 18:30:36 +02:00
parent 16a27d0aa0
commit dde601a790
1 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/kotlin/net/axay/kspigot/structures/Circle.kt
View File

@@ -8,16 +8,9 @@ import net.axay.kspigot.particles.KSpigotParticle
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.entity.EntityType import org.bukkit.entity.EntityType
abstract class Circle(val radius: Number) { private fun circleEdgeLocations(radius: Number) = HashSet<SimpleLocation2D>().apply {
abstract val data: StructureData val currentRadius = radius.toDouble()
val fillLocations: Set<SimpleLocation2D> by lazy {
val locationList: MutableSet<SimpleLocation2D> = HashSet()
var currentRadius = radius.toDouble()
while (currentRadius >= 0) {
var d = -currentRadius var d = -currentRadius
var x = currentRadius var x = currentRadius
@@ -25,14 +18,14 @@ abstract class Circle(val radius: Number) {
while (y <= x) { while (y <= x) {
locationList.addCircleLoc(x, y) addSimpleLoc2D(x, y)
locationList.addCircleLoc(x, -y) addSimpleLoc2D(x, -y)
locationList.addCircleLoc(-x, y) addSimpleLoc2D(-x, y)
locationList.addCircleLoc(-x, -y) addSimpleLoc2D(-x, -y)
locationList.addCircleLoc(y, x) addSimpleLoc2D(y, x)
locationList.addCircleLoc(y, -x) addSimpleLoc2D(y, -x)
locationList.addCircleLoc(-y, x) addSimpleLoc2D(-y, x)
locationList.addCircleLoc(-y, -x) addSimpleLoc2D(-y, -x)
d += 2 * y + 1 d += 2 * y + 1
y++ y++
@@ -44,26 +37,44 @@ abstract class Circle(val radius: Number) {
} }
currentRadius--
} }
return@lazy locationList private fun MutableSet<SimpleLocation2D>.addSimpleLoc2D(first: Number, second: Number) {
}
private fun MutableSet<SimpleLocation2D>.addCircleLoc(first: Number, second: Number) {
this += SimpleLocation2D(first, second) this += SimpleLocation2D(first, second)
} }
val structure by lazy { abstract class Circle(val radius: Number) {
Structure(
protected abstract val data: StructureData
val fillLocations by lazy {
var currentRadius = radius.toDouble()
HashSet<SimpleLocation2D>().apply {
while (currentRadius >= 0) {
this += circleEdgeLocations(currentRadius)
currentRadius -= 0.5
}
}
}
val edgeLocations by lazy {
circleEdgeLocations(radius)
}
val filledStructure by lazy { structure(true) }
val edgeStructure by lazy { structure(false) }
fun structure(filled: Boolean) = Structure(
HashSet<SingleStructureData>().apply { HashSet<SingleStructureData>().apply {
for (it in fillLocations) val locations = if (filled) fillLocations else edgeLocations
for (it in locations)
this += SingleStructureData(SimpleLocation3D(it.x, 0, it.y), data) this += SingleStructureData(SimpleLocation3D(it.x, 0, it.y), data)
} }
) )
}
} }