From: MooKow Date: Fri, 6 Aug 2010 22:37:56 +0000 (-0500) Subject: Sorting out this liquids stuff. This should be as clean as it gets :D X-Git-Tag: xonotic-v0.1.0preview~141^2~5^2~4^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b432f27602e8a548eef408b711da93ea9473797c;p=xonotic%2Fxonotic-maps.pk3dir.git Sorting out this liquids stuff. This should be as clean as it gets :D --- diff --git a/scripts/liquids.shader b/scripts/liquids.shader new file mode 100644 index 00000000..56d13765 --- /dev/null +++ b/scripts/liquids.shader @@ -0,0 +1,132 @@ +// reflective water by Urre and Zombie + +textures/liquids_water/water0 +{ + qer_editorimage textures/liquids_water/water0.tga + qer_trans 20 + surfaceparm nomarks + surfaceparm trans + surfaceparm water + surfaceparm nolightmap + cull none + q3map_globaltexture + { + map textures/liquids_water/water0.tga + tcMod scroll 0.07 0.07 + tcmod scale 1.2 0.7 + blendfunc blend + } + dp_water 0.1 0.8 3 3 1 1 1 1 1 1 0.125 +} + +textures/liquids_water/water1 +{ + qer_editorimage textures/liquids_water/water1.tga + qer_trans 20 + surfaceparm nomarks + surfaceparm trans + surfaceparm water + surfaceparm nolightmap + cull none + q3map_globaltexture + { + map textures/liquids_water/water1.tga + tcMod scroll 0.07 0.07 + tcmod scale 1.2 0.7 + blendfunc blend + } + dp_water 0.1 0.8 3 3 1 1 1 1 1 1 0.125 +} + +textures/liquids_water/water2 +{ + qer_editorimage textures/liquids_water/water2.tga + qer_trans 20 + surfaceparm nomarks + surfaceparm trans + surfaceparm water + surfaceparm nolightmap + cull none + q3map_globaltexture + { + map textures/liquids_water/water2.tga + tcMod scroll 0.07 0.07 + tcmod scale 1.2 0.7 + blendfunc blend + } + dp_water 0.1 0.8 3 3 1 1 1 1 1 1 0.125 +} + +textures/liquids_water/ruiner_water +{ + qer_editorimage textures/liquids_water/ruiner_water.jpg + qer_trans 0.5 + surfaceparm noimpact + surfaceparm trans + surfaceparm nonsolid + surfaceparm water + deformVertexes wave 150.0 sin 2 5 0.25 0.1 + Q3map_TessSize 128 + cull none + { + map textures/liquids_water/ruiner_water.jpg + blendFunc add + rgbGen identity + } +} + + +textures/liquids_slime/slime0 +{ + qer_editorimage textures/liquids_slime/slime0.tga + qer_trans 20 + surfaceparm nomarks + surfaceparm trans + surfaceparm slime + surfaceparm nolightmap + cull none + q3map_globaltexture + { + map textures/liquids_slime/slime0.tga + tcMod scroll 0.07 0.07 + tcmod scale 1.2 0.7 + blendfunc blend + } + dp_water 0.1 0.8 3 3 0.5 1 0.5 0.5 1 0.5 0.75 +} + +textures/liquids_slime/slime1 +{ + qer_editorimage textures/liquids_slime/slime1.tga + qer_trans 20 + surfaceparm nomarks + surfaceparm trans + surfaceparm slime + surfaceparm nolightmap + cull none + q3map_globaltexture + { + map textures/liquids_slime/slime1.tga + tcMod scroll 0.07 0.07 + tcmod scale 1.2 0.7 + blendfunc blend + } + dp_water 0.1 0.8 3 3 1 1 0.5 1 1 0.5 0.75 +} + +textures/liquids_lava/protolava +{ + qer_editorimage textures/liquids_lava/protolava.jpg + qer_trans 0.5 + surfaceparm trans + surfaceparm nonsolid + surfaceparm lava + deformVertexes wave 150.0 sin 2 5 0.25 0.1 + Q3map_TessSize 128 + cull none + { + map textures/liquids_lava/protolava.jpg + blendFunc add + rgbGen identity + } +} diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index 44785af5..820d4711 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt @@ -6,4 +6,4 @@ exx facility114x trak4x trak5x - +liquids diff --git a/textures/liquids_lava/protolava.jpg b/textures/liquids_lava/protolava.jpg new file mode 100644 index 00000000..20083cc4 Binary files /dev/null and b/textures/liquids_lava/protolava.jpg differ diff --git a/textures/liquids_lava/protolava_glow.jpg b/textures/liquids_lava/protolava_glow.jpg new file mode 100644 index 00000000..166ee798 Binary files /dev/null and b/textures/liquids_lava/protolava_glow.jpg differ diff --git a/textures/liquids_lava/protolava_norm.jpg b/textures/liquids_lava/protolava_norm.jpg new file mode 100644 index 00000000..413cefed Binary files /dev/null and b/textures/liquids_lava/protolava_norm.jpg differ diff --git a/textures/liquids_slime/slime0.tga b/textures/liquids_slime/slime0.tga new file mode 100644 index 00000000..6bd902f8 Binary files /dev/null and b/textures/liquids_slime/slime0.tga differ diff --git a/textures/liquids_slime/slime0_norm.tga b/textures/liquids_slime/slime0_norm.tga new file mode 100644 index 00000000..fb4fb22e Binary files /dev/null and b/textures/liquids_slime/slime0_norm.tga differ diff --git a/textures/liquids_slime/slime1.tga b/textures/liquids_slime/slime1.tga new file mode 100644 index 00000000..c9dd4da1 Binary files /dev/null and b/textures/liquids_slime/slime1.tga differ diff --git a/textures/liquids_slime/slime1_norm.tga b/textures/liquids_slime/slime1_norm.tga new file mode 100644 index 00000000..fb4fb22e Binary files /dev/null and b/textures/liquids_slime/slime1_norm.tga differ diff --git a/textures/liquids_water/ruiner_water.jpg b/textures/liquids_water/ruiner_water.jpg new file mode 100644 index 00000000..4376a8c2 Binary files /dev/null and b/textures/liquids_water/ruiner_water.jpg differ diff --git a/textures/liquids_water/water0.tga b/textures/liquids_water/water0.tga new file mode 100644 index 00000000..716da8a4 Binary files /dev/null and b/textures/liquids_water/water0.tga differ diff --git a/textures/liquids_water/water0_norm.tga b/textures/liquids_water/water0_norm.tga new file mode 100644 index 00000000..fb4fb22e Binary files /dev/null and b/textures/liquids_water/water0_norm.tga differ diff --git a/textures/liquids_water/water1.tga b/textures/liquids_water/water1.tga new file mode 100644 index 00000000..39938eda Binary files /dev/null and b/textures/liquids_water/water1.tga differ diff --git a/textures/liquids_water/water1_norm.tga b/textures/liquids_water/water1_norm.tga new file mode 100644 index 00000000..fb4fb22e Binary files /dev/null and b/textures/liquids_water/water1_norm.tga differ diff --git a/textures/liquids_water/water2.tga b/textures/liquids_water/water2.tga new file mode 100644 index 00000000..233e397f Binary files /dev/null and b/textures/liquids_water/water2.tga differ diff --git a/textures/liquids_water/water2_norm.tga b/textures/liquids_water/water2_norm.tga new file mode 100644 index 00000000..fb4fb22e Binary files /dev/null and b/textures/liquids_water/water2_norm.tga differ