Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2009-08-18 10:02:10 +0000
committerEvan Goers <mega@osirion.org>2009-08-18 10:02:10 +0000
commit2a7977a56f2bf49ce8a04065c46fc3f1c89f7e01 (patch)
treec6fa770976b002439b105b106bbfd7861f8a7ba5 /base
parentb8121ebdd0fcfca29bc9bc88b898b43f87098212 (diff)
Added new generic envmap, enabled on all color and entity shaders.
Diffstat (limited to 'base')
-rw-r--r--base/materials/colors.shader40
-rw-r--r--base/materials/common.shader24
-rw-r--r--base/textures/fx/generic_env.pngbin0 -> 23542 bytes
3 files changed, 64 insertions, 0 deletions
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index 910d4a9..a145aad 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -28,12 +28,16 @@ textures/colors/red
{
qer_editorimage textures/colors/red
color 1.00 0.00 0.00
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/red_bright
{
qer_editorimage textures/colors/red
color 1.00 0.00 0.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -41,12 +45,16 @@ textures/colors/orange
{
qer_editorimage textures/colors/orange
color 1.00 0.50 0.00
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/orange_bright
{
qer_editorimage textures/colors/orange
color 1.00 0.50 0.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -54,12 +62,16 @@ textures/colors/green
{
qer_editorimage textures/colors/green
color 0.00 1.00 0.00
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/green_bright
{
qer_editorimage textures/colors/green
color 0.00 1.00 0.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -67,12 +79,16 @@ textures/colors/yellow
{
qer_editorimage textures/colors/yellow
color 1.00 1.00 0.00
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/yellow_bright
{
qer_editorimage textures/colors/yellow
color 1.00 1.00 0.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -80,12 +96,16 @@ textures/colors/blue
{
qer_editorimage textures/colors/blue
color 0.00 0.00 1.00
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/blue_bright
{
qer_editorimage textures/colors/blue
color 0.00 0.00 1.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -93,12 +113,16 @@ textures/colors/purple
{
qer_editorimage textures/colors/purple
color 0.50 0.00 0.50
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/purple_bright
{
qer_editorimage textures/colors/purple
color 0.50 0.00 0.50
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -106,12 +130,16 @@ textures/colors/grey25
{
qer_editorimage textures/colors/grey25
color 0.25 0.25 0.25
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/grey25_bright
{
qer_editorimage textures/colors/grey25
color 0.25 0.25 0.25
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -119,12 +147,16 @@ textures/colors/grey50
{
qer_editorimage textures/colors/grey50
color 0.50 0.50 0.50
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/grey50_bright
{
qer_editorimage textures/colors/grey50
color 0.50 0.50 0.50
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -132,12 +164,16 @@ textures/colors/grey75
{
qer_editorimage textures/colors/grey75
color 0.75 0.75 0.75
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/grey75_bright
{
qer_editorimage textures/colors/grey75
color 0.75 0.75 0.75
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -145,12 +181,16 @@ textures/colors/grey90
{
qer_editorimage textures/colors/grey90
color 0.90 0.90 0.90
+ texture textures/fx/generic_env.png
+ environment
}
textures/colors/grey90_bright
{
qer_editorimage textures/colors/grey90
color 0.90 0.90 0.90
+ texture textures/fx/generic_env.png
+ environment
bright
}
diff --git a/base/materials/common.shader b/base/materials/common.shader
index 77095d8..ec2c414 100644
--- a/base/materials/common.shader
+++ b/base/materials/common.shader
@@ -29,6 +29,8 @@ textures/common/entity
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
@@ -36,6 +38,8 @@ textures/common/entity_bright
qer_editorimage textures/common/entity.tga
entity
color 1.00 1.00 1.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -44,6 +48,8 @@ textures/common/entity_dark
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
@@ -51,6 +57,8 @@ textures/common/entity_dark_bright
qer_editorimage textures/common/entity_dark.tga
entity
color 0.50 0.50 0.50
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -59,6 +67,8 @@ textures/common/entity_second
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
@@ -66,6 +76,8 @@ textures/common/entity_second_bright
qer_editorimage textures/common/entity_second.tga
entitySecond
color 1.00 1.00 1.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -74,6 +86,8 @@ textures/common/entity_second_dark
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
@@ -81,6 +95,8 @@ textures/common/entity_second_dark_bright
qer_editorimage textures/common/entity_second_dark.tga
entitySecond
color 0.50 0.50 0.50
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -89,6 +105,8 @@ textures/common/entity_third
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
@@ -96,6 +114,8 @@ textures/common/entity_third_bright
qer_editorimage textures/common/entity_third.tga
entityThird
color 1.00 1.00 1.00
+ texture textures/fx/generic_env.png
+ environment
bright
}
@@ -104,6 +124,8 @@ textures/common/entity_third_dark
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
@@ -111,5 +133,7 @@ textures/common/entity_third_dark_bright
qer_editorimage textures/common/entity_third_dark.tga
entityThird
color 0.50 0.50 0.50
+ texture textures/fx/generic_env.png
+ environment
bright
}
diff --git a/base/textures/fx/generic_env.png b/base/textures/fx/generic_env.png
new file mode 100644
index 0000000..09bb207
--- /dev/null
+++ b/base/textures/fx/generic_env.png
Binary files differ