wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Borders made of oriented triangles rather than circles (#2104)

Browse source
This commit is contained in:
Federico Luongo 2020-03-08 19:36:50 +01:00 committed by GitHub
parent 61565c0ee6
commit 0cf27789e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 676 additions and 662 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/OtherIcons/Triangle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

1327
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 906 KiB

After

Width:  |  Height:  |  Size: 907 KiB

BIN
android/assets/game2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 KiB

After

Width:  |  Height:  |  Size: 369 KiB

10
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View file

@ -15,7 +15,8 @@ import com.unciv.models.ruleset.unit.UnitType
import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.center
import com.unciv.ui.utils.centerX
import kotlin.math.PI
import kotlin.math.atan
open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) : Group() {
@ -385,8 +386,13 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val images = mutableListOf<Image>()
borderImages[neighbor] = images
for (i in -2..2) {
val image = ImageGetter.getCircle()
val image = ImageGetter.getTriangle()
val sign = if (relativeWorldPosition.x < 0) -1 else 1
val angle = sign * (atan(sign * relativeWorldPosition.y / relativeWorldPosition.x) * 180 / PI - 90.0)
image.setSize(5f, 5f)
image.setOrigin(image.width/2,image.height/2)
image.rotateBy(angle.toFloat())
image.center(this)
// in addTiles, we set the position of groups by relative world position *0.8*groupSize, filter groupSize = 50
// Here, we want to have the borders start HALFWAY THERE and extend towards the tiles, so we give them a position of 0.8*25.

1
core/src/com/unciv/ui/utils/ImageGetter.kt
View file

@ -184,6 +184,7 @@ object ImageGetter {
fun getBlue() = Color(0x004085bf)
fun getCircle() = getImage("OtherIcons/Circle")
fun getTriangle() = getImage("OtherIcons/Triangle")
fun getBackground(color:Color): Drawable {
val drawable = getDrawable("OtherIcons/TableBackground")