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>2014-07-09 19:28:56 +0000
committerStijn Buys <ingar@osirion.org>2014-07-09 19:28:56 +0000
commitaa7d54f04dc3eefed2cbf050199d641f035ecf47 (patch)
treee84e71e8011646dec45d4edfbcd627d3ea1eeee1
parent4178b0688dde041b48f4a21a3ac29ba09cce8cc9 (diff)
Updated shaders to the new shader file format.
-rw-r--r--base/materials/asteroids.shader6
-rw-r--r--base/materials/colors.shader224
-rw-r--r--base/materials/commodities.shader24
-rw-r--r--base/materials/common.shader160
-rw-r--r--base/materials/dagon.shader4
-rw-r--r--base/materials/detail.shader179
-rw-r--r--base/materials/thorn.shader80
-rw-r--r--base/materials/ui.shader24
8 files changed, 449 insertions, 252 deletions
diff --git a/base/materials/asteroids.shader b/base/materials/asteroids.shader
index 95a5383..9a5711e 100644
--- a/base/materials/asteroids.shader
+++ b/base/materials/asteroids.shader
@@ -1,6 +1,8 @@
models/asteroids/asteroid
{
qer_editorimage models/asteroids/asteroid
- texture models/asteroids/asteroid
- specular 0 0 0
+ {
+ map models/asteroids/asteroid
+ specular 0 0 0
+ }
} \ No newline at end of file
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index e1a89c6..462a01f 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -1,251 +1,321 @@
textures/colors/black
{
qer_editorimage textures/colors/black
- color 0.00 0.00 0.00
+ {
+ color 0.00 0.00 0.00
+ }
}
textures/colors/black_bright
{
qer_editorimage textures/colors/black
- color 0.00 0.00 0.00
- bright
+ {
+ color 0.00 0.00 0.00
+ bright
+ }
}
textures/colors/white
{
qer_editorimage textures/colors/white
- color 1.00 1.00 1.00
+ {
+ color 1.00 1.00 1.00
+ }
}
textures/colors/white_bright
{
qer_editorimage textures/colors/white
- color 1.00 1.00 1.00
- bright
+ {
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/colors/red
{
qer_editorimage textures/colors/red
- color 1.00 0.00 0.00
+ {
+ color 1.00 0.00 0.00
+ }
}
textures/colors/red_shiny
{
qer_editorimage textures/colors/red
- color 1.00 0.00 0.00
- texture textures/fx/generic_env
- environment
+ {
+ color 1.00 0.00 0.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/red_bright
{
qer_editorimage textures/colors/red
- color 1.00 0.00 0.00
- bright
+ {
+ color 1.00 0.00 0.00
+ bright
+ }
}
textures/colors/orange
{
qer_editorimage textures/colors/orange
- color 1.00 0.50 0.00
+ {
+ color 1.00 0.50 0.00
+ }
}
textures/colors/orange_shiny
{
qer_editorimage textures/colors/orange
- color 1.00 0.50 0.00
- texture textures/fx/generic_env
- environment
+ {
+ color 1.00 0.50 0.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/orange_bright
{
qer_editorimage textures/colors/orange
- color 1.00 0.50 0.00
- bright
+ {
+ color 1.00 0.50 0.00
+ bright
+ }
}
textures/colors/green
{
qer_editorimage textures/colors/green
- color 0.00 1.00 0.00
+ {
+ color 0.00 1.00 0.00
+ }
}
textures/colors/green_shiny
{
qer_editorimage textures/colors/green
- color 0.00 1.00 0.00
- texture textures/fx/generic_env
- environment
+ {
+ color 0.00 1.00 0.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/green_bright
{
qer_editorimage textures/colors/green
- color 0.00 1.00 0.00
- bright
+ {
+ color 0.00 1.00 0.00
+ bright
+ }
}
textures/colors/yellow
{
qer_editorimage textures/colors/yellow
- color 1.00 1.00 0.00
+ {
+ color 1.00 1.00 0.00
+ }
}
textures/colors/yellow_shiny
{
qer_editorimage textures/colors/yellow
- color 1.00 1.00 0.00
- texture textures/fx/generic_env
- environment
+ {
+ color 1.00 1.00 0.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/yellow_bright
{
qer_editorimage textures/colors/yellow
- color 1.00 1.00 0.00
- bright
+ {
+ color 1.00 1.00 0.00
+ bright
+ }
}
textures/colors/blue
{
qer_editorimage textures/colors/blue
- color 0.00 0.00 1.00
+ {
+ color 0.00 0.00 1.00
+ }
}
textures/colors/blue_shiny
{
qer_editorimage textures/colors/blue
- color 0.00 0.00 1.00
- texture textures/fx/generic_env
- environment
+ {
+ color 0.00 0.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/blue_bright
{
qer_editorimage textures/colors/blue
- color 0.00 0.00 1.00
- bright
+ {
+ color 0.00 0.00 1.00
+ bright
+ }
}
textures/colors/purple
{
qer_editorimage textures/colors/purple
- color 0.50 0.00 0.50
+ {
+ color 0.50 0.00 0.50
+ }
}
textures/colors/purple_shiny
{
qer_editorimage textures/colors/purple
- color 0.50 0.00 0.50
- texture textures/fx/generic_env
- environment
+ {
+ color 0.50 0.00 0.50
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/purple_bright
{
qer_editorimage textures/colors/purple
- color 0.50 0.00 0.50
- bright
+ {
+ color 0.50 0.00 0.50
+ bright
+ }
}
textures/colors/grey25
{
qer_editorimage textures/colors/grey25
- color 0.25 0.25 0.25
- specular 0.50 0.50 0.50
+ {
+ color 0.25 0.25 0.25
+ specular 0.50 0.50 0.50
+ }
}
textures/colors/grey25_shiny
{
qer_editorimage textures/colors/grey25
- color 0.25 0.25 0.25
- specular 0.50 0.50 0.50
- texture textures/fx/generic_env
- environment
+ {
+ color 0.25 0.25 0.25
+ specular 0.50 0.50 0.50
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/grey25_bright
{
qer_editorimage textures/colors/grey25
- color 0.25 0.25 0.25
- bright
+ {
+ color 0.25 0.25 0.25
+ bright
+ }
}
textures/colors/grey50
{
qer_editorimage textures/colors/grey50
- color 0.50 0.50 0.50
- specular 0.75 0.75 0.75
+ {
+ color 0.50 0.50 0.50
+ specular 0.75 0.75 0.75
+ }
}
textures/colors/grey50_shiny
{
qer_editorimage textures/colors/grey50
- color 0.50 0.50 0.50
- specular 0.75 0.75 0.75
- texture textures/fx/generic_env
- environment
+ {
+ color 0.50 0.50 0.50
+ specular 0.75 0.75 0.75
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/grey50_bright
{
qer_editorimage textures/colors/grey50
- color 0.50 0.50 0.50
- bright
+ {
+ color 0.50 0.50 0.50
+ bright
+ }
}
textures/colors/grey75
{
qer_editorimage textures/colors/grey75
- color 0.75 0.75 0.75
- specular 1.00 1.00 1.00
+ {
+ color 0.75 0.75 0.75
+ specular 1.00 1.00 1.00
+ }
}
textures/colors/grey75_shiny
{
qer_editorimage textures/colors/grey75
- color 0.75 0.75 0.75
- specular 1.00 1.00 1.00
- texture textures/fx/generic_env
- environment
+ {
+ color 0.75 0.75 0.75
+ specular 1.00 1.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/grey75_bright
{
qer_editorimage textures/colors/grey75
- color 0.75 0.75 0.75
- bright
+ {
+ color 0.75 0.75 0.75
+ bright
+ }
}
textures/colors/grey90
{
qer_editorimage textures/colors/grey90
- color 0.90 0.90 0.90
- specular 1.00 1.00 1.00
+ {
+ color 0.90 0.90 0.90
+ specular 1.00 1.00 1.00
+ }
}
textures/colors/grey90_shiny
{
qer_editorimage textures/colors/grey90
- color 0.90 0.90 0.90
- specular 1.00 1.00 1.00
- texture textures/fx/generic_env
- environment
+ {
+ color 0.90 0.90 0.90
+ specular 1.00 1.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/colors/grey90_bright
{
qer_editorimage textures/colors/grey90
- color 0.90 0.90 0.90
- bright
+ {
+ color 0.90 0.90 0.90
+ bright
+ }
}
textures/colors/chrome
{
qer_editorimage textures/fx/generic_env
- color 1.00 1.00 1.00
- texture textures/fx/generic_env
- environment
+ {
+ color 1.00 1.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
diff --git a/base/materials/commodities.shader b/base/materials/commodities.shader
index eb0ffbf..444cb65 100644
--- a/base/materials/commodities.shader
+++ b/base/materials/commodities.shader
@@ -1,22 +1,28 @@
models/cargo/gold/gold
{
- texture textures/fx/glass_env
- environment
- color 0.7 0.6 0.2
+ {
+ map textures/fx/glass_env
+ environment
+ color 0.7 0.6 0.2
+ }
}
textures/commodities/crystals
{
qer_editorimage textures/commodities/crystals
- color 1.00 1.00 1.00
- texture textures/commodities/crystals
- environment
+ {
+ color 1.00 1.00 1.00
+ map textures/commodities/crystals
+ environment
+ }
}
textures/commodities/diamonds
{
qer_editorimage textures/commodities/diamonds
- color 1.00 1.00 1.00
- texture textures/commodities/diamonds
- environment
+ {
+ color 1.00 1.00 1.00
+ map textures/commodities/diamonds
+ environment
+ }
}
diff --git a/base/materials/common.shader b/base/materials/common.shader
index b353a49..b88da99 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -22,13 +22,6 @@ textures/common/noclip
surfaceparm playerclip
}
-textures/common/engine
-{
- qer_editorimage textures/common/engine
- engine
- bright
-}
-
textures/common/origin
{
qer_editorimage textures/common/origin
@@ -47,149 +40,194 @@ textures/common/bounds
//ignore
}
+textures/common/engine
+{
+ qer_editorimage textures/common/engine
+ {
+ engine
+ bright
+ }
+}
+
// entity color shaders
textures/common/entity
{
qer_editorimage textures/common/entity
- entity
- color 1.00 1.00 1.00
+ {
+ color 1.00 1.00 1.00
+ entity
+ }
}
textures/common/entity_shiny
{
qer_editorimage textures/common/entity
- entity
- color 1.00 1.00 1.00
- texture textures/fx/generic_env.png
- environment
+ {
+ color 1.00 1.00 1.00
+ entity
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_bright
{
qer_editorimage textures/common/entity
- entity
- color 1.00 1.00 1.00
- bright
+ {
+ entity
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/common/entity_dark
{
qer_editorimage textures/common/entity_dark
- entity
- color 0.50 0.50 0.50
+ {
+ entity
+ color 0.50 0.50 0.50
+ }
}
textures/common/entity_dark_shiny
{
qer_editorimage textures/common/entity_dark
- entity
- color 0.50 0.50 0.50
- texture textures/fx/generic_env.png
- environment
+ {
+ entity
+ color 0.50 0.50 0.50
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_dark_bright
{
qer_editorimage textures/common/entity_dark
- entity
- color 0.50 0.50 0.50
- bright
+ {
+ entity
+ color 0.50 0.50 0.50
+ bright
+ }
}
textures/common/entity_second
{
qer_editorimage textures/common/entity_second
- entitySecond
- color 1.00 1.00 1.00
+ {
+ entitySecond
+ color 1.00 1.00 1.00
+ }
}
textures/common/entity_second_shiny
{
qer_editorimage textures/common/entity_second
- entitySecond
- color 1.00 1.00 1.00
- texture textures/fx/generic_env.png
- environment
+ {
+ entitySecond
+ color 1.00 1.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_second_bright
{
qer_editorimage textures/common/entity_second
- entitySecond
- color 1.00 1.00 1.00
- bright
+ {
+ entitySecond
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/common/entity_second_dark
{
qer_editorimage textures/common/entity_second_dark
- entitySecond
- color 0.50 0.50 0.50
+ {
+ entitySecond
+ color 0.50 0.50 0.50
+ }
}
textures/common/entity_second_dark_shiny
{
qer_editorimage textures/common/entity_second_dark
- entitySecond
- color 0.50 0.50 0.50
- texture textures/fx/generic_env.png
- environment
+ {
+ entitySecond
+ color 0.50 0.50 0.50
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_second_dark_bright
{
qer_editorimage textures/common/entity_second_dark
- entitySecond
- color 0.50 0.50 0.50
- bright
+ {
+ entitySecond
+ color 0.50 0.50 0.50
+ bright
+ }
}
// don't touch
textures/common/entity_third
{
qer_editorimage textures/common/entity_third
- entityThird
- color 1.00 1.00 1.00
+ {
+ entityThird
+ color 1.00 1.00 1.00
+ }
}
textures/common/entity_third_shiny
{
qer_editorimage textures/common/entity_third
- entityThird
- color 1.00 1.00 1.00
- texture textures/fx/generic_env.png
- environment
+ {
+ entityThird
+ color 1.00 1.00 1.00
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_third_bright
{
qer_editorimage textures/common/entity_third
- entityThird
- color 1.00 1.00 1.00
- bright
+ {
+ entityThird
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/common/entity_third_dark
{
qer_editorimage textures/common/entity_third_dark
- entityThird
- color 0.50 0.50 0.50
+ {
+ entityThird
+ color 0.50 0.50 0.50
+ }
}
textures/common/entity_third_dark_shiny
{
qer_editorimage textures/common/entity_third_dark
- entityThird
- color 0.50 0.50 0.50
- texture textures/fx/generic_env.png
- environment
+ {
+ entityThird
+ color 0.50 0.50 0.50
+ map textures/fx/generic_env
+ environment
+ }
}
textures/common/entity_third_dark_bright
{
qer_editorimage textures/common/entity_third_dark
- entityThird
- color 0.50 0.50 0.50
- bright
+ {
+ entityThird
+ color 0.50 0.50 0.50
+ bright
+ }
}
diff --git a/base/materials/dagon.shader b/base/materials/dagon.shader
index ff1185f..08b8bdf 100644
--- a/base/materials/dagon.shader
+++ b/base/materials/dagon.shader
@@ -1,6 +1,8 @@
textures/dagon/leo_motorparts
{
qer_editorimage textures/dagon/leo_motorparts
- texture textures/dagon/leo_motorparts
decal
+ {
+ map textures/dagon/leo_motorparts
+ }
} \ No newline at end of file
diff --git a/base/materials/detail.shader b/base/materials/detail.shader
index 10241dc..4befc02 100644
--- a/base/materials/detail.shader
+++ b/base/materials/detail.shader
@@ -1,199 +1,248 @@
textures/detail/arrow_32x64_decal
{
qer_editorimage textures/detail/arrow_32x64
- texture textures/detail/arrow_32x64_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/arrow_32x64_trans
+ color 1.00 1.00 1.00
+ }
+
}
textures/detail/warn_16_entity
{
qer_editorimage textures/detail/warn_16
- texture textures/detail/warn_16
- color 1.00 1.00 1.00
- entity
+ {
+ map textures/detail/warn_16
+ color 1.00 1.00 1.00
+ entity
+ }
}
textures/detail/warn_16_entitysecond
{
qer_editorimage textures/detail/warn_16
- texture textures/detail/warn_16
- color 1.00 1.00 1.00
- entitySecond
+ {
+ map textures/detail/warn_16
+ color 1.00 1.00 1.00
+ entitySecond
+ }
}
textures/detail/warn_16_decal
{
qer_editorimage textures/detail/warn_16
- texture textures/detail/warn_16_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/warn_16_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/warn_16_decal_entity
{
qer_editorimage textures/detail/warn_16
- texture textures/detail/warn_16_trans
- color 1.00 1.00 1.00
- entity
decal
+ {
+ map textures/detail/warn_16_trans
+ color 1.00 1.00 1.00
+ entity
+ }
}
textures/detail/warn_16_decal_entitysecond
{
qer_editorimage textures/detail/warn_16
- texture textures/detail/warn_16_trans
- color 1.00 1.00 1.00
- entitySecond
decal
+ {
+ map textures/detail/warn_16_trans
+ color 1.00 1.00 1.00
+ entitySecond
+ }
}
textures/detail/warn_square_decal
{
qer_editorimage textures/detail/warn_square
- texture textures/detail/warn_square_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/warn_square_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/tigerstripe_decal_entity
{
qer_editorimage textures/detail/tigerstripe
- texture textures/detail/tigerstripe_trans
- color 1.00 1.00 1.00
- entity
decal
+ {
+ map textures/detail/tigerstripe_trans
+ color 1.00 1.00 1.00
+ entity
+ }
}
textures/detail/tigerstripe_decal_entitysecond
{
qer_editorimage textures/detail/tigerstripe
- texture textures/detail/tigerstripe_trans
- color 1.00 1.00 1.00
- entitySecond
decal
+ {
+ map textures/detail/tigerstripe_trans
+ color 1.00 1.00 1.00
+ entitySecond
+ }
}
textures/detail/dockingbay_light
{
qer_editorimage textures/detail/dockingbay
- texture textures/detail/dockingbay
- color 1.00 1.00 1.00
- bright
+ {
+ map textures/detail/dockingbay
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/dockingbay_evil_light
{
qer_editorimage textures/detail/dockingbay_evil
- texture textures/detail/dockingbay_evil
- color 1.00 1.00 1.00
- bright
+ {
+ map textures/detail/dockingbay_evil
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/dockingbay_orange_light
{
qer_editorimage textures/detail/dockingbay_orange
- texture textures/detail/dockingbay_orange
- color 1.00 1.00 1.00
- bright
+ {
+ map textures/detail/dockingbay_orange
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/dockingbay_green_light
{
qer_editorimage textures/detail/dockingbay_green
- texture textures/detail/dockingbay_green
- color 1.00 1.00 1.00
- bright
+ {
+ map textures/detail/dockingbay_green
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/dockingbay_yellow_light
{
qer_editorimage textures/detail/dockingbay_yellow
- texture textures/detail/dockingbay_yellow
- color 1.00 1.00 1.00
- bright
+ {
+ map textures/detail/dockingbay_yellow
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/danger_decal
{
qer_editorimage textures/detail/danger
- texture textures/detail/danger_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/danger_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/danger_decal_entity
{
qer_editorimage textures/detail/danger
- texture textures/detail/danger_trans
- color 1.00 1.00 1.00
- entity
decal
+ {
+ map textures/detail/danger_trans
+ color 1.00 1.00 1.00
+ entity
+ }
}
textures/detail/danger_decal_entitysecond
{
qer_editorimage textures/detail/danger
- texture textures/detail/danger_trans
- color 1.00 1.00 1.00
- entitySecond
decal
+ {
+ map textures/detail/danger_trans
+ color 1.00 1.00 1.00
+ entitySecond
+ }
}
textures/detail/gatling_decal
{
qer_editorimage textures/detail/gatling
- texture textures/detail/gatling_trans
- color 1.00 1.00 1.00
- bright
decal
+ {
+ map textures/detail/gatling_trans
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/muzzle_decal
{
qer_editorimage textures/detail/muzzle
- texture textures/detail/muzzle_trans
- color 1.00 1.00 1.00
- bright
decal
+ {
+ map textures/detail/muzzle_trans
+ color 1.00 1.00 1.00
+ bright
+ }
}
textures/detail/shark_512_decal
{
qer_editorimage textures/detail/shark_512
- texture textures/detail/shark_512_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/shark_512_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/line
{
qer_editorimage textures/detail/line
- texture textures/detail/line_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/line_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/simple_decal
{
qer_editorimage textures/colors/black
- texture textures/colors/black
- color 1.00 1.00 1.00
decal
+ {
+ map textures/colors/black
+ color 1.00 1.00 1.00
+ }
}
textures/detail/window_decal
{
qer_editorimage textures/detail/window
- texture textures/detail/window_trans
- color 1.00 1.00 1.00
decal
+ {
+ map textures/detail/window_trans
+ color 1.00 1.00 1.00
+ }
}
textures/detail/windows
{
- qer_editorimage textures/detail/windows
- texture textures/detail/windows
- color 1.00 1.00 1.00
- bright
+ qer_editorimage textures/detail/windows
+ {
+ map textures/detail/windows
+ color 1.00 1.00 1.00
+ bright
+ }
}
diff --git a/base/materials/thorn.shader b/base/materials/thorn.shader
index 9f3dc8c..d80882c 100644
--- a/base/materials/thorn.shader
+++ b/base/materials/thorn.shader
@@ -1,87 +1,111 @@
textures/thorn/metal_diamond
{
qer_editorimage textures/thorn/metal_diamond
- texture textures/thorn/metal_diamond
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/metal_diamond
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/metal_trimond
{
qer_editorimage textures/thorn/metal_trimond
- texture textures/thorn/metal_trimond
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/metal_trimond
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_01
{
qer_editorimage textures/thorn/panel_01
- texture textures/thorn/panel_01
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_01
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_01_bright
{
qer_editorimage textures/thorn/panel_01_bright
- texture textures/thorn/panel_01_bright
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_01_bright
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_01_dark
{
qer_editorimage textures/thorn/panel_01_dark
- texture textures/thorn/panel_01_dark
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_01_dark
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_02
{
qer_editorimage textures/thorn/panel_02
- texture textures/thorn/panel_02
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_02
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_02_bright
{
qer_editorimage textures/thorn/panel_02_bright
- texture textures/thorn/panel_02_bright
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_02_bright
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_02_dark
{
qer_editorimage textures/thorn/panel_02_dark
- texture textures/thorn/panel_02_dark
- specular 0.5 0.5 0.5
+ {
+ map textures/thorn/panel_02_dark
+ specular 0.5 0.5 0.5
+ }
}
textures/thorn/panel_01_primary
{
qer_editorimage textures/thorn/panel_01_primary
- texture textures/thorn/panel_01
- specular 0.5 0.5 0.5
- entity
+ {
+ map textures/thorn/panel_01
+ specular 0.5 0.5 0.5
+ entity
+ }
}
textures/thorn/panel_01_secondary
{
qer_editorimage textures/thorn/panel_01_secondary
- texture textures/thorn/panel_01
- specular 0.5 0.5 0.5
- entitysecond
+ {
+ map textures/thorn/panel_01
+ specular 0.5 0.5 0.5
+ entitysecond
+ }
}
textures/thorn/panel_02_primary
{
qer_editorimage textures/thorn/panel_02_primary
- texture textures/thorn/panel_02
- specular 0.5 0.5 0.5
- entity
+ {
+ map textures/thorn/panel_02
+ specular 0.5 0.5 0.5
+ entity
+ }
}
textures/thorn/panel_02_secondary
{
qer_editorimage textures/thorn/panel_02_secondary
- texture textures/thorn/panel_02
- specular 0.5 0.5 0.5
- entitysecond
+ {
+ map textures/thorn/panel_02
+ specular 0.5 0.5 0.5
+ entitysecond
+ }
}
diff --git a/base/materials/ui.shader b/base/materials/ui.shader
index c5c3f07..8bcccbe 100644
--- a/base/materials/ui.shader
+++ b/base/materials/ui.shader
@@ -1,23 +1,29 @@
ui/background
{
qer_editorimage textures/thorn/panel_01_dark
- texture textures/thorn/panel_01_dark
- bright
- color 0.1 0.1 0.1 1
+ {
+ map 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
+ {
+ map 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
+ {
+ map textures/thorn/panel_01
+ bright
+ color 0 0.2 0 1.0
+ }
}