Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2014-09-21 03:45:18 +0000
committerEvan Goers <mega@osirion.org>2014-09-21 03:45:18 +0000
commitf66320e70c046485a7bb4bdac9438c3357c47573 (patch)
treebac58bcccd38b8f07588e6c4322f4b7088440c4b /base/materials
parent76e3413a1ce7f4da8e0e7d3ae5ee4e0014ee8844 (diff)
Removed _shiny materials.
Updated materials to use the new shininess setting.
Diffstat (limited to 'base/materials')
-rw-r--r--base/materials/colors.shader120
-rw-r--r--base/materials/glass.shader85
-rw-r--r--base/materials/kuroto.shader46
-rw-r--r--base/materials/metals.shader27
-rw-r--r--base/materials/shaderlist.txt1
-rw-r--r--base/materials/thorn.shader18
6 files changed, 119 insertions, 178 deletions
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index 462a01f..f9989b3 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -40,16 +40,6 @@ textures/colors/red
}
}
-textures/colors/red_shiny
-{
- qer_editorimage textures/colors/red
- {
- color 1.00 0.00 0.00
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/red_bright
{
qer_editorimage textures/colors/red
@@ -67,16 +57,6 @@ textures/colors/orange
}
}
-textures/colors/orange_shiny
-{
- qer_editorimage textures/colors/orange
- {
- color 1.00 0.50 0.00
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/orange_bright
{
qer_editorimage textures/colors/orange
@@ -94,16 +74,6 @@ textures/colors/green
}
}
-textures/colors/green_shiny
-{
- qer_editorimage textures/colors/green
- {
- color 0.00 1.00 0.00
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/green_bright
{
qer_editorimage textures/colors/green
@@ -121,16 +91,6 @@ textures/colors/yellow
}
}
-textures/colors/yellow_shiny
-{
- qer_editorimage textures/colors/yellow
- {
- color 1.00 1.00 0.00
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/yellow_bright
{
qer_editorimage textures/colors/yellow
@@ -148,16 +108,6 @@ textures/colors/blue
}
}
-textures/colors/blue_shiny
-{
- qer_editorimage textures/colors/blue
- {
- color 0.00 0.00 1.00
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/blue_bright
{
qer_editorimage textures/colors/blue
@@ -175,16 +125,6 @@ textures/colors/purple
}
}
-textures/colors/purple_shiny
-{
- qer_editorimage textures/colors/purple
- {
- color 0.50 0.00 0.50
- map textures/fx/generic_env
- environment
- }
-}
-
textures/colors/purple_bright
{
qer_editorimage textures/colors/purple
@@ -199,18 +139,6 @@ textures/colors/grey25
qer_editorimage textures/colors/grey25
{
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
- map textures/fx/generic_env
- environment
}
}
@@ -228,18 +156,6 @@ textures/colors/grey50
qer_editorimage textures/colors/grey50
{
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
- map textures/fx/generic_env
- environment
}
}
@@ -257,18 +173,6 @@ textures/colors/grey75
qer_editorimage textures/colors/grey75
{
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
- map textures/fx/generic_env
- environment
}
}
@@ -286,18 +190,6 @@ textures/colors/grey90
qer_editorimage textures/colors/grey90
{
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
- map textures/fx/generic_env
- environment
}
}
@@ -308,14 +200,4 @@ textures/colors/grey90_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
- map textures/fx/generic_env
- environment
- }
-}
+} \ No newline at end of file
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
index 5e5336c..4229d0a 100644
--- a/base/materials/glass.shader
+++ b/base/materials/glass.shader
@@ -10,9 +10,10 @@ textures/glass/blue
{
qer_editorimage textures/glass/blue
{
- environment
color 0.00 0.00 1.00
specular 0.00 0.00 1.00
+ shininess 128
+ environment
}
}
@@ -20,9 +21,9 @@ textures/glass/blue_bright
{
qer_editorimage textures/glass/blue
{
- environment
bright
color 0.25 0.25 1.00
+ environment
}
}
@@ -30,9 +31,10 @@ textures/glass/red
{
qer_editorimage textures/glass/red
{
- environment
color 1.00 0.00 0.00
specular 1.00 0.00 0.00
+ shininess 128
+ environment
}
}
@@ -40,20 +42,20 @@ textures/glass/red_bright
{
qer_editorimage textures/glass/red
{
- environment
bright
color 1.00 0.25 0.25
+ environment
}
}
-
textures/glass/green
{
qer_editorimage textures/glass/green
{
- environment
color 0.00 1.00 0.00
specular 0.00 1.00 0.00
+ shininess 128
+ environment
}
}
@@ -61,9 +63,9 @@ textures/glass/green_bright
{
qer_editorimage textures/glass/green
{
- environment
bright
color 0.25 1.00 0.25
+ environment
}
}
@@ -71,9 +73,10 @@ textures/glass/yellow
{
qer_editorimage textures/glass/yellow
{
- environment
color 1.00 1.00 0.00
specular 1.00 1.00 0.00
+ shininess 128
+ environment
}
}
@@ -81,9 +84,9 @@ textures/glass/yellow_bright
{
qer_editorimage textures/glass/yellow
{
- environment
bright
color 1.00 1.00 0.25
+ environment
}
}
@@ -91,9 +94,10 @@ textures/glass/orange
{
qer_editorimage textures/glass/orange
{
- environment
color 1.00 0.50 0.00
specular 1.00 0.50 0.00
+ shininess 128
+ environment
}
}
@@ -101,9 +105,9 @@ textures/glass/orange_bright
{
qer_editorimage textures/glass/orange
{
- environment
bright
color 1.00 0.75 0.25
+ environment
}
}
@@ -111,9 +115,10 @@ textures/glass/brown
{
qer_editorimage textures/glass/brown
{
- environment
color 0.50 0.25 0.00
specular 1.00 1.00 1.00
+ shininess 128
+ environment
}
}
@@ -121,9 +126,9 @@ textures/glass/brown_bright
{
qer_editorimage textures/glass/brown
{
+ bright
color 0.75 0.50 0.25
environment
- bright
}
}
@@ -133,6 +138,7 @@ textures/glass/purple
{
color 1.00 0.00 1.00
specular 1.00 0.00 1.00
+ shininess 128
environment
}
}
@@ -141,9 +147,9 @@ textures/glass/purple_bright
{
qer_editorimage textures/glass/purple
{
+ bright
color 1.00 0.25 1.00
environment
- bright
}
}
@@ -153,6 +159,7 @@ textures/glass/dark
{
color 0.50 0.50 0.50
specular 1.00 1.00 1.00
+ shininess 128
environment
}
}
@@ -161,9 +168,9 @@ textures/glass/dark_bright
{
qer_editorimage textures/glass/dark
{
+ bright
color 0.75 0.75 0.75
environment
- bright
}
}
@@ -173,6 +180,7 @@ textures/glass/plain
{
color 1.00 1.00 1.00
specular 1.00 1.00 1.00
+ shininess 128
environment
}
@@ -193,9 +201,9 @@ textures/glass/plain_bright
{
qer_editorimage textures/glass/plain
{
+ bright
color 1.00 1.00 1.00
environment
- bright
}
}
@@ -203,9 +211,8 @@ textures/glass/entity
{
qer_editorimage textures/glass/entity
{
- color 1.00 1.00 1.00
- specular 1.00 1.00 1.00
entity
+ shininess 128
environment
}
}
@@ -214,8 +221,8 @@ textures/glass/entity_bright
{
qer_editorimage textures/glass/entity
{
- color 1.00 1.00 1.00
entity
+ shininess 128
environment
bright
}
@@ -225,9 +232,10 @@ textures/glass/entity_dark
{
qer_editorimage textures/glass/entity_dark
{
+ entity
color 0.50 0.50 0.50
specular 1.00 1.00 1.00
- entity
+ shininess 128
environment
}
}
@@ -236,10 +244,11 @@ textures/glass/entity_dark_bright
{
qer_editorimage textures/glass/entity_dark
{
- color 0.75 0.75 0.75
+ bright
entity
+ color 0.75 0.75 0.75
+ shininess 128
environment
- bright
}
}
@@ -247,9 +256,8 @@ 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
+ shininess 128
environment
}
}
@@ -258,10 +266,10 @@ textures/glass/entity_second_bright
{
qer_editorimage textures/glass/entity_second
{
- color 1.00 1.00 1.00
+ bright
entitySecond
+ shininess 128
environment
- bright
}
}
@@ -269,9 +277,9 @@ 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
+ color 0.50 0.50 0.50
+ shininess 128
environment
}
}
@@ -280,10 +288,11 @@ textures/glass/entity_second_dark_bright
{
qer_editorimage textures/glass/entity_second_dark
{
- color 0.75 0.75 0.75
+ bright
entitySecond
+ color 0.75 0.75 0.75
+ shininess 128
environment
- bright
}
}
@@ -291,9 +300,8 @@ 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
+ shininess 128
environment
}
}
@@ -302,10 +310,10 @@ textures/glass/entity_third_bright
{
qer_editorimage textures/glass/entity_third
{
- color 1.00 1.00 1.00
+ bright
entityThird
+ shininess 128
environment
- bright
}
}
@@ -313,9 +321,9 @@ 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
+ color 0.50 0.50 0.50
+ shininess 128
environment
}
}
@@ -324,9 +332,10 @@ textures/glass/entity_third_dark_bright
{
qer_editorimage textures/glass/entity_third_dark
{
- color 0.75 0.75 0.75
+ bright
entityThird
+ color 0.75 0.75 0.75
+ shininess 128
environment
- bright
}
}
diff --git a/base/materials/kuroto.shader b/base/materials/kuroto.shader
index 9ddf54c..2a59869 100644
--- a/base/materials/kuroto.shader
+++ b/base/materials/kuroto.shader
@@ -7,6 +7,7 @@ textures/kuroto/metal01
{
map textures/kuroto/metal01
blendfunc blend
+ shininess 8
}
}
@@ -19,6 +20,7 @@ textures/kuroto/metal_02a
{
map textures/kuroto/metal_02a
blendfunc blend
+ shininess 8
}
}
@@ -31,6 +33,7 @@ textures/kuroto/metal_02b
{
map textures/kuroto/metal_02b
blendfunc blend
+ shininess 8
}
}
@@ -43,6 +46,7 @@ textures/kuroto/metal_03a
{
map textures/kuroto/metal_03a
blendfunc blend
+ shininess 8
}
}
@@ -55,6 +59,7 @@ textures/kuroto/metal_03a_noborder
{
map textures/kuroto/metal_03a_noborder
blendfunc blend
+ shininess 8
}
}
@@ -67,6 +72,7 @@ textures/kuroto/metal_03b
{
map textures/kuroto/metal_03b
blendfunc blend
+ shininess 8
}
}
@@ -79,6 +85,7 @@ textures/kuroto/metal_03b_noborder
{
map textures/kuroto/metal_03b_noborder
blendfunc blend
+ shininess 8
}
}
@@ -91,6 +98,7 @@ textures/kuroto/metal_03c
{
map textures/kuroto/metal_03c
blendfunc blend
+ shininess 8
}
}
@@ -103,6 +111,7 @@ textures/kuroto/metal_03c_noborder
{
map textures/kuroto/metal_03c_noborder
blendfunc blend
+ shininess 8
}
}
@@ -115,6 +124,7 @@ textures/kuroto/metal_03d
{
map textures/kuroto/metal_03d
blendfunc blend
+ shininess 8
}
}
@@ -127,6 +137,7 @@ textures/kuroto/metal_03d_noborder
{
map textures/kuroto/metal_03d_noborder
blendfunc blend
+ shininess 8
}
}
@@ -139,6 +150,7 @@ textures/kuroto/metal_04
{
map textures/kuroto/metal_04
blendfunc blend
+ shininess 8
}
}
@@ -151,6 +163,7 @@ textures/kuroto/metal_05
{
map textures/kuroto/metal_05
blendfunc blend
+ shininess 8
}
}
@@ -163,6 +176,7 @@ textures/kuroto/wall_01
{
map textures/kuroto/wall_01
blendfunc blend
+ shininess 8
}
}
@@ -172,12 +186,12 @@ textures/kuroto/metal_03a_primary
qer_editorimage textures/kuroto/metal_03a_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03a
entity
blendfunc blend
+ shininess 8
}
}
@@ -186,12 +200,12 @@ textures/kuroto/metal_03a_secondary
qer_editorimage textures/kuroto/metal_03a_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03a
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -200,12 +214,12 @@ textures/kuroto/metal_03a_noborder_primary
qer_editorimage textures/kuroto/metal_03a_noborder_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03a_noborder
entity
blendfunc blend
+ shininess 8
}
}
@@ -214,12 +228,12 @@ textures/kuroto/metal_03a_noborder_secondary
qer_editorimage textures/kuroto/metal_03a_noborder_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03a_noborder
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -228,12 +242,12 @@ textures/kuroto/metal_03b_primary
qer_editorimage textures/kuroto/metal_03b_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03b
entity
blendfunc blend
+ shininess 8
}
}
@@ -242,12 +256,12 @@ textures/kuroto/metal_03b_secondary
qer_editorimage textures/kuroto/metal_03b_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03b
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -256,12 +270,12 @@ textures/kuroto/metal_03b_noborder_primary
qer_editorimage textures/kuroto/metal_03b_noborder_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03b_noborder
entity
blendfunc blend
+ shininess 8
}
}
@@ -270,12 +284,12 @@ textures/kuroto/metal_03b_noborder_secondary
qer_editorimage textures/kuroto/metal_03b_noborder_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03b_noborder
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -284,12 +298,12 @@ textures/kuroto/metal_03c_primary
qer_editorimage textures/kuroto/metal_03c_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03c
entity
blendfunc blend
+ shininess 8
}
}
@@ -298,12 +312,12 @@ textures/kuroto/metal_03c_secondary
qer_editorimage textures/kuroto/metal_03c_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03c
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -312,12 +326,12 @@ textures/kuroto/metal_03c_noborder_primary
qer_editorimage textures/kuroto/metal_03c_noborder_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03c_noborder
entity
blendfunc blend
+ shininess 8
}
}
@@ -326,12 +340,12 @@ textures/kuroto/metal_03c_noborder_secondary
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03c_noborder
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -340,12 +354,12 @@ textures/kuroto/metal_04_primary
qer_editorimage textures/kuroto/metal_03c_noborder_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03c_noborder
entity
blendfunc blend
+ shininess 8
}
}
@@ -354,12 +368,12 @@ textures/kuroto/metal_04_secondary
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03c_noborder
entitysecond
blendfunc blend
+ shininess 8
}
}
@@ -368,12 +382,12 @@ textures/kuroto/metal_05_primary
qer_editorimage textures/kuroto/metal_03c_noborder_primary
{
environment
- entity
}
{
map textures/kuroto/metal_03c_noborder
entity
blendfunc blend
+ shininess 8
}
}
@@ -382,11 +396,11 @@ textures/kuroto/metal_05_secondary
qer_editorimage textures/kuroto/metal_03c_noborder_secondary
{
environment
- entitysecond
}
{
map textures/kuroto/metal_03c_noborder
entitysecond
blendfunc blend
+ shininess 8
}
}
diff --git a/base/materials/metals.shader b/base/materials/metals.shader
new file mode 100644
index 0000000..55df09c
--- /dev/null
+++ b/base/materials/metals.shader
@@ -0,0 +1,27 @@
+textures/metals/chrome
+{
+ qer_editorimage textures/fx/generic_env
+ {
+ map textures/fx/generic_env
+ environment
+ }
+ {
+ environment
+ blendfunc add
+ }
+}
+
+textures/metals/steel
+{
+ qer_editorimage textures/metals/steel
+ {
+ color 0.80 0.82 0.85
+ shininess 128
+ }
+ {
+ color 0.50 0.50 0.50
+ shininess 128
+ environment
+ blendfunc add
+ }
+} \ No newline at end of file
diff --git a/base/materials/shaderlist.txt b/base/materials/shaderlist.txt
index d712ac7..c279e1f 100644
--- a/base/materials/shaderlist.txt
+++ b/base/materials/shaderlist.txt
@@ -6,6 +6,7 @@ detail
glass
kuroto
asteroids
+metals
thorn
trak
tsukhan
diff --git a/base/materials/thorn.shader b/base/materials/thorn.shader
index e482a7c..4f6b4ac 100644
--- a/base/materials/thorn.shader
+++ b/base/materials/thorn.shader
@@ -7,6 +7,7 @@ textures/thorn/metal_diamond
{
map textures/thorn/metal_diamond
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -20,6 +21,7 @@ textures/thorn/metal_trimond
{
map textures/thorn/metal_trimond
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -33,6 +35,7 @@ textures/thorn/panel_01
{
map textures/thorn/panel_01
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -46,6 +49,7 @@ textures/thorn/panel_01_bright
{
map textures/thorn/panel_01_bright
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -59,6 +63,7 @@ textures/thorn/panel_01_dark
{
map textures/thorn/panel_01_dark
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -72,6 +77,7 @@ textures/thorn/panel_02
{
map textures/thorn/panel_02
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -85,6 +91,7 @@ textures/thorn/panel_02_bright
{
map textures/thorn/panel_02_bright
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -98,6 +105,7 @@ textures/thorn/panel_02_dark
{
map textures/thorn/panel_02_dark
specular 0.5 0.5 0.5
+ shininess 64
blendfunc blend
}
}
@@ -107,11 +115,11 @@ textures/thorn/panel_01_primary
qer_editorimage textures/thorn/panel_01_primary
{
environment
- entity
}
{
map textures/thorn/panel_01
specular 0.5 0.5 0.5
+ shininess 64
entity
blendfunc blend
}
@@ -122,11 +130,11 @@ textures/thorn/panel_01_secondary
qer_editorimage textures/thorn/panel_01_secondary
{
environment
- entitysecond
}
{
map textures/thorn/panel_01
specular 0.5 0.5 0.5
+ shininess 64
entitysecond
blendfunc blend
}
@@ -137,11 +145,11 @@ textures/thorn/panel_02_primary
qer_editorimage textures/thorn/panel_02_primary
{
environment
- entity
}
{
map textures/thorn/panel_02
specular 0.5 0.5 0.5
+ shininess 64
entity
blendfunc blend
}
@@ -152,12 +160,12 @@ textures/thorn/panel_02_secondary
qer_editorimage textures/thorn/panel_02_secondary
{
environment
- entitysecond
}
{
map textures/thorn/panel_02
specular 0.5 0.5 0.5
+ shininess 64
entitysecond
blendfunc blend
}
-}
+} \ No newline at end of file