Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-07-30 13:35:14 +0000
committerStijn Buys <ingar@osirion.org>2011-07-30 13:35:14 +0000
commit0981a22e5ad0ea2725299badd700eecde6c5f268 (patch)
tree13e24793edc3407c04ccceea9a76ba3823e4675a
parentdf0ce1e6e175f409f426b58fdcd60e6fd365308f (diff)
Edited ui colors, added initial ui materials.
-rw-r--r--base/ini/ui.ini7
-rw-r--r--base/materials/shaderlist.txt2
-rw-r--r--base/materials/ui.shader23
3 files changed, 29 insertions, 3 deletions
diff --git a/base/ini/ui.ini b/base/ini/ui.ini
index 7e09fc9..13584be 100644
--- a/base/ini/ui.ini
+++ b/base/ini/ui.ini
@@ -7,7 +7,7 @@
; width of a menu element
elementwidth=256
; height of a menu element
-elementheight=48
+elementheight=32
; margin between menu elements
elementmargin=16
@@ -21,9 +21,10 @@ text=0.75 0.75 0.75
; disabled ui elements
disabled=0.5 0.5 0.5 0.75
; global background color rgba
-background=0.0 0.0 0.0 0.75
+background=0.0 0.0 0.0 0.8
; global border color rgb
-border=0 0.8 0 0.5
+//border=0 0.8 0 0.5
+border=.4 .4 .4 .5
; pointer color
pointer=0 0.75 0
; active pointer color
diff --git a/base/materials/shaderlist.txt b/base/materials/shaderlist.txt
index 083b65a..5a08439 100644
--- a/base/materials/shaderlist.txt
+++ b/base/materials/shaderlist.txt
@@ -6,3 +6,5 @@ trak
detail
thorn
commodities
+ui
+
diff --git a/base/materials/ui.shader b/base/materials/ui.shader
new file mode 100644
index 0000000..c5c3f07
--- /dev/null
+++ b/base/materials/ui.shader
@@ -0,0 +1,23 @@
+ui/background
+{
+ qer_editorimage textures/thorn/panel_01_dark
+ texture textures/thorn/panel_01_dark
+ bright
+ color 0.1 0.1 0.1 1
+}
+
+ui/window
+{
+ qer_editorimage textures/thorn/panel_01_dark
+ texture textures/thorn/panel_01_dark
+ bright
+ color 0.2 0.2 0.2 0.85
+}
+
+ui/button
+{
+ qer_editorimage textures/thorn/panel_01
+ texture textures/thorn/panel_01
+ bright
+ color 0 0.2 0 1.0
+}