Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2015-02-01 21:29:48 +0000
committerStijn Buys <ingar@osirion.org>2015-02-01 21:29:48 +0000
commitb1d113961bfbbfcd05d40b130c773fdb91a2c9d9 (patch)
tree085b6ec51b50263f5e4ebf50d992b904929d2839 /base
parentf1d92bf3d471914b9cc39f1dac454a03634e4b07 (diff)
Corrected a number of broken materials.
Diffstat (limited to 'base')
-rw-r--r--base/materials/common.shader44
-rw-r--r--base/materials/glass.shader56
2 files changed, 50 insertions, 50 deletions
diff --git a/base/materials/common.shader b/base/materials/common.shader
index b88da99..79ee1a1 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -56,7 +56,7 @@ textures/common/entity
qer_editorimage textures/common/entity
{
color 1.00 1.00 1.00
- entity
+ rgbgen entity
}
}
@@ -65,7 +65,7 @@ textures/common/entity_shiny
qer_editorimage textures/common/entity
{
color 1.00 1.00 1.00
- entity
+ rgbgen entity
map textures/fx/generic_env
environment
}
@@ -75,8 +75,8 @@ textures/common/entity_bright
{
qer_editorimage textures/common/entity
{
- entity
color 1.00 1.00 1.00
+ rgbgen entity
bright
}
}
@@ -85,17 +85,17 @@ textures/common/entity_dark
{
qer_editorimage textures/common/entity_dark
{
- entity
color 0.50 0.50 0.50
+ rgbgen entity
}
}
textures/common/entity_dark_shiny
{
qer_editorimage textures/common/entity_dark
- {
- entity
+ {
color 0.50 0.50 0.50
+ rgbgen entity
map textures/fx/generic_env
environment
}
@@ -104,9 +104,9 @@ textures/common/entity_dark_shiny
textures/common/entity_dark_bright
{
qer_editorimage textures/common/entity_dark
- {
- entity
+ {
color 0.50 0.50 0.50
+ rgbgen entity
bright
}
}
@@ -114,18 +114,18 @@ textures/common/entity_dark_bright
textures/common/entity_second
{
qer_editorimage textures/common/entity_second
- {
- entitySecond
+ {
color 1.00 1.00 1.00
+ rgbgen entitysecond
}
}
textures/common/entity_second_shiny
{
qer_editorimage textures/common/entity_second
- {
- entitySecond
+ {
color 1.00 1.00 1.00
+ rgbgen entitysecond
map textures/fx/generic_env
environment
}
@@ -135,8 +135,8 @@ textures/common/entity_second_bright
{
qer_editorimage textures/common/entity_second
{
- entitySecond
color 1.00 1.00 1.00
+ rgbgen entitysecond
bright
}
}
@@ -145,8 +145,8 @@ textures/common/entity_second_dark
{
qer_editorimage textures/common/entity_second_dark
{
- entitySecond
color 0.50 0.50 0.50
+ rgbgen entitysecond
}
}
@@ -154,8 +154,8 @@ textures/common/entity_second_dark_shiny
{
qer_editorimage textures/common/entity_second_dark
{
- entitySecond
color 0.50 0.50 0.50
+ rgbgen entitysecond
map textures/fx/generic_env
environment
}
@@ -165,8 +165,8 @@ textures/common/entity_second_dark_bright
{
qer_editorimage textures/common/entity_second_dark
{
- entitySecond
color 0.50 0.50 0.50
+ rgbgen entitysecond
bright
}
}
@@ -176,8 +176,8 @@ textures/common/entity_third
{
qer_editorimage textures/common/entity_third
{
- entityThird
color 1.00 1.00 1.00
+ rgbgen entitythird
}
}
@@ -185,8 +185,8 @@ textures/common/entity_third_shiny
{
qer_editorimage textures/common/entity_third
{
- entityThird
color 1.00 1.00 1.00
+ rgbgen entitythird
map textures/fx/generic_env
environment
}
@@ -196,8 +196,8 @@ textures/common/entity_third_bright
{
qer_editorimage textures/common/entity_third
{
- entityThird
color 1.00 1.00 1.00
+ rgbgen entitythird
bright
}
}
@@ -206,8 +206,8 @@ textures/common/entity_third_dark
{
qer_editorimage textures/common/entity_third_dark
{
- entityThird
color 0.50 0.50 0.50
+ rgbgen entitythird
}
}
@@ -215,8 +215,8 @@ textures/common/entity_third_dark_shiny
{
qer_editorimage textures/common/entity_third_dark
{
- entityThird
color 0.50 0.50 0.50
+ rgbgen entitythird
map textures/fx/generic_env
environment
}
@@ -226,8 +226,8 @@ textures/common/entity_third_dark_bright
{
qer_editorimage textures/common/entity_third_dark
{
- entityThird
color 0.50 0.50 0.50
+ rgbgen entitythird
bright
}
}
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
index b2585d5..4f847b7 100644
--- a/base/materials/glass.shader
+++ b/base/materials/glass.shader
@@ -21,9 +21,9 @@ textures/glass/blue_bright
{
qer_editorimage textures/glass/blue
{
- bright
color 0.25 0.25 1.00
environment
+ bright
}
}
@@ -42,9 +42,9 @@ textures/glass/red_bright
{
qer_editorimage textures/glass/red
{
- bright
color 1.00 0.25 0.25
environment
+ bright
}
}
@@ -63,9 +63,9 @@ textures/glass/green_bright
{
qer_editorimage textures/glass/green
{
- bright
color 0.25 1.00 0.25
environment
+ bright
}
}
@@ -105,9 +105,9 @@ textures/glass/orange_bright
{
qer_editorimage textures/glass/orange
{
- bright
color 1.00 0.75 0.25
environment
+ bright
}
}
@@ -126,9 +126,9 @@ textures/glass/brown_bright
{
qer_editorimage textures/glass/brown
{
- bright
color 0.75 0.50 0.25
environment
+ bright
}
}
@@ -146,10 +146,10 @@ textures/glass/purple
textures/glass/purple_bright
{
qer_editorimage textures/glass/purple
- {
- bright
+ {
color 1.00 0.25 1.00
environment
+ bright
}
}
@@ -168,9 +168,9 @@ textures/glass/dark_bright
{
qer_editorimage textures/glass/dark
{
- bright
color 0.75 0.75 0.75
environment
+ bright
}
}
@@ -200,10 +200,10 @@ textures/glass/plain
textures/glass/plain_bright
{
qer_editorimage textures/glass/plain
- {
- bright
+ {
color 1.00 1.00 1.00
environment
+ bright
}
}
@@ -231,11 +231,11 @@ textures/glass/entity_bright
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
shininess 256
+ entity
environment
}
}
@@ -244,20 +244,20 @@ textures/glass/entity_dark_bright
{
qer_editorimage textures/glass/entity_dark
{
- bright
- entity
- color 0.75 0.75 0.75
+ bright entity color 0.75 0.75 0.75
shininess 256
+ entity
environment
+ bright
}
}
textures/glass/entity_second
{
qer_editorimage textures/glass/entity_second
- {
- entitySecond
+ {
shininess 256
+ entitySecond
environment
}
}
@@ -266,20 +266,20 @@ textures/glass/entity_second_bright
{
qer_editorimage textures/glass/entity_second
{
- bright
- entitySecond
shininess 256
+ entitySecond
environment
+ bright
}
}
textures/glass/entity_second_dark
{
qer_editorimage textures/glass/entity_second_dark
- {
- entitySecond
+ {
color 0.50 0.50 0.50
shininess 256
+ entitySecond
environment
}
}
@@ -288,11 +288,11 @@ textures/glass/entity_second_dark_bright
{
qer_editorimage textures/glass/entity_second_dark
{
- bright
- entitySecond
color 0.75 0.75 0.75
shininess 256
+ entitySecond
environment
+ bright
}
}
@@ -300,8 +300,8 @@ textures/glass/entity_third
{
qer_editorimage textures/glass/entity_third
{
- entityThird
shininess 256
+ entityThird
environment
}
}
@@ -310,10 +310,10 @@ textures/glass/entity_third_bright
{
qer_editorimage textures/glass/entity_third
{
- bright
entityThird
shininess 256
environment
+ bright
}
}
@@ -321,9 +321,9 @@ textures/glass/entity_third_dark
{
qer_editorimage textures/glass/entity_third_dark
{
- entityThird
color 0.50 0.50 0.50
shininess 256
+ entityThird
environment
}
}
@@ -332,10 +332,10 @@ textures/glass/entity_third_dark_bright
{
qer_editorimage textures/glass/entity_third_dark
{
- bright
- entityThird
color 0.75 0.75 0.75
shininess 256
+ entityThird
environment
+ bright
}
}