From 6e09c983885b0e06bf92ccf2eba7a85e4e89252a Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Thu, 10 Feb 2022 11:00:19 -0500 Subject: [PATCH] Client-side changes --- .../starshipfights/game/game_resources.kt | 8 +++++++- src/jsMain/kotlin/starshipfights/game/popup.kt | 7 +++++++ src/jsMain/resources/textures/grid-tile.png | Bin 453 -> 495 bytes 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/jsMain/kotlin/starshipfights/game/game_resources.kt b/src/jsMain/kotlin/starshipfights/game/game_resources.kt index da24228..1be28ee 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_resources.kt +++ b/src/jsMain/kotlin/starshipfights/game/game_resources.kt @@ -120,8 +120,14 @@ object RenderResources { val material = MeshBasicMaterial(configure { map = gridTex - alphaTest = 0.5 + side = DoubleSide + depthWrite = false + + blending = CustomBlending + blendEquation = AddEquation + blendSrc = OneFactor + blendDst = OneMinusSrcColorFactor }) val plane = PlaneGeometry(w3d, l3d) diff --git a/src/jsMain/kotlin/starshipfights/game/popup.kt b/src/jsMain/kotlin/starshipfights/game/popup.kt index 336c6ab..cfe1a43 100644 --- a/src/jsMain/kotlin/starshipfights/game/popup.kt +++ b/src/jsMain/kotlin/starshipfights/game/popup.kt @@ -445,6 +445,13 @@ sealed class Popup { +outcome } + p { + style = "text-align:center" + + a(href = "/me") { + +"Return to Home Page" + } + } } } } diff --git a/src/jsMain/resources/textures/grid-tile.png b/src/jsMain/resources/textures/grid-tile.png index 6ae3a3d94b241bd3ca19b589aca1c50723d11afd..be1cd425dbf45ae1c81067279151e57a8c0d1022 100644 GIT binary patch delta 161 zcmV;S0ABya1MdTnNngJJ01m$aI0aKA0004mNklKKw!@tBSX|c_<5-(h09@bC0O&XcK$A~k+Oj+V)L&H8N_8-Y P00000NkvXXu0mjfjuA(r delta 105 zcmV-v0G9vn1H}W7Njty*01m(bYSxJf00046Nkl