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 21:28:21 +0000
committerStijn Buys <ingar@osirion.org>2014-07-09 21:28:21 +0000
commit340d4ec5c7a97457079078e05290e765b5e0e0f8 (patch)
tree39762edf3d02fe2c1026054978b925e6867b8e80
parentaa7d54f04dc3eefed2cbf050199d641f035ecf47 (diff)
Updated remaining shaders to the new shader file format, by Thorn
-rw-r--r--base/materials/glass.shader264
-rw-r--r--base/materials/hull_objects.shader16
-rw-r--r--base/materials/kuroto.shader96
-rw-r--r--base/materials/trak.shader60
-rw-r--r--base/materials/tsukhan.shader88
5 files changed, 333 insertions, 191 deletions
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
index d387684..5e5336c 100644
--- a/base/materials/glass.shader
+++ b/base/materials/glass.shader
@@ -9,138 +9,172 @@
textures/glass/blue
{
qer_editorimage textures/glass/blue
- color 0.00 0.00 1.00
- specular 0.00 0.00 1.00
- environment
+ {
+ environment
+ color 0.00 0.00 1.00
+ specular 0.00 0.00 1.00
+ }
}
textures/glass/blue_bright
{
qer_editorimage textures/glass/blue
- color 0.25 0.25 1.00
- environment
- bright
+ {
+ environment
+ bright
+ color 0.25 0.25 1.00
+ }
}
textures/glass/red
{
qer_editorimage textures/glass/red
- color 1.00 0.00 0.00
- specular 1.00 0.00 0.00
- environment
+ {
+ environment
+ color 1.00 0.00 0.00
+ specular 1.00 0.00 0.00
+ }
}
textures/glass/red_bright
{
qer_editorimage textures/glass/red
- color 1.00 0.25 0.25
- environment
- bright
+ {
+ environment
+ bright
+ color 1.00 0.25 0.25
+ }
}
textures/glass/green
{
qer_editorimage textures/glass/green
- color 0.00 1.00 0.00
- specular 0.00 1.00 0.00
- environment
+ {
+ environment
+ color 0.00 1.00 0.00
+ specular 0.00 1.00 0.00
+ }
}
textures/glass/green_bright
{
qer_editorimage textures/glass/green
- color 0.25 1.00 0.25
- environment
- bright
+ {
+ environment
+ bright
+ color 0.25 1.00 0.25
+ }
}
textures/glass/yellow
{
qer_editorimage textures/glass/yellow
- color 1.00 1.00 0.00
- specular 1.00 1.00 0.00
- environment
+ {
+ environment
+ color 1.00 1.00 0.00
+ specular 1.00 1.00 0.00
+ }
}
textures/glass/yellow_bright
{
qer_editorimage textures/glass/yellow
- color 1.00 1.00 0.25
- environment
- bright
+ {
+ environment
+ bright
+ color 1.00 1.00 0.25
+ }
}
textures/glass/orange
{
qer_editorimage textures/glass/orange
- color 1.00 0.50 0.00
- specular 1.00 0.50 0.00
- environment
+ {
+ environment
+ color 1.00 0.50 0.00
+ specular 1.00 0.50 0.00
+ }
}
textures/glass/orange_bright
{
qer_editorimage textures/glass/orange
- color 1.00 0.75 0.25
- environment
- bright
+ {
+ environment
+ bright
+ color 1.00 0.75 0.25
+ }
}
textures/glass/brown
{
qer_editorimage textures/glass/brown
- color 0.50 0.25 0.00
- specular 1.00 1.00 1.00
- environment
+ {
+ environment
+ color 0.50 0.25 0.00
+ specular 1.00 1.00 1.00
+ }
}
textures/glass/brown_bright
{
qer_editorimage textures/glass/brown
- color 0.75 0.50 0.25
- environment
- bright
+ {
+ color 0.75 0.50 0.25
+ environment
+ bright
+ }
}
textures/glass/purple
{
qer_editorimage textures/glass/purple
- color 1.00 0.00 1.00
- specular 1.00 0.00 1.00
- environment
+ {
+ color 1.00 0.00 1.00
+ specular 1.00 0.00 1.00
+ environment
+ }
}
textures/glass/purple_bright
{
qer_editorimage textures/glass/purple
- color 1.00 0.25 1.00
- environment
- bright
+ {
+ color 1.00 0.25 1.00
+ environment
+ bright
+ }
}
textures/glass/dark
{
qer_editorimage textures/glass/dark
- color 0.50 0.50 0.50
- specular 1.00 1.00 1.00
- environment
+ {
+ color 0.50 0.50 0.50
+ specular 1.00 1.00 1.00
+ environment
+ }
}
textures/glass/dark_bright
{
qer_editorimage textures/glass/dark
- color 0.75 0.75 0.75
- environment
- bright
+ {
+ color 0.75 0.75 0.75
+ environment
+ bright
+ }
}
textures/glass/plain
{
qer_editorimage textures/glass/plain
- color 1.00 1.00 1.00
- specular 1.00 1.00 1.00
- environment
+ {
+ color 1.00 1.00 1.00
+ specular 1.00 1.00 1.00
+ environment
+ }
// this is a proposed material, assuming a multitexture implementation
// will be much like the quake 3 shader system.
@@ -158,115 +192,141 @@ textures/glass/plain
textures/glass/plain_bright
{
qer_editorimage textures/glass/plain
- color 1.00 1.00 1.00
- environment
- bright
+ {
+ color 1.00 1.00 1.00
+ environment
+ bright
+ }
}
textures/glass/entity
{
qer_editorimage textures/glass/entity
- color 1.00 1.00 1.00
- specular 1.00 1.00 1.00
- entity
- environment
+ {
+ color 1.00 1.00 1.00
+ specular 1.00 1.00 1.00
+ entity
+ environment
+ }
}
textures/glass/entity_bright
{
qer_editorimage textures/glass/entity
- color 1.00 1.00 1.00
- entity
- environment
- bright
+ {
+ color 1.00 1.00 1.00
+ entity
+ environment
+ bright
+ }
}
textures/glass/entity_dark
{
qer_editorimage textures/glass/entity_dark
- color 0.50 0.50 0.50
- specular 1.00 1.00 1.00
- entity
- environment
+ {
+ color 0.50 0.50 0.50
+ specular 1.00 1.00 1.00
+ entity
+ environment
+ }
}
textures/glass/entity_dark_bright
{
qer_editorimage textures/glass/entity_dark
- color 0.75 0.75 0.75
- entity
- environment
- bright
+ {
+ color 0.75 0.75 0.75
+ entity
+ environment
+ bright
+ }
}
textures/glass/entity_second
{
qer_editorimage textures/glass/entity_second
- color 1.00 1.00 1.00
- specular 1.00 1.00 1.00
- entitySecond
- environment
+ {
+ color 1.00 1.00 1.00
+ specular 1.00 1.00 1.00
+ entitySecond
+ environment
+ }
}
textures/glass/entity_second_bright
{
qer_editorimage textures/glass/entity_second
- color 1.00 1.00 1.00
- entitySecond
- environment
- bright
+ {
+ color 1.00 1.00 1.00
+ entitySecond
+ environment
+ bright
+ }
}
textures/glass/entity_second_dark
{
qer_editorimage textures/glass/entity_second_dark
- color 0.50 0.50 0.50
- specular 1.00 1.00 1.00
- entitySecond
- environment
+ {
+ color 0.50 0.50 0.50
+ specular 1.00 1.00 1.00
+ entitySecond
+ environment
+ }
}
textures/glass/entity_second_dark_bright
{
qer_editorimage textures/glass/entity_second_dark
- color 0.75 0.75 0.75
- entitySecond
- environment
- bright
+ {
+ color 0.75 0.75 0.75
+ entitySecond
+ environment
+ bright
+ }
}
textures/glass/entity_third
{
qer_editorimage textures/glass/entity_third
- color 1.00 1.00 1.00
- specular 1.00 1.00 1.00
- entityThird
- environment
+ {
+ color 1.00 1.00 1.00
+ specular 1.00 1.00 1.00
+ entityThird
+ environment
+ }
}
textures/glass/entity_third_bright
{
qer_editorimage textures/glass/entity_third
- color 1.00 1.00 1.00
- entityThird
- environment
- bright
+ {
+ color 1.00 1.00 1.00
+ entityThird
+ environment
+ bright
+ }
}
textures/glass/entity_third_dark
{
qer_editorimage textures/glass/entity_third_dark
- color 0.50 0.50 0.50
- specular 1.00 1.00 1.00
- entityThird
- environment
+ {
+ color 0.50 0.50 0.50
+ specular 1.00 1.00 1.00
+ entityThird
+ environment
+ }
}
textures/glass/entity_third_dark_bright
{
qer_editorimage textures/glass/entity_third_dark
- color 0.75 0.75 0.75
- entityThird
- environment
- bright
+ {
+ color 0.75 0.75 0.75
+ entityThird
+ environment
+ bright
+ }
}
diff --git a/base/materials/hull_objects.shader b/base/materials/hull_objects.shader
index 7879dd6..e27c184 100644
--- a/base/materials/hull_objects.shader
+++ b/base/materials/hull_objects.shader
@@ -1,23 +1,31 @@
models/hull_objects/missilepod/missilepod
{
qer_editorimage models/hull_objects/missilepod/missilepod
- texture models/hull_objects/missilepod/missilepod
+ {
+ map models/hull_objects/missilepod/missilepod
+ }
}
models/hull_objects/cylinder/cylinder
{
qer_editorimage models/hull_objects/cylinder/cylinder
- texture models/hull_objects/cylinder/cylinder
+ {
+ map models/hull_objects/cylinder/cylinder
+ }
}
models/hull_objects/panel_01/panel_01
{
qer_editorimage models/hull_objects/panel_01/panel_01
- texture models/hull_objects/panel_01/panel_01
+ {
+ map models/hull_objects/panel_01/panel_01
+ }
}
models/hull_objects/panel_02/panel_02
{
qer_editorimage models/hull_objects/panel_02/panel_02
- texture models/hull_objects/panel_02/panel_02
+ {
+ map models/hull_objects/panel_02/panel_02
+ }
} \ No newline at end of file
diff --git a/base/materials/kuroto.shader b/base/materials/kuroto.shader
index cb93d56..9d89efe 100644
--- a/base/materials/kuroto.shader
+++ b/base/materials/kuroto.shader
@@ -1,111 +1,143 @@
textures/kuroto/metal_03a_primary
{
qer_editorimage textures/kuroto/metal_03a_primary
- texture textures/kuroto/metal_03a
- entity
+ {
+ map textures/kuroto/metal_03a
+ entity
+ }
}
textures/kuroto/metal_03a_secondary
{
qer_editorimage textures/kuroto/metal_03a_secondary
- texture textures/kuroto/metal_03a
- entitysecond
+ {
+ map textures/kuroto/metal_03a
+ entitysecond
+ }
}
textures/kuroto/metal_03a_noborder_primary
{
qer_editorimage textures/kuroto/metal_03a_noborder_primary
- texture textures/kuroto/metal_03a_noborder
- entity
+ {
+ map textures/kuroto/metal_03a_noborder
+ entity
+ }
}
textures/kuroto/metal_03a_noborder_secondary
{
qer_editorimage textures/kuroto/metal_03a_noborder_secondary
- texture textures/kuroto/metal_03a_noborder
- entitysecond
+ {
+ map textures/kuroto/metal_03a_noborder
+ entitysecond
+ }
}
textures/kuroto/metal_03b_primary
{
qer_editorimage textures/kuroto/metal_03b_primary
- texture textures/kuroto/metal_03b
- entity
+ {
+ map textures/kuroto/metal_03b
+ entity
+ }
}
textures/kuroto/metal_03b_secondary
{
qer_editorimage textures/kuroto/metal_03b_secondary
- texture textures/kuroto/metal_03b
- entitysecond
+ {
+ map textures/kuroto/metal_03b
+ entitysecond
+ }
}
textures/kuroto/metal_03b_noborder_primary
{
qer_editorimage textures/kuroto/metal_03b_noborder_primary
- texture textures/kuroto/metal_03b_noborder
- entity
+ {
+ map textures/kuroto/metal_03b_noborder
+ entity
+ }
}
textures/kuroto/metal_03b_noborder_secondary
{
qer_editorimage textures/kuroto/metal_03b_noborder_secondary
- texture textures/kuroto/metal_03b_noborder
- entitysecond
+ {
+ map textures/kuroto/metal_03b_noborder
+ entitysecond
+ }
}
textures/kuroto/metal_03c_primary
{
qer_editorimage textures/kuroto/metal_03c_primary
- texture textures/kuroto/metal_03c
- entity
+ {
+ map textures/kuroto/metal_03c
+ entity
+ }
}
textures/kuroto/metal_03c_secondary
{
qer_editorimage textures/kuroto/metal_03c_secondary
- texture textures/kuroto/metal_03c
- entitysecond
+ {
+ map textures/kuroto/metal_03c
+ entitysecond
+ }
}
textures/kuroto/metal_03c_noborder_primary
{
qer_editorimage textures/kuroto/metal_03c_noborder_primary
- texture textures/kuroto/metal_03c_noborder
- entity
+ {
+ map textures/kuroto/metal_03c_noborder
+ entity
+ }
}
textures/kuroto/metal_03c_noborder_secondary
{
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
- texture textures/kuroto/metal_03c_noborder
- entitysecond
+ {
+ map textures/kuroto/metal_03c_noborder
+ entitysecond
+ }
}
textures/kuroto/metal_04_primary
{
qer_editorimage textures/kuroto/metal_03c_noborder_primary
- texture textures/kuroto/metal_03c_noborder
- entity
+ {
+ map textures/kuroto/metal_03c_noborder
+ entity
+ }
}
textures/kuroto/metal_04_secondary
{
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
- texture textures/kuroto/metal_03c_noborder
- entitysecond
+ {
+ map textures/kuroto/metal_03c_noborder
+ entitysecond
+ }
}
textures/kuroto/metal_05_primary
{
qer_editorimage textures/kuroto/metal_03c_noborder_primary
- texture textures/kuroto/metal_03c_noborder
- entity
+ {
+ map textures/kuroto/metal_03c_noborder
+ entity
+ }
}
textures/kuroto/metal_05_secondary
{
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
- texture textures/kuroto/metal_03c_noborder
- entitysecond
+ {
+ map textures/kuroto/metal_03c_noborder
+ entitysecond
+ }
}
diff --git a/base/materials/trak.shader b/base/materials/trak.shader
index 5f97505..b89dc62 100644
--- a/base/materials/trak.shader
+++ b/base/materials/trak.shader
@@ -1,69 +1,89 @@
textures/trak/trak5-base1a
{
qer_editorimage textures/trak/trak5-base1a
- texture textures/trak/trak5-base1a
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-base1a
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-block1
{
qer_editorimage textures/trak/trak5-block1
- texture textures/trak/trak5-block1
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-block1
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-trim3a
{
qer_editorimage textures/trak/trak5-trim3a
- texture textures/trak/trak5-trim3a
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-trim3a
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-trim3e
{
qer_editorimage textures/trak/trak5-trim3e
- texture textures/trak/trak5-trim3e
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-trim3e
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-trim4a
{
qer_editorimage textures/trak/trak5-trim4a
- texture textures/trak/trak5-trim4a
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-trim4a
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-trim6a
{
qer_editorimage textures/trak/trak5-trim6a
- texture textures/trak/trak5-trim6a
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-trim6a
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-trim6e
{
qer_editorimage textures/trak/trak5-trim6e
- texture textures/trak/trak5-trim6e
- specular 0.25 0.25 0.25
+ {
+ map textures/trak/trak5-trim6e
+ specular 0.25 0.25 0.25
+ }
}
textures/trak/trak5-base1a_primary
{
qer_editorimage textures/trak/trak5-base1a
- texture textures/trak/trak5-base1a
- entity
+ {
+ map textures/trak/trak5-base1a
+ entity
+ }
}
textures/trak/trak5-block1_primary
{
qer_editorimage textures/trak/trak5-block1
- texture textures/trak/trak5-block1
- entity
+ {
+ map textures/trak/trak5-block1
+ entity
+ }
}
textures/trak/trak5-trim3e_primary
{
qer_editorimage textures/trak/trak5-trim3e
- texture textures/trak/trak5-trim3e
- entity
+ {
+ map textures/trak/trak5-trim3e
+ entity
+ }
}
diff --git a/base/materials/tsukhan.shader b/base/materials/tsukhan.shader
index dddd35e..73039ad 100644
--- a/base/materials/tsukhan.shader
+++ b/base/materials/tsukhan.shader
@@ -1,87 +1,109 @@
textures/tsukhan/engine
{
qer_editorimage textures/tsukhan/engine
- texture textures/tsukhan/engine
- engine
- bright
+ {
+ map textures/tsukhan/engine
+ engine
+ bright
+ }
}
textures/tsukhan/tsukhan_entity
{
qer_editorimage textures/tsukhan/tsukhan_entity
- entity
- color 1.00 1.00 1.00
- texture textures/tsukhan/tsukhan_white
- environment
+ {
+ entity
+ color 1.00 1.00 1.00
+ map textures/tsukhan/tsukhan_white
+ environment
+ }
}
textures/tsukhan/tsukhan_entity_dark
{
qer_editorimage textures/tsukhan/tsukhan_entity_dark
- entity
- color 0.50 0.50 0.50
- texture textures/tsukhan/tsukhan_white
- environment
+ {
+ entity
+ color 0.50 0.50 0.50
+ map textures/tsukhan/tsukhan_white
+ environment
+ }
}
textures/tsukhan/tsukhan_entitysecond
{
qer_editorimage textures/tsukhan/tsukhan_entitysecond
- entitySecond
- color 1.00 1.00 1.00
- texture textures/tsukhan/tsukhan_white
- environment
+ {
+ entitySecond
+ color 1.00 1.00 1.00
+ map textures/tsukhan/tsukhan_white
+ environment
+ }
}
textures/tsukhan/tsukhan_entitysecond_dark
{
qer_editorimage textures/tsukhan/tsukhan_entitysecond_dark
- entitySecond
- color 0.50 0.50 0.50
- texture textures/tsukhan/tsukhan_white
- environment
+ {
+ entitySecond
+ color 0.50 0.50 0.50
+ map textures/tsukhan/tsukhan_white
+ environment
+ }
}
textures/tsukhan/tsukhan_glow_fx
{
qer_editorimage textures/tsukhan/tsukhan_glow_fx
- entityThird
- texture textures/tsukhan/tsukhan_glow
- environment
- bright
+ {
+ entityThird
+ map textures/tsukhan/tsukhan_glow
+ environment
+ bright
+ }
}
textures/tsukhan/tsukhan_grey25
{
qer_editorimage textures/tsukhan/tsukhan_grey25
- texture textures/tsukhan/tsukhan_grey25
- environment
+ {
+ map textures/tsukhan/tsukhan_grey25
+ environment
+ }
}
textures/tsukhan/tsukhan_grey50
{
qer_editorimage textures/tsukhan/tsukhan_grey50
- texture textures/tsukhan/tsukhan_grey50
- environment
+ {
+ map textures/tsukhan/tsukhan_grey50
+ environment
+ }
}
textures/tsukhan/tsukhan_grey75
{
qer_editorimage textures/tsukhan/tsukhan_grey75
- texture textures/tsukhan/tsukhan_grey75
- environment
+ {
+ map textures/tsukhan/tsukhan_grey75
+ environment
+ }
}
textures/tsukhan/tsukhan_grey90
{
qer_editorimage textures/tsukhan/tsukhan_grey90
- texture textures/tsukhan/tsukhan_grey90
- environment
+ {
+ map textures/tsukhan/tsukhan_grey90
+ environment
+ }
}
textures/tsukhan/tsukhan_white
{
qer_editorimage textures/tsukhan/tsukhan_white
- texture textures/tsukhan/tsukhan_white
- environment
+ {
+ map textures/tsukhan/tsukhan_white
+ environment
+ }
}