diff options
author | Evan Goers <mega@osirion.org> | 2009-08-18 10:34:24 +0000 |
---|---|---|
committer | Evan Goers <mega@osirion.org> | 2009-08-18 10:34:24 +0000 |
commit | 6e8464954818f7f4970b8ca52b5fca03e766243f (patch) | |
tree | 1324399db766cc79fb0dcbb9f555d0982fc33ea3 | |
parent | 959338dd8c77f42605beec04bada8cf8e993a17f (diff) |
Disabled envmaps on all remaining shaders and added _shiny shaders for explicit envmapped-versions.
-rw-r--r-- | base/materials/colors.shader | 60 | ||||
-rw-r--r-- | base/materials/common.shader | 56 |
2 files changed, 115 insertions, 1 deletions
diff --git a/base/materials/colors.shader b/base/materials/colors.shader index 93bc1c1..706f2f0 100644 --- a/base/materials/colors.shader +++ b/base/materials/colors.shader @@ -28,6 +28,12 @@ textures/colors/red { qer_editorimage textures/colors/red 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.png environment } @@ -43,6 +49,12 @@ textures/colors/orange { qer_editorimage textures/colors/orange 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.png environment } @@ -58,6 +70,12 @@ textures/colors/green { qer_editorimage textures/colors/green 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.png environment } @@ -73,6 +91,12 @@ textures/colors/yellow { qer_editorimage textures/colors/yellow 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.png environment } @@ -88,6 +112,12 @@ textures/colors/blue { qer_editorimage textures/colors/blue 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.png environment } @@ -103,6 +133,12 @@ textures/colors/purple { qer_editorimage textures/colors/purple 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.png environment } @@ -118,6 +154,12 @@ textures/colors/grey25 { qer_editorimage textures/colors/grey25 color 0.25 0.25 0.25 +} + +textures/colors/grey25_shiny +{ + qer_editorimage textures/colors/grey25 + color 0.25 0.25 0.25 texture textures/fx/generic_env.png environment } @@ -133,6 +175,12 @@ textures/colors/grey50 { qer_editorimage textures/colors/grey50 color 0.50 0.50 0.50 +} + +textures/colors/grey50_shiny +{ + qer_editorimage textures/colors/grey50 + color 0.50 0.50 0.50 texture textures/fx/generic_env.png environment } @@ -148,6 +196,12 @@ textures/colors/grey75 { qer_editorimage textures/colors/grey75 color 0.75 0.75 0.75 +} + +textures/colors/grey75_shiny +{ + qer_editorimage textures/colors/grey75 + color 0.75 0.75 0.75 texture textures/fx/generic_env.png environment } @@ -163,6 +217,12 @@ textures/colors/grey90 { qer_editorimage textures/colors/grey90 color 0.90 0.90 0.90 +} + +textures/colors/grey90_shiny +{ + qer_editorimage textures/colors/grey90 + color 0.90 0.90 0.90 texture textures/fx/generic_env.png environment } diff --git a/base/materials/common.shader b/base/materials/common.shader index 29c5c6a..05d37d4 100644 --- a/base/materials/common.shader +++ b/base/materials/common.shader @@ -31,6 +31,15 @@ textures/common/entity color 1.00 1.00 1.00 } +textures/common/entity_shiny +{ + qer_editorimage textures/common/entity.tga + entity + color 1.00 1.00 1.00 + texture textures/fx/generic_env.png + environment +} + textures/common/entity_bright { qer_editorimage textures/common/entity.tga @@ -46,6 +55,15 @@ textures/common/entity_dark color 0.50 0.50 0.50 } +textures/common/entity_dark_shiny +{ + qer_editorimage textures/common/entity_dark.tga + entity + color 0.50 0.50 0.50 + texture textures/fx/generic_env.png + environment +} + textures/common/entity_dark_bright { qer_editorimage textures/common/entity_dark.tga @@ -61,6 +79,15 @@ textures/common/entity_second color 1.00 1.00 1.00 } +textures/common/entity_second_shiny +{ + qer_editorimage textures/common/entity_second.tga + entitySecond + color 1.00 1.00 1.00 + texture textures/fx/generic_env.png + environment +} + textures/common/entity_second_bright { qer_editorimage textures/common/entity_second.tga @@ -73,7 +100,16 @@ textures/common/entity_second_dark { qer_editorimage textures/common/entity_second_dark.tga entitySecond - color 0.50 0.50 0.50t + color 0.50 0.50 0.50 +} + +textures/common/entity_second_dark_shiny +{ + qer_editorimage textures/common/entity_second_dark.tga + entitySecond + color 0.50 0.50 0.50 + texture textures/fx/generic_env.png + environment } textures/common/entity_second_dark_bright @@ -91,6 +127,15 @@ textures/common/entity_third color 1.00 1.00 1.00 } +textures/common/entity_third_shiny +{ + qer_editorimage textures/common/entity_third.tga + entityThird + color 1.00 1.00 1.00 + texture textures/fx/generic_env.png + environment +} + textures/common/entity_third_bright { qer_editorimage textures/common/entity_third.tga @@ -106,6 +151,15 @@ textures/common/entity_third_dark color 0.50 0.50 0.50 } +textures/common/entity_third_dark_shiny +{ + qer_editorimage textures/common/entity_third_dark.tga + entityThird + color 0.50 0.50 0.50 + texture textures/fx/generic_env.png + environment +} + textures/common/entity_third_dark_bright { qer_editorimage textures/common/entity_third_dark.tga |