Skip to content

add visualization of overlapping kuvahakus #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
contrapost wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add visualization of overlapping kuvahakus #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/tech/onsibey/squarelife/simulator/powers/IkuTurso.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tech.onsibey.squarelife.simulator.powers

import tech.onsibey.squarelife.simulator.entities.Population.Companion.generatePopulation
import tech.onsibey.squarelife.common.DEFAULT_EVOLUTION_CYCLES_LIMIT
import tech.onsibey.squarelife.simulator.entities.Board
import tech.onsibey.squarelife.simulator.entities.BoardSize
import tech.onsibey.squarelife.common.DEFAULT_EVOLUTION_CYCLES_LIMIT
import tech.onsibey.squarelife.simulator.entities.Population.Companion.generatePopulation
import tech.onsibey.squarelife.simulator.powers.IkuTursoConstants.STANDARD_BOARD_HORIZONTAL_SIDE_SIZE
import tech.onsibey.squarelife.simulator.powers.IkuTursoConstants.STANDARD_BOARD_VERTICAL_SIDE_SIZE
import tech.onsibey.squarelife.simulator.powers.IkuTursoConstants.STANDARD_NUMBER_OF_KUVAHAKU_IN_POPULATION
Expand Down
27 changes: 19 additions & 8 deletions src/main/kotlin/tech/onsibey/squarelife/visualisation/BoardVisualizer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class GifEvolutionCycleGenerator(private val evolutionResultReport: EvolutionRes
private val BLUE = Color(0, 191, 255)
private val GREEN = Color(46, 139, 87)
private val RED = Color(255, 69, 0)
private val MAGENTA = Color(255, 0, 255)

private val TEMP_FILE_DIR = File("temp").run {
when {
Expand Down Expand Up @@ -142,19 +143,29 @@ class GifEvolutionCycleGenerator(private val evolutionResultReport: EvolutionRes
private fun Graphics2D.drawEntities(entities: List<EntityPosition>) {
(0 until evolutionResultReport.boardSize.numberOfRows).forEach { y ->
(0 until evolutionResultReport.boardSize.rowLength).forEach { x ->
// we are using a hack here: entities are drawn with a shift of 1 pixel to the right and to the bottom
when (val entity = entities.find { it.position.contains(Coordinate(x/* + 1*/, y/* + 1*/)) }) {
null -> {
val entitiesOnCoordinate = entities.filter { it.position.contains(Coordinate(x, y)) }
when {
entitiesOnCoordinate.isEmpty() -> {
color = GREY
fillRect(x * TILE_SIZE + 1, y * TILE_SIZE + 1, TILE_FILL_SIZE, TILE_FILL_SIZE)
}

else -> {
color = when (entity.type) {
Kuvat::class -> GREEN
Kuvahaku::class -> BLUE
Uutiset::class -> RED
else -> TODO("Handle unexpected entity type. Even if we know that it is not possible.")
color = when (entitiesOnCoordinate.size) {
1 -> when (entitiesOnCoordinate.first().type) {
Kuvat::class -> GREEN
Kuvahaku::class -> BLUE
Uutiset::class -> RED
else -> TODO("Handle unexpected entity type. Even if we know that it is not possible.")
}

else -> {
val kuvahakus = entitiesOnCoordinate.filter { it.type == Kuvahaku::class }
when (kuvahakus.size) {
1 -> BLUE
else -> MAGENTA
}
}
}
fillRect(x * TILE_SIZE + 1, y * TILE_SIZE + 1, TILE_FILL_SIZE, TILE_FILL_SIZE)
}
Expand Down