From da898cc8a1ad236ac47b2eb0424c6ceeb041aa9b Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Sun, 3 Jul 2022 14:23:51 -0400 Subject: [PATCH] Resize fleets --- .../net/starshipfights/campaign/campaign_ui.kt | 18 ++++++++++-------- .../campaign/space_fleet_render.kt | 2 +- .../starshipfights/campaign/space_render.kt | 2 +- .../starshipfights/campaign/cluster_test.kt | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/jsMain/kotlin/net/starshipfights/campaign/campaign_ui.kt b/src/jsMain/kotlin/net/starshipfights/campaign/campaign_ui.kt index 6160c3d..1f86767 100644 --- a/src/jsMain/kotlin/net/starshipfights/campaign/campaign_ui.kt +++ b/src/jsMain/kotlin/net/starshipfights/campaign/campaign_ui.kt @@ -136,7 +136,7 @@ object CampaignUI { .children.single { it.fleetPresenceRender == fleetPtr } selectedFleetIndicators[fleetPtr] = CSS3DSprite(document.create.img(src = "/static/game/images/crosshair.svg")).apply { - scale.setScalar(0.004) + scale.setScalar(0.00875) element.style.asDynamic().pointerEvents = "none" @@ -206,10 +206,10 @@ object CampaignUI { style = "text-align:center" +(system.holder?.loyalties?.first()?.getDefiniteShortName()?.let { "Controlled by $it" } ?: "Wilderness") br + system.holder?.let { +"(${it.displayName})" } + br system.holder?.let { - img(alt = it.displayName, src = it.flagUrl) { - style = "width:4em;height:2.5em" - } + img(alt = it.displayName, src = it.flagUrl) { style = "width:4em;height:2.5em" } } } @@ -246,18 +246,20 @@ object CampaignUI { +fleet.name } } - p { - style = "text-align:center" - +"${fleet.ships.size} ships" - } p { style = "text-align:center" +"Operated by ${fleet.owner.loyalties.first().getDefiniteShortName()}" br + +"(${fleet.owner.displayName})" + br img(alt = fleet.owner.displayName, src = fleet.owner.flagUrl) { style = "width:4em;height:2.5em" } } + p { + style = "text-align:center" + +"${fleet.ships.size} ships" + } selectedFleetIndicators[selection.pointer]?.visible = true visibleSelectedFleetIndicators += selection.pointer diff --git a/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt b/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt index 1288bfe..74a6495 100644 --- a/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt +++ b/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt @@ -36,7 +36,7 @@ enum class FleetSide { } return angles.map { theta -> - val position = Vector3(cosFactor * cos(theta) * worldRadius, 9.6, sin(theta) * worldRadius).add(worldCenter) + val position = Vector3(cosFactor * cos(theta) * worldRadius, 14.4, sin(theta) * worldRadius).add(worldCenter) val rotation = atan2(-cos(theta) * cosFactor, -sin(theta)) diff --git a/src/jsMain/kotlin/net/starshipfights/campaign/space_render.kt b/src/jsMain/kotlin/net/starshipfights/campaign/space_render.kt index 17361a4..e8b74b6 100644 --- a/src/jsMain/kotlin/net/starshipfights/campaign/space_render.kt +++ b/src/jsMain/kotlin/net/starshipfights/campaign/space_render.kt @@ -271,7 +271,7 @@ object CampaignResources { async { loadModel(shipType.meshName) } }.mapValues { (_, meshAsync) -> val mesh = meshAsync.await() - mesh.scale.setScalar(0.25) + mesh.scale.setScalar(0.4) RenderFactory { mesh.clone(true) } } diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_test.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_test.kt index 776ee9f..08c24f9 100644 --- a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_test.kt +++ b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_test.kt @@ -14,7 +14,7 @@ fun StarClusterView.testPostProcess(): StarClusterView { val ownedSystems = (systems.toList().shuffled() zip ownerFlavors).associate { (systemWithId, flavor) -> val (systemId, system) = systemWithId - val numOfFleets = (1..3).random() + val numOfFleets = (0..1).random() + (0..1).random() + 1 val fleets = (1..numOfFleets).associate { i -> Id("${systemId.id}-fleet-$i") to FleetPresence( "Test Fleet $i", -- 2.25.1