Cleaned up UI, merged atlases, added GLProfiling

This commit is contained in:
Anuken
2017-10-22 16:24:49 -04:00
parent 2ca4f8b90a
commit 70693ffdd3
130 changed files with 662 additions and 939 deletions

View File

@ -1,745 +0,0 @@
uiskin.png
size: 512,512
format: RGBA8888
filter: Nearest,Nearest
repeat: none
border
rotate: false
xy: 90, 65
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
border-circle
rotate: false
xy: 256, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
border-circle-error
rotate: false
xy: 285, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
border-dark-blue
rotate: false
xy: 407, 85
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
border-error
rotate: false
xy: 130, 3
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
button
rotate: false
xy: 372, 41
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-blue
rotate: false
xy: 272, 14
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-down
rotate: false
xy: 272, 14
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-blue-down
rotate: false
xy: 222, 14
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-blue-over
rotate: false
xy: 247, 14
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-over
rotate: false
xy: 297, 15
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-red
rotate: false
xy: 322, 15
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
button-window-bg
rotate: false
xy: 347, 15
size: 24, 40
split: 10, 10, 10, 8
pad: 8, 8, 2, 2
orig: 24, 40
offset: 0, 0
index: -1
check-off
rotate: false
xy: 314, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
textfield
rotate: false
xy: 314, 85
size: 28, 28
split: 2, 2, 2, 2
orig: 28, 28
offset: 0, 0
index: -1
vis-check
rotate: false
xy: 314, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
check-on
rotate: false
xy: 343, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
color-picker-bar-selector
rotate: false
xy: 496, 85
size: 14, 28
orig: 14, 28
offset: 0, 0
index: -1
color-picker-cross
rotate: false
xy: 411, 47
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
color-picker-selector-horizontal
rotate: false
xy: 22, 27
size: 6, 1
orig: 6, 1
offset: 0, 0
index: -1
color-picker-selector-vertical
rotate: false
xy: 1, 1
size: 1, 6
orig: 1, 6
offset: 0, 0
index: -1
cursor
rotate: false
xy: 97, 30
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
default
rotate: false
xy: 1, 279
size: 510, 232
orig: 512, 256
offset: 0, 24
index: -1
default-pane
rotate: false
xy: 84, 65
size: 5, 3
split: 1, 1, 1, 1
orig: 5, 3
offset: 0, 0
index: -1
default-pane-no-border
rotate: false
xy: 397, 45
size: 1, 1
split: 0, 0, 0, 0
orig: 1, 1
offset: 0, 0
index: -1
default-select
rotate: false
xy: 29, 65
size: 54, 48
split: 8, 32, 0, 48
orig: 54, 48
offset: 0, 0
index: -1
default-select-selection
rotate: false
xy: 134, 3
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
font-small
rotate: false
xy: 1, 114
size: 509, 164
orig: 512, 256
offset: 0, 91
index: -1
grey
rotate: false
xy: 196, 52
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
menu-bg
rotate: false
xy: 196, 52
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
icon-arrow-left
rotate: false
xy: 29, 1
size: 36, 28
orig: 44, 44
offset: 4, 8
index: -1
icon-arrow-right
rotate: false
xy: 66, 1
size: 36, 28
orig: 44, 44
offset: 4, 8
index: -1
icon-close
rotate: false
xy: 1, 8
size: 20, 20
orig: 44, 44
offset: 12, 12
index: -1
icon-drive
rotate: false
xy: 222, 3
size: 36, 10
orig: 44, 44
offset: 4, 18
index: -1
icon-file-audio
rotate: false
xy: 97, 32
size: 28, 36
orig: 44, 44
offset: 8, 4
index: -1
icon-file-image
rotate: false
xy: 103, 1
size: 26, 30
orig: 44, 44
offset: 9, 7
index: -1
icon-file-pdf
rotate: false
xy: 68, 30
size: 28, 34
orig: 44, 44
offset: 8, 5
index: -1
icon-file-text
rotate: false
xy: 372, 10
size: 26, 30
orig: 44, 44
offset: 9, 7
index: -1
icon-folder
rotate: false
xy: 372, 89
size: 32, 24
orig: 44, 44
offset: 6, 12
index: -1
icon-folder-new
rotate: false
xy: 220, 84
size: 35, 29
orig: 44, 44
offset: 5, 7
index: -1
icon-folder-parent
rotate: false
xy: 405, 89
size: 32, 24
orig: 44, 44
offset: 6, 12
index: -1
icon-folder-star
rotate: false
xy: 185, 54
size: 34, 26
orig: 44, 44
offset: 5, 9
index: -1
icon-list-settings
rotate: false
xy: 29, 30
size: 38, 34
orig: 44, 44
offset: 5, 3
index: -1
icon-refresh
rotate: false
xy: 411, 58
size: 26, 30
orig: 44, 44
offset: 9, 7
index: -1
icon-star
rotate: false
xy: 220, 55
size: 30, 28
orig: 44, 44
offset: 7, 8
index: -1
icon-star-outline
rotate: false
xy: 185, 81
size: 34, 32
orig: 44, 44
offset: 5, 6
index: -1
icon-trash
rotate: false
xy: 438, 54
size: 24, 30
orig: 44, 44
offset: 10, 7
index: -1
list-selection
rotate: false
xy: 126, 34
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
vis-blue
rotate: false
xy: 126, 34
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
padded-list-selection
rotate: false
xy: 185, 52
size: 10, 1
split: 4, 4, 0, 1
orig: 10, 1
offset: 0, 0
index: -1
progressbar
rotate: false
xy: 126, 36
size: 1, 32
orig: 1, 32
offset: 0, 0
index: -1
progressbar-filled
rotate: false
xy: 399, 14
size: 1, 32
orig: 1, 32
offset: 0, 0
index: -1
progressbar-filled-vertical
rotate: false
xy: 130, 1
size: 32, 1
orig: 32, 1
offset: 0, 0
index: -1
progressbar-vertical
rotate: false
xy: 259, 5
size: 32, 1
orig: 32, 1
offset: 0, 0
index: -1
radio-off
rotate: false
xy: 438, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
vis-radio
rotate: false
xy: 438, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
radio-on
rotate: false
xy: 467, 85
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
scroll
rotate: false
xy: 372, 82
size: 34, 6
split: 4, 4, 2, 2
orig: 34, 6
offset: 0, 0
index: -1
scroll-horizontal
rotate: false
xy: 397, 47
size: 6, 34
split: 2, 2, 0, 34
pad: -1, -1, 5, 4
orig: 6, 34
offset: 0, 0
index: -1
scroll-knob-horizontal
rotate: false
xy: 404, 47
size: 6, 34
split: 2, 2, 0, 34
pad: -1, -1, 13, 12
orig: 6, 34
offset: 0, 0
index: -1
scroll-knob-vertical
rotate: false
xy: 259, 7
size: 34, 6
split: 12, 12, 2, 2
orig: 34, 6
offset: 0, 0
index: -1
select-box-list-bg
rotate: false
xy: 126, 32
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
window-bg
rotate: false
xy: 126, 32
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
select-down
rotate: false
xy: 478, 56
size: 14, 8
orig: 14, 8
offset: 0, 0
index: -1
select-up
rotate: false
xy: 422, 49
size: 14, 8
orig: 14, 8
offset: 0, 0
index: -1
selection
rotate: false
xy: 128, 32
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
separator
rotate: false
xy: 99, 30
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
tree-over
rotate: false
xy: 99, 30
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
separator-menu
rotate: false
xy: 101, 30
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
slider
rotate: false
xy: 128, 43
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
slider-knob
rotate: false
xy: 130, 7
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-disabled
rotate: false
xy: 153, 7
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-down
rotate: false
xy: 176, 7
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-knob-over
rotate: false
xy: 199, 9
size: 22, 44
orig: 22, 44
offset: 0, 0
index: -1
slider-vertical
rotate: false
xy: 422, 47
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
splitpane
rotate: false
xy: 503, 68
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
splitpane-over
rotate: false
xy: 503, 66
size: 8, 1
orig: 8, 1
offset: 0, 0
index: -1
splitpane-vertical
rotate: false
xy: 128, 34
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
splitpane-vertical-over
rotate: false
xy: 367, 76
size: 1, 8
orig: 1, 8
offset: 0, 0
index: -1
sub-menu
rotate: false
xy: 503, 70
size: 8, 14
orig: 8, 14
offset: 0, 0
index: -1
textfield-over
rotate: false
xy: 251, 55
size: 28, 28
split: 2, 2, 2, 2
orig: 28, 28
offset: 0, 0
index: -1
vis-check-over
rotate: false
xy: 251, 55
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
tooltip-bg
rotate: false
xy: 138, 3
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
touchpad-knob
rotate: false
xy: 84, 69
size: 44, 44
orig: 44, 44
offset: 0, 0
index: -1
tree-minus
rotate: false
xy: 414, 36
size: 10, 10
orig: 16, 16
offset: 2, 4
index: -1
tree-plus
rotate: false
xy: 401, 30
size: 12, 16
orig: 16, 16
offset: 2, 0
index: -1
tree-selection
rotate: false
xy: 142, 3
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
vis-check-down
rotate: false
xy: 280, 56
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
vis-check-tick
rotate: false
xy: 463, 65
size: 19, 19
orig: 28, 28
offset: 5, 4
index: -1
vis-check-tick-disabled
rotate: false
xy: 483, 65
size: 19, 19
orig: 28, 28
offset: 5, 4
index: -1
vis-radio-down
rotate: false
xy: 309, 56
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
vis-radio-over
rotate: false
xy: 338, 56
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
vis-radio-tick
rotate: false
xy: 401, 15
size: 14, 14
orig: 28, 28
offset: 7, 7
index: -1
vis-radio-tick-disabled
rotate: false
xy: 463, 50
size: 14, 14
orig: 28, 28
offset: 7, 7
index: -1
vis-red
rotate: false
xy: 397, 43
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
white
rotate: false
xy: 146, 3
size: 3, 3
orig: 3, 3
offset: 0, 0
index: -1
window
rotate: false
xy: 157, 52
size: 27, 61
split: 5, 4, 53, 3
orig: 27, 61
offset: 0, 0
index: -1
window-border-bg
rotate: false
xy: 150, 3
size: 3, 3
split: 1, 1, 1, 1
orig: 3, 3
offset: 0, 0
index: -1
window-noborder
rotate: false
xy: 129, 52
size: 27, 61
split: 5, 4, 53, 3
orig: 27, 61
offset: 0, 0
index: -1
window-resizable
rotate: false
xy: 1, 29
size: 27, 84
split: 3, 19, 2, 20
pad: 5, 5, 50, 7
orig: 27, 84
offset: 0, 0
index: -1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

View File

@ -25,57 +25,38 @@ io.anuke.ucore.scene.Skin$TintedDrawable: {
},
io.anuke.ucore.scene.ui.Button$ButtonStyle: {
default: {down: button-down, up: button },
blue: {down: button-blue-down, up: button-blue },
toggle: {checked: button-down, down: button-down, up: button }
},
io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: {
default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-down, up: button, transition: 0 },
blue: {over: button-blue-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-blue-down, up: button-blue },
toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: grey }
},
io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: {
default: {down: button-down, up: button, over: button-over },
static: {up: button },
static-down: {up: button-down },
blue: {down: button-blue-down, up: button-blue },
toggle: {checked: button-down, down: button-down, up: button },
togglemap: {checked: button-map-down, down: button-map-down, up: button-map },
select: {checked: button-select, up: clear },
gray: {down: button-down, up: button-gray, over: button-gray-over, disabled: button},
close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button }
},
io.anuke.ucore.scene.ui.ImageTextButton$ImageTextButtonStyle: {
default: {down: button-down, up: button, over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey },
blue: {down: button-blue-down, up: button-blue, over: button-blue-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey },
toggle: {checked: button-down, down: button-down, up: button, font: default-font, fontColor: white, over: button-over, disabled: button, disabledFontColor: grey }
},
io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: {
list: {vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal },
default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal }
},
io.anuke.ucore.scene.ui.SelectBox$SelectBoxStyle: {
default: {background: default-select, scrollStyle: default, listStyle: {font: default-font, selection: padded-list-selection, background: select-box-list-bg}, font: default-font, fontColor: white, disabledFontColor: grey }
},
io.anuke.ucore.scene.ui.SplitPane$SplitPaneStyle: {
default-vertical: {handle: splitpane-vertical },
default-horizontal: {handle: splitpane }
default: {vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal }
},
io.anuke.ucore.scene.ui.Window$WindowStyle: {
default: {titleFont: default-font, background: window, titleFontColor: orange },
resizable: {background: window-resizable, titleFont: default-font, titleFontColor: white },
noborder: {background: window-noborder, titleFont: default-font, titleFontColor: white },
dialog: {stageBackground: dialogDim, titleFont: default-font, background: window, titleFontColor: orange }
},
io.anuke.ucore.scene.ui.KeybindDialog$KeybindDialogStyle: {
default: {keyColor: red, keyNameColor: white},
},
io.anuke.ucore.scene.ui.ProgressBar$ProgressBarStyle: {
default-horizontal: {background: progressbar, knob: progressbar-filled, knobBefore: progressbar-filled },
default-vertical: {background: progressbar-vertical, knob: progressbar-filled-vertical, knobBefore: progressbar-filled-vertical }
},
io.anuke.ucore.scene.ui.Slider$SliderStyle: {
default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down, disabledKnob: slider-knob-disabled },
default-vertical: {background: slider-vertical, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down, disabledKnob: slider-knob-disabled }
default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down},
default-vertical: {background: slider-vertical, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down}
},
io.anuke.ucore.scene.ui.Label$LabelStyle: {
default: {font: default-font, fontColor: white },
@ -84,23 +65,12 @@ io.anuke.ucore.scene.ui.Label$LabelStyle: {
menuitem-shortcut: {font: default-font, fontColor: menuitem }
},
io.anuke.ucore.scene.ui.TextField$TextFieldStyle: {
default: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey },
small: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey }
default: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey }
},
io.anuke.ucore.scene.ui.CheckBox$CheckBoxStyle: {
default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: grey },
radio: {checkboxOn: radio-on, checkboxOff: radio-off, font: default-font, fontColor: white, disabledFontColor: grey }
default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: grey }
},
io.anuke.ucore.scene.ui.List$ListStyle: {
default: {fontColorUnselected: white, selection: padded-list-selection, fontColorSelected: white, font: default-font }
},
io.anuke.ucore.scene.ui.Touchpad$TouchpadStyle: {
default: {background: default-pane, knob: touchpad-knob }
},
io.anuke.ucore.scene.ui.Tree$TreeStyle: {
default: {minus: tree-minus, plus: tree-plus, selection: tree-selection, over: tree-over }
},
io.anuke.ucore.scene.ui.TextTooltip$TextTooltipStyle: {
default: {background: default-pane, label: {font: default-font, fontColor: white} }
default: {fontColorUnselected: white, fontColorSelected: white, font: default-font }
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB