From 697424efc43c90833302d24a70a20589839b770a Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 5 Jan 2020 21:44:44 +0900 Subject: [PATCH] re-draw floater gui texture --- assets/graphics/gui/message_black.tga | 3 --- assets/graphics/gui/message_black_tileable.tga | 4 ++-- assets/graphics/gui/message_white.tga | 3 --- assets/graphics/gui/message_white_tileable.tga | 3 +++ assets/graphics/gui/tooltip_black.tga | 3 --- assets/graphics/gui/tooltip_white.tga | 3 --- .../terrarum/modulebasegame/ui/FloatDrawer.kt | 2 +- .../torvald/terrarum/modulebasegame/ui/UITooltip.kt | 12 ++++++++---- work_files/graphics/gui/message.psd | 4 ++-- work_files/graphics/gui/message_tileable.psd | 3 --- 10 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 assets/graphics/gui/message_black.tga delete mode 100644 assets/graphics/gui/message_white.tga create mode 100644 assets/graphics/gui/message_white_tileable.tga delete mode 100644 assets/graphics/gui/tooltip_black.tga delete mode 100644 assets/graphics/gui/tooltip_white.tga mode change 100644 => 100755 work_files/graphics/gui/message.psd delete mode 100644 work_files/graphics/gui/message_tileable.psd diff --git a/assets/graphics/gui/message_black.tga b/assets/graphics/gui/message_black.tga deleted file mode 100644 index c614e8086..000000000 --- a/assets/graphics/gui/message_black.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:358aaf2ebfd9a02986113330b4d0ff86bf990d83dd2dfbc24e2a6f09d70e6764 -size 5420 diff --git a/assets/graphics/gui/message_black_tileable.tga b/assets/graphics/gui/message_black_tileable.tga index 70fa30ea4..3acd65f3d 100644 --- a/assets/graphics/gui/message_black_tileable.tga +++ b/assets/graphics/gui/message_black_tileable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9300efda93358c4bed069fb6ed99ae9c7b788f76b15f0d640cdcc893cb086050 -size 2348 +oid sha256:f09ec19777faf73fc4ba34708d98582033a4dc25a095eac5a825c84b1ed5d0a6 +size 9234 diff --git a/assets/graphics/gui/message_white.tga b/assets/graphics/gui/message_white.tga deleted file mode 100644 index 07ef7906a..000000000 --- a/assets/graphics/gui/message_white.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c142d12e5b939adef30be08f00cc4240b04b35a5c8f942319052fef81a3535c0 -size 5394 diff --git a/assets/graphics/gui/message_white_tileable.tga b/assets/graphics/gui/message_white_tileable.tga new file mode 100644 index 000000000..f0aaa0e44 --- /dev/null +++ b/assets/graphics/gui/message_white_tileable.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b16bca272ca1caf838c1bd04fa070d48c206722d41ac34219359720f294ff1b1 +size 9234 diff --git a/assets/graphics/gui/tooltip_black.tga b/assets/graphics/gui/tooltip_black.tga deleted file mode 100644 index ad848773b..000000000 --- a/assets/graphics/gui/tooltip_black.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4e615bd3ddc02c8965daf123326c4d600dd5e3e6e71fc274aa26e197f2ffea4 -size 3474 diff --git a/assets/graphics/gui/tooltip_white.tga b/assets/graphics/gui/tooltip_white.tga deleted file mode 100644 index ec2a59d1a..000000000 --- a/assets/graphics/gui/tooltip_white.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca16b84289d652c01a858099dd49450593c15584e9aa8b884703a6b72c00d472 -size 3474 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/FloatDrawer.kt b/src/net/torvald/terrarum/modulebasegame/ui/FloatDrawer.kt index aa907fdc7..6bd468629 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/FloatDrawer.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/FloatDrawer.kt @@ -10,7 +10,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack */ object FloatDrawer : Disposable { - val tile = TextureRegionPack("assets/graphics/gui/message_black_tileable.tga", 8, 8) + val tile = TextureRegionPack("assets/graphics/gui/message_white_tileable.tga", 16, 16) init { AppLoader.disposableSingletonsPool.add(this) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt index 0d7086805..cdcf17ed6 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt @@ -15,6 +15,9 @@ class UITooltip : UICanvas() { override var openCloseTime: Second = 0f + private val tooltipBackCol = Color(0xd5d4d3ff.toInt()) + private val tooltipForeCol = Color(0x404040ff) + var message: String = "" set(value) { field = value @@ -37,16 +40,17 @@ class UITooltip : UICanvas() { val mouseX = 4f val mouseY = 6f - val tooltipY = mouseY - height + val tooltipYoff = 12 + val tooltipY = mouseY - height + tooltipYoff val txtW = msgWidth + 2f * textMarginX - batch.color = Color.WHITE - + batch.color = tooltipBackCol FloatDrawer(batch, mouseX - textMarginX, tooltipY, txtW, font.lineHeight) + batch.color = tooltipForeCol font.draw(batch, message, mouseX, - mouseY - height + mouseY - height + tooltipYoff ) } diff --git a/work_files/graphics/gui/message.psd b/work_files/graphics/gui/message.psd old mode 100644 new mode 100755 index 571b8a662..4d8d743bd --- a/work_files/graphics/gui/message.psd +++ b/work_files/graphics/gui/message.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f7bc906c2607ee7be1adc690277050ab0b07cc577142965f0efa74ae7e7b1d0 -size 43430 +oid sha256:bece510530e21da2e65437c2c3c72faa64ad99a6643be26e5c2c2c055e14df85 +size 44808 diff --git a/work_files/graphics/gui/message_tileable.psd b/work_files/graphics/gui/message_tileable.psd deleted file mode 100644 index 25ec9720b..000000000 --- a/work_files/graphics/gui/message_tileable.psd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84d426b2253ed23291e03962a73af562f909c7017c1dd312e1cb08751958c149 -size 22776