From ab637d28e6fa18a3412c653b11998bf0be068d4b Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 16 Jul 2009 20:15:52 +0000 Subject: removed envmapping from normal colors --- base/materials/colors.shader | 10 +---- base/materials/common.shader | 96 ++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 57 deletions(-) (limited to 'base') diff --git a/base/materials/colors.shader b/base/materials/colors.shader index 8054ffc..502d062 100644 --- a/base/materials/colors.shader +++ b/base/materials/colors.shader @@ -2,7 +2,6 @@ textures/colors/black { qer_editorimage textures/colors/black color 0.00 0.00 0.00 - environment } textures/colors/black_bright @@ -17,7 +16,6 @@ textures/colors/white { qer_editorimage textures/colors/white color 1.00 1.00 1.00 - environment } textures/colors/white_bright @@ -32,7 +30,6 @@ textures/colors/red { qer_editorimage textures/colors/red color 1.00 0.00 0.00 - environment } textures/colors/red_bright @@ -62,7 +59,6 @@ textures/colors/green { qer_editorimage textures/colors/green color 0.00 1.00 0.00 - environment } textures/colors/green_bright @@ -92,7 +88,6 @@ textures/colors/blue { qer_editorimage textures/colors/blue color 0.00 0.00 1.00 - environment } textures/colors/blue_bright @@ -107,7 +102,6 @@ textures/colors/grey25 { qer_editorimage textures/colors/grey25 color 0.25 0.25 0.25 - environment } textures/colors/grey25_bright @@ -122,7 +116,6 @@ textures/colors/grey50 { qer_editorimage textures/colors/grey50 color 0.50 0.50 0.50 - environment } textures/colors/grey50_bright @@ -137,7 +130,6 @@ textures/colors/grey75 { qer_editorimage textures/colors/grey75 color 0.75 0.75 0.75 - environment } textures/colors/grey75_bright @@ -152,7 +144,6 @@ textures/colors/grey90 { qer_editorimage textures/colors/grey90 color 0.90 0.90 0.90 - environment } textures/colors/grey90_bright @@ -162,3 +153,4 @@ textures/colors/grey90_bright environment bright } + diff --git a/base/materials/common.shader b/base/materials/common.shader index d10eb68..d92279c 100644 --- a/base/materials/common.shader +++ b/base/materials/common.shader @@ -1,107 +1,107 @@ -textures/common/clip +textures/common/clip { - qer_editorimage textures/common/clip.tga - qer_trans 0.20 -} - -textures/common/hint + qer_editorimage textures/common/clip.tga + qer_trans 0.20 +} + +textures/common/hint +{ + qer_editorimage textures/common/hint.tga + qer_trans 0.20 +} +textures/common/engine { - qer_editorimage textures/common/hint.tga - qer_trans 0.20 -} -textures/common/engine -{ qer_editorimage textures/common/engine.tga engine - bright + bright } -textures/common/entity -{ +textures/common/entity +{ qer_editorimage textures/common/entity.tga entity - color 1.00 1.00 1.00 + color 1.00 1.00 1.00 } -textures/common/entity_bright -{ +textures/common/entity_bright +{ qer_editorimage textures/common/entity.tga entity color 1.00 1.00 1.00 - bright + bright } -textures/common/entity_dark -{ +textures/common/entity_dark +{ qer_editorimage textures/common/entity_dark.tga entity - color 0.50 0.50 0.50 + color 0.50 0.50 0.50 } -textures/common/entity_dark_bright -{ +textures/common/entity_dark_bright +{ qer_editorimage textures/common/entity_dark.tga entity color 0.50 0.50 0.50 - bright + bright } -textures/common/entity_second -{ +textures/common/entity_second +{ qer_editorimage textures/common/entity_second.tga entitySecond - color 1.00 1.00 1.00 + color 1.00 1.00 1.00 } -textures/common/entity_second_bright -{ +textures/common/entity_second_bright +{ qer_editorimage textures/common/entity_second.tga entitySecond color 1.00 1.00 1.00 - bright + bright } -textures/common/entity_second_dark -{ +textures/common/entity_second_dark +{ qer_editorimage textures/common/entity_second_dark.tga entitySecond - color 0.50 0.50 0.50 + color 0.50 0.50 0.50 } -textures/common/entity_second_dark_bright -{ +textures/common/entity_second_dark_bright +{ qer_editorimage textures/common/entity_second_dark.tga entitySecond color 0.50 0.50 0.50 - bright + bright } -textures/common/entity_third -{ +textures/common/entity_third +{ qer_editorimage textures/common/entity_third.tga entityThird - color 1.00 1.00 1.00 + color 1.00 1.00 1.00 } -textures/common/entity_third_bright -{ +textures/common/entity_third_bright +{ qer_editorimage textures/common/entity_third.tga entityThird color 1.00 1.00 1.00 - bright + bright } -textures/common/entity_third_dark -{ +textures/common/entity_third_dark +{ qer_editorimage textures/common/entity_third_dark.tga entityThird - color 0.50 0.50 0.50 + color 0.50 0.50 0.50 } -textures/common/entity_third_dark_bright -{ +textures/common/entity_third_dark_bright +{ qer_editorimage textures/common/entity_third_dark.tga entityThird color 0.50 0.50 0.50 - bright + bright } -- cgit v1.2.3