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-07-16 21:02:53 +0000
committerEvan Goers <mega@osirion.org>2009-07-16 21:02:53 +0000
commit24d1af0474116664326929d2e085e1581ce3467a (patch)
treedd6c1c861f4380634f0a70d5f74a535da0277e1b /base
parentab637d28e6fa18a3412c653b11998bf0be068d4b (diff)
Disabled environment mapping on main color/entity materials.
Added glass materials.
Diffstat (limited to 'base')
-rw-r--r--base/materials/colors.shader13
-rw-r--r--base/materials/glass.shader96
-rw-r--r--base/materials/shaderlist.txt2
-rw-r--r--base/textures/glass/blue.tgabin0 -> 2514 bytes
-rw-r--r--base/textures/glass/dark.tgabin0 -> 2514 bytes
-rw-r--r--base/textures/glass/entity.tgabin0 -> 3841 bytes
-rw-r--r--base/textures/glass/entity_dark.tgabin0 -> 4855 bytes
-rw-r--r--base/textures/glass/entity_second.tgabin0 -> 4172 bytes
-rw-r--r--base/textures/glass/entity_second_dark.tgabin0 -> 5168 bytes
-rw-r--r--base/textures/glass/entity_third.tgabin0 -> 3723 bytes
-rw-r--r--base/textures/glass/entity_third_dark.tgabin0 -> 4697 bytes
-rw-r--r--base/textures/glass/green.tgabin0 -> 2514 bytes
-rw-r--r--base/textures/glass/orange.tgabin0 -> 2514 bytes
-rw-r--r--base/textures/glass/plain.tgabin0 -> 364 bytes
-rw-r--r--base/textures/glass/red.tgabin0 -> 2514 bytes
-rw-r--r--base/textures/glass/yellow.tgabin0 -> 2514 bytes
16 files changed, 97 insertions, 14 deletions
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index 502d062..58b1924 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -8,7 +8,6 @@ textures/colors/black_bright
{
qer_editorimage textures/colors/black
color 0.00 0.00 0.00
- environment
bright
}
@@ -22,7 +21,6 @@ textures/colors/white_bright
{
qer_editorimage textures/colors/white
color 1.00 1.00 1.00
- environment
bright
}
@@ -36,7 +34,6 @@ textures/colors/red_bright
{
qer_editorimage textures/colors/red
color 1.00 0.00 0.00
- environment
bright
}
@@ -44,14 +41,12 @@ textures/colors/orange
{
qer_editorimage textures/colors/orange
color 1.00 0.50 0.00
- environment
}
textures/colors/orange_bright
{
qer_editorimage textures/colors/orange
color 1.00 0.50 0.00
- environment
bright
}
@@ -65,7 +60,6 @@ textures/colors/green_bright
{
qer_editorimage textures/colors/green
color 0.00 1.00 0.00
- environment
bright
}
@@ -73,14 +67,12 @@ textures/colors/yellow
{
qer_editorimage textures/colors/yellow
color 1.00 1.00 0.00
- environment
}
textures/colors/yellow_bright
{
qer_editorimage textures/colors/yellow
color 1.00 1.00 0.00
- environment
bright
}
@@ -94,7 +86,6 @@ textures/colors/blue_bright
{
qer_editorimage textures/colors/blue
color 0.00 0.00 1.00
- environment
bright
}
@@ -108,7 +99,6 @@ textures/colors/grey25_bright
{
qer_editorimage textures/colors/grey25
color 0.25 0.25 0.25
- environment
bright
}
@@ -122,7 +112,6 @@ textures/colors/grey50_bright
{
qer_editorimage textures/colors/grey50
color 0.50 0.50 0.50
- environment
bright
}
@@ -136,7 +125,6 @@ textures/colors/grey75_bright
{
qer_editorimage textures/colors/grey75
color 0.75 0.75 0.75
- environment
bright
}
@@ -150,7 +138,6 @@ textures/colors/grey90_bright
{
qer_editorimage textures/colors/grey90
color 0.90 0.90 0.90
- environment
bright
}
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
new file mode 100644
index 0000000..8db87d6
--- /dev/null
+++ b/base/materials/glass.shader
@@ -0,0 +1,96 @@
+textures/glass/blue
+{
+ qer_editorimage textures/glass/blue
+ color 0.00 0.00 1.00
+ environment
+}
+
+textures/glass/red
+{
+ qer_editorimage textures/glass/red
+ color 1.00 0.00 0.00
+ environment
+}
+
+textures/glass/green
+{
+ qer_editorimage textures/glass/green
+ color 0.00 1.00 0.00
+ environment
+}
+
+textures/glass/yellow
+{
+ qer_editorimage textures/glass/yellow
+ color 1.00 1.00 0.00
+ environment
+}
+
+textures/glass/orange
+{
+ qer_editorimage textures/glass/orange
+ color 1.00 0.50 0.00
+ environment
+}
+
+textures/glass/dark
+{
+ qer_editorimage textures/glass/blue
+ color 0.25 0.25 0.25
+ environment
+}
+
+textures/glass/plain
+{
+ qer_editorimage textures/glass/plain
+ color 1.00 1.00 1.00
+ environment
+}
+
+textures/glass/entity
+{
+ qer_editorimage textures/glass/entity
+ color 1.00 1.00 1.00
+ entity
+ environment
+}
+
+textures/glass/entity_dark
+{
+ qer_editorimage textures/glass/entity_dark
+ color 0.5 0.5 0.5
+ entity
+ environment
+}
+
+textures/glass/entity_second
+{
+ qer_editorimage textures/glass/entity_second
+ color 1.00 1.00 1.00
+ entitySecond
+ environment
+}
+
+textures/glass/entity_second_dark
+{
+ qer_editorimage textures/glass/entity_second_dark
+ color 0.5 0.5 0.5
+ entitySecond
+ environment
+}
+
+textures/glass/entity_third
+{
+ qer_editorimage textures/glass/entity_third
+ color 1.00 1.00 1.00
+ entityThird
+ environment
+}
+
+textures/glass/entity_third_dark
+{
+ qer_editorimage textures/glass/entity_third_dark
+ color 0.5 0.5 0.5
+ entityThird
+ environment
+}
diff --git a/base/materials/shaderlist.txt b/base/materials/shaderlist.txt
index 9aa8869..a88289d 100644
--- a/base/materials/shaderlist.txt
+++ b/base/materials/shaderlist.txt
@@ -1,3 +1,3 @@
common
colors
-
+glass
diff --git a/base/textures/glass/blue.tga b/base/textures/glass/blue.tga
new file mode 100644
index 0000000..c2cb034
--- /dev/null
+++ b/base/textures/glass/blue.tga
Binary files differ
diff --git a/base/textures/glass/dark.tga b/base/textures/glass/dark.tga
new file mode 100644
index 0000000..f4b3e44
--- /dev/null
+++ b/base/textures/glass/dark.tga
Binary files differ
diff --git a/base/textures/glass/entity.tga b/base/textures/glass/entity.tga
new file mode 100644
index 0000000..bc0cb7b
--- /dev/null
+++ b/base/textures/glass/entity.tga
Binary files differ
diff --git a/base/textures/glass/entity_dark.tga b/base/textures/glass/entity_dark.tga
new file mode 100644
index 0000000..9b374b9
--- /dev/null
+++ b/base/textures/glass/entity_dark.tga
Binary files differ
diff --git a/base/textures/glass/entity_second.tga b/base/textures/glass/entity_second.tga
new file mode 100644
index 0000000..279700e
--- /dev/null
+++ b/base/textures/glass/entity_second.tga
Binary files differ
diff --git a/base/textures/glass/entity_second_dark.tga b/base/textures/glass/entity_second_dark.tga
new file mode 100644
index 0000000..b7b7f82
--- /dev/null
+++ b/base/textures/glass/entity_second_dark.tga
Binary files differ
diff --git a/base/textures/glass/entity_third.tga b/base/textures/glass/entity_third.tga
new file mode 100644
index 0000000..e878ad1
--- /dev/null
+++ b/base/textures/glass/entity_third.tga
Binary files differ
diff --git a/base/textures/glass/entity_third_dark.tga b/base/textures/glass/entity_third_dark.tga
new file mode 100644
index 0000000..b5e179c
--- /dev/null
+++ b/base/textures/glass/entity_third_dark.tga
Binary files differ
diff --git a/base/textures/glass/green.tga b/base/textures/glass/green.tga
new file mode 100644
index 0000000..7308afa
--- /dev/null
+++ b/base/textures/glass/green.tga
Binary files differ
diff --git a/base/textures/glass/orange.tga b/base/textures/glass/orange.tga
new file mode 100644
index 0000000..69e1b34
--- /dev/null
+++ b/base/textures/glass/orange.tga
Binary files differ
diff --git a/base/textures/glass/plain.tga b/base/textures/glass/plain.tga
new file mode 100644
index 0000000..4949c4b
--- /dev/null
+++ b/base/textures/glass/plain.tga
Binary files differ
diff --git a/base/textures/glass/red.tga b/base/textures/glass/red.tga
new file mode 100644
index 0000000..aef5f4a
--- /dev/null
+++ b/base/textures/glass/red.tga
Binary files differ
diff --git a/base/textures/glass/yellow.tga b/base/textures/glass/yellow.tga
new file mode 100644
index 0000000..2f4ae52
--- /dev/null
+++ b/base/textures/glass/yellow.tga
Binary files differ