curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 12:04:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

more buildingmaker ui stuffs

Browse Source
This commit is contained in:
minjaesong
2023-10-14 22:01:41 +09:00
parent d5074e30eb
commit 0a65794756
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -41,18 +41,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
- Load terrain…
-
- Exit to Title : net.torvald.terrarum.modulebasegame.YamlCommandExit
- Tool
- Pencil : net.torvald.terrarum.modulebasegame.YamlCommandToolPencil
- Eraser : net.torvald.terrarum.modulebasegame.YamlCommandToolPencilErase
- Wall Hammer : net.torvald.terrarum.modulebasegame.YamlCommandToolPencilEraseWall
- Eyedropper : net.torvald.terrarum.modulebasegame.YamlCommandToolEyedropper
- Add Selection : net.torvald.terrarum.modulebasegame.YamlCommandToolMarquee
- Remove Sel. : net.torvald.terrarum.modulebasegame.YamlCommandToolMarqueeErase
- Clear Sel. : net.torvald.terrarum.modulebasegame.YamlCommandToolMarqueeClear
- Move Selected
-
- Hide/Show Sel. : net.torvald.terrarum.modulebasegame.YamlCommandToolToggleMarqueeOverlay
-
- Edit
- Undo
- Redo
- Time
@@ -288,7 +277,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
uiToolbox.isVisible = true
uiToolbox.invocationArgument = arrayOf(this)
uiPaletteSelector.setPosition(App.scr.width - uiPaletteSelector.width, 0)
uiPaletteSelector.setPosition(0, App.scr.height - uiPaletteSelector.height)
uiPaletteSelector.isVisible = true
notifier.setPosition(

2
src/net/torvald/terrarum/modulebasegame/ui/UIPaletteSelector.kt
View File

@@ -56,7 +56,7 @@ class UIPaletteSelector(val parent: BuildingMaker) : UICanvas() {
0b00_00_00_00_00_00_00_01_11_11_11_01_01,
0b00_00_00_00_00_00_00_00_01_11_01_01_00,
0b00_00_00_00_00_00_00_00_00_01_01_00_00
).reversed().forEachIndexed { index, bits ->
).forEachIndexed { index, bits ->
for (shiftmask in 12 downTo 0) {
val bit = bits.ushr(shiftmask * 2).and(3)