From: Rudolf Polzer Date: Sat, 25 Sep 2010 13:12:27 +0000 (+0200) Subject: adapt to shader naming convention X-Git-Tag: xonotic-v0.1.0preview~148 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b447b23;p=xonotic%2Fxonotic-maps.pk3dir.git adapt to shader naming convention --- diff --git a/scripts/effects_forcefield.shader b/scripts/effects_forcefield.shader index bdcd8115..890d25cb 100644 --- a/scripts/effects_forcefield.shader +++ b/scripts/effects_forcefield.shader @@ -1,8 +1,8 @@ //Shader file for fx //Forcefield1 red -textures/fx/forcefield1-a +textures/effects_forcefield/forcefield1_a { - qer_editorimage textures/fx/forcefields/forcefield1_a.tga + qer_editorimage textures/effects_forcefield/forcefield1_a.tga nopicmip surfaceparm nolightmap surfaceparm trans @@ -11,7 +11,7 @@ textures/fx/forcefield1-a qer_trans 0.8 { - map textures/fx/forcefields/forcefield1_a.tga + map textures/effects_forcefield/forcefield1_a.tga tcGen environment blendfunc GL_ONE GL_ONE tcMod turb 0 0.25 0 0.5 @@ -19,9 +19,9 @@ textures/fx/forcefield1-a } } //Forcefield1 blue -textures/fx/forcefield1-b +textures/effects_forcefield/forcefield1_b { - qer_editorimage textures/fx/forcefields/forcefield1_b.tga + qer_editorimage textures/effects_forcefield/forcefield1_b.tga nopicmip surfaceparm nolightmap surfaceparm trans @@ -30,7 +30,7 @@ textures/fx/forcefield1-b qer_trans 0.8 { - map textures/fx/forcefields/forcefield1_b.tga + map textures/effects_forcefield/forcefield1_b.tga tcGen environment blendfunc GL_ONE GL_ONE tcMod turb 0 0.25 0 0.5 @@ -38,9 +38,9 @@ textures/fx/forcefield1-b } } //Forcefield1 yellow -textures/fx/forcefield2-c +textures/effects_forcefield/forcefield1_c { - qer_editorimage textures/fx/forcefields/forcefield1_c.tga + qer_editorimage textures/effects_forcefield/forcefield1_c.tga nopicmip surfaceparm nolightmap surfaceparm trans @@ -49,7 +49,7 @@ textures/fx/forcefield2-c qer_trans 0.8 { - map textures/fx/forcefields/forcefield1_c.tga + map textures/effects_forcefield/forcefield1_c.tga tcGen environment blendfunc GL_ONE GL_ONE tcMod turb 0 0.25 0 0.5 @@ -57,9 +57,9 @@ textures/fx/forcefield2-c } } //Forcefield1 green -textures/fx/forcefield1-d +textures/effects_forcefield/forcefield1_d { - qer_editorimage textures/fx/forcefields/forcefield1_d.tga + qer_editorimage textures/effects_forcefield/forcefield1_d.tga nopicmip surfaceparm nolightmap surfaceparm trans @@ -68,7 +68,7 @@ textures/fx/forcefield1-d qer_trans 0.8 { - map textures/fx/forcefields/forcefield1_d.tga + map textures/effects_forcefield/forcefield1_d.tga tcGen environment blendfunc GL_ONE GL_ONE tcMod turb 0 0.25 0 0.5 diff --git a/scripts/effects_healpod.shader b/scripts/effects_healpod.shader index 552d151d..525a4d59 100644 --- a/scripts/effects_healpod.shader +++ b/scripts/effects_healpod.shader @@ -1,8 +1,8 @@ //Healpod1 green //For best effect apply to a rotating cylinder -textures/fx/healpod1-d +textures/effects_healpod/healpod1_d { - qer_editorimage textures/fx/forcefields/healpod1_d.tga + qer_editorimage textures/effects_healpod/healpod1_d.tga surfaceparm nolightmap surfaceparm nomarks surfaceparm nonsolid @@ -10,7 +10,7 @@ textures/fx/healpod1-d cull none qer_trans 0.6 { - map textures/fx/forcefields/healpod1_d.tga + map textures/effects_healpod/healpod1_d.tga blendfunc add tcMod scroll 0 2 } diff --git a/scripts/effects_jumppad.shader b/scripts/effects_jumppad.shader index c69ebecc..211eef33 100644 --- a/scripts/effects_jumppad.shader +++ b/scripts/effects_jumppad.shader @@ -1,7 +1,7 @@ //Jumppad1 blue -textures/fx/jumppadfx1-a +textures/effects_jumppad/jumppadfx1_a { - qer_editorimage textures/fx/jumppad/jumppadfx1_a.tga + qer_editorimage textures/effects_jumppad/jumppadfx1_a.tga surfaceparm nolightmap surfaceparm nomarks surfaceparm nonsolid @@ -9,15 +9,15 @@ textures/fx/jumppadfx1-a cull none qer_trans 0.6 { - map textures/fx/jumppad/jumppadfx1_a.tga + map textures/effects_jumppad/jumppadfx1_a.tga blendfunc add tcMod scroll 0 2 } } //Jumppad1 red -textures/fx/jumppadfx1-b +textures/effects_jumppad/jumppadfx1_b { - qer_editorimage textures/fx/jumppad/jumppadfx1_b.tga + qer_editorimage textures/effects_jumppad/jumppadfx1_b.tga surfaceparm nolightmap surfaceparm nomarks surfaceparm nonsolid @@ -25,15 +25,15 @@ textures/fx/jumppadfx1-b cull none qer_trans 0.6 { - map textures/fx/jumppad/jumppadfx1_b.tga + map textures/effects_jumppad/jumppadfx1_b.tga blendfunc add tcMod scroll 0 2 } } //Jumppad1 yellow -textures/fx/jumppadfx1-c +textures/effects_jumppad/jumppadfx1_c { - qer_editorimage textures/fx/jumppad/jumppadfx1_c.tga + qer_editorimage textures/effects_jumppad/jumppadfx1_c.tga surfaceparm nolightmap surfaceparm nomarks surfaceparm nonsolid @@ -41,15 +41,15 @@ textures/fx/jumppadfx1-c cull none qer_trans 0.6 { - map textures/fx/jumppad/jumppadfx1_c.tga + map textures/effects_jumppad/jumppadfx1_c.tga blendfunc add tcMod scroll 0 2 } } //Jumppad1 green -textures/fx/jumppadfx1-d +textures/effects_jumppad/jumppadfx1_d { - qer_editorimage textures/fx/jumppad/jumppadfx1_d.tga + qer_editorimage textures/effects_jumppad/jumppadfx1_d.tga surfaceparm nolightmap surfaceparm nomarks surfaceparm nonsolid @@ -57,7 +57,7 @@ textures/fx/jumppadfx1-d cull none qer_trans 0.6 { - map textures/fx/jumppad/jumppadfx1_d.tga + map textures/effects_jumppad/jumppadfx1_d.tga blendfunc add tcMod scroll 0 2 } diff --git a/scripts/effects_lightning.shader b/scripts/effects_lightning.shader index f7ce7f26..e83ae926 100644 --- a/scripts/effects_lightning.shader +++ b/scripts/effects_lightning.shader @@ -1,7 +1,7 @@ //Lightning1-a -textures/fx/lightning1-a +textures/effects_lightning/lightning1_1 { - qer_editorimage textures/fx/lightnings/lightning1_1.tga + qer_editorimage textures/effects_lightning/lightning1_1.tga surfaceparm nolightmap surfaceparm nodlight surfaceparm trans @@ -10,14 +10,14 @@ textures/fx/lightning1-a cull none deformVertexes autosprite2 { - animMap 15 textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga + animMap 15 textures/effects_lightning/lightning1_1.tga textures/effects_lightning/lightning1_2.tga textures/effects_lightning/lightning1_3.tga textures/effects_lightning/lightning1_4.tga textures/effects_lightning/lightning1_5.tga textures/effects_lightning/lightning1_6.tga textures/effects_lightning/lightning1_7.tga textures/effects_lightning/lightning1_8.tga textures/effects_lightning/lightning1_9.tga textures/effects_lightning/lightning1_10.tga textures/effects_lightning/lightning1_11.tga blendfunc add } } //Lightning1-b -textures/fx/lightning1-b +textures/effects_lightning/lightning1_4 { - qer_editorimage textures/fx/lightnings/lightning1_4.tga + qer_editorimage textures/effects_lightning/lightning1_4.tga surfaceparm nolightmap surfaceparm nodlight surfaceparm trans @@ -26,14 +26,14 @@ textures/fx/lightning1-b cull none deformVertexes autosprite2 { - animMap 15 textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga + animMap 15 textures/effects_lightning/lightning1_4.tga textures/effects_lightning/lightning1_5.tga textures/effects_lightning/lightning1_6.tga textures/effects_lightning/lightning1_7.tga textures/effects_lightning/lightning1_8.tga textures/effects_lightning/lightning1_9.tga textures/effects_lightning/lightning1_10.tga textures/effects_lightning/lightning1_11.tga textures/effects_lightning/lightning1_1.tga textures/effects_lightning/lightning1_2.tga textures/effects_lightning/lightning1_3.tga blendfunc add } } //Lightning1-c -textures/fx/lightning1-c +textures/effects_lightning/lightning1_6 { - qer_editorimage textures/fx/lightnings/lightning1_6.tga + qer_editorimage textures/effects_lightning/lightning1_6.tga surfaceparm nolightmap surfaceparm nodlight surfaceparm trans @@ -42,14 +42,14 @@ textures/fx/lightning1-c cull none deformVertexes autosprite2 { - animMap 15 textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga + animMap 15 textures/effects_lightning/lightning1_6.tga textures/effects_lightning/lightning1_7.tga textures/effects_lightning/lightning1_8.tga textures/effects_lightning/lightning1_9.tga textures/effects_lightning/lightning1_10.tga textures/effects_lightning/lightning1_11.tga textures/effects_lightning/lightning1_1.tga textures/effects_lightning/lightning1_2.tga textures/effects_lightning/lightning1_3.tga textures/effects_lightning/lightning1_4.tga textures/effects_lightning/lightning1_5.tga blendfunc add } } -//Lightning1-d -textures/fx/lightning1-d +h/Lightning1-d +textures/effects_lightning/lightning1_8 { - qer_editorimage textures/fx/lightnings/lightning1_8.tga + qer_editorimage textures/effects_lightning/lightning1_8.tga surfaceparm nolightmap surfaceparm nodlight surfaceparm trans @@ -58,7 +58,7 @@ textures/fx/lightning1-d cull none deformVertexes autosprite2 { - animMap 15 textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga + animMap 15 textures/effects_lightning/lightning1_8.tga textures/effects_lightning/lightning1_9.tga textures/effects_lightning/lightning1_10.tga textures/effects_lightning/lightning1_11.tga textures/effects_lightning/lightning1_1.tga textures/effects_lightning/lightning1_2.tga textures/effects_lightning/lightning1_3.tga textures/effects_lightning/lightning1_4.tga textures/effects_lightning/lightning1_5.tga textures/effects_lightning/lightning1_6.tga textures/effects_lightning/lightning1_7.tga blendfunc add } } diff --git a/textures/effects_forcefield/forcefield1_a.tga b/textures/effects_forcefield/forcefield1_a.tga new file mode 100644 index 00000000..3d80cff1 Binary files /dev/null and b/textures/effects_forcefield/forcefield1_a.tga differ diff --git a/textures/effects_forcefield/forcefield1_b.tga b/textures/effects_forcefield/forcefield1_b.tga new file mode 100644 index 00000000..0f5042e5 Binary files /dev/null and b/textures/effects_forcefield/forcefield1_b.tga differ diff --git a/textures/effects_forcefield/forcefield1_c.tga b/textures/effects_forcefield/forcefield1_c.tga new file mode 100644 index 00000000..b9fe24a1 Binary files /dev/null and b/textures/effects_forcefield/forcefield1_c.tga differ diff --git a/textures/effects_forcefield/forcefield1_d.tga b/textures/effects_forcefield/forcefield1_d.tga new file mode 100644 index 00000000..350d4315 Binary files /dev/null and b/textures/effects_forcefield/forcefield1_d.tga differ diff --git a/textures/effects_healpod/healpod1_d.tga b/textures/effects_healpod/healpod1_d.tga new file mode 100644 index 00000000..f7677719 Binary files /dev/null and b/textures/effects_healpod/healpod1_d.tga differ diff --git a/textures/effects_jumppad/jumppadfx1_a.tga b/textures/effects_jumppad/jumppadfx1_a.tga new file mode 100644 index 00000000..a57d025c Binary files /dev/null and b/textures/effects_jumppad/jumppadfx1_a.tga differ diff --git a/textures/effects_jumppad/jumppadfx1_b.tga b/textures/effects_jumppad/jumppadfx1_b.tga new file mode 100644 index 00000000..a35bb266 Binary files /dev/null and b/textures/effects_jumppad/jumppadfx1_b.tga differ diff --git a/textures/effects_jumppad/jumppadfx1_c.tga b/textures/effects_jumppad/jumppadfx1_c.tga new file mode 100644 index 00000000..bf071a95 Binary files /dev/null and b/textures/effects_jumppad/jumppadfx1_c.tga differ diff --git a/textures/effects_jumppad/jumppadfx1_d.tga b/textures/effects_jumppad/jumppadfx1_d.tga new file mode 100644 index 00000000..a6dc70bd Binary files /dev/null and b/textures/effects_jumppad/jumppadfx1_d.tga differ diff --git a/textures/effects_lightning/lightning1_1.tga b/textures/effects_lightning/lightning1_1.tga new file mode 100644 index 00000000..f63178ad Binary files /dev/null and b/textures/effects_lightning/lightning1_1.tga differ diff --git a/textures/effects_lightning/lightning1_10.tga b/textures/effects_lightning/lightning1_10.tga new file mode 100644 index 00000000..29979197 Binary files /dev/null and b/textures/effects_lightning/lightning1_10.tga differ diff --git a/textures/effects_lightning/lightning1_11.tga b/textures/effects_lightning/lightning1_11.tga new file mode 100644 index 00000000..0605d60b Binary files /dev/null and b/textures/effects_lightning/lightning1_11.tga differ diff --git a/textures/effects_lightning/lightning1_2.tga b/textures/effects_lightning/lightning1_2.tga new file mode 100644 index 00000000..e4e3c319 Binary files /dev/null and b/textures/effects_lightning/lightning1_2.tga differ diff --git a/textures/effects_lightning/lightning1_3.tga b/textures/effects_lightning/lightning1_3.tga new file mode 100644 index 00000000..16ee8731 Binary files /dev/null and b/textures/effects_lightning/lightning1_3.tga differ diff --git a/textures/effects_lightning/lightning1_4.tga b/textures/effects_lightning/lightning1_4.tga new file mode 100644 index 00000000..433203af Binary files /dev/null and b/textures/effects_lightning/lightning1_4.tga differ diff --git a/textures/effects_lightning/lightning1_5.tga b/textures/effects_lightning/lightning1_5.tga new file mode 100644 index 00000000..d057f534 Binary files /dev/null and b/textures/effects_lightning/lightning1_5.tga differ diff --git a/textures/effects_lightning/lightning1_6.tga b/textures/effects_lightning/lightning1_6.tga new file mode 100644 index 00000000..c824b6a3 Binary files /dev/null and b/textures/effects_lightning/lightning1_6.tga differ diff --git a/textures/effects_lightning/lightning1_7.tga b/textures/effects_lightning/lightning1_7.tga new file mode 100644 index 00000000..4bf30c6e Binary files /dev/null and b/textures/effects_lightning/lightning1_7.tga differ diff --git a/textures/effects_lightning/lightning1_8.tga b/textures/effects_lightning/lightning1_8.tga new file mode 100644 index 00000000..28ad42be Binary files /dev/null and b/textures/effects_lightning/lightning1_8.tga differ diff --git a/textures/effects_lightning/lightning1_9.tga b/textures/effects_lightning/lightning1_9.tga new file mode 100644 index 00000000..d5bc91d6 Binary files /dev/null and b/textures/effects_lightning/lightning1_9.tga differ diff --git a/textures/fx/forcefields/forcefield1_a.tga b/textures/fx/forcefields/forcefield1_a.tga deleted file mode 100644 index 3d80cff1..00000000 Binary files a/textures/fx/forcefields/forcefield1_a.tga and /dev/null differ diff --git a/textures/fx/forcefields/forcefield1_b.tga b/textures/fx/forcefields/forcefield1_b.tga deleted file mode 100644 index 0f5042e5..00000000 Binary files a/textures/fx/forcefields/forcefield1_b.tga and /dev/null differ diff --git a/textures/fx/forcefields/forcefield1_c.tga b/textures/fx/forcefields/forcefield1_c.tga deleted file mode 100644 index b9fe24a1..00000000 Binary files a/textures/fx/forcefields/forcefield1_c.tga and /dev/null differ diff --git a/textures/fx/forcefields/forcefield1_d.tga b/textures/fx/forcefields/forcefield1_d.tga deleted file mode 100644 index 350d4315..00000000 Binary files a/textures/fx/forcefields/forcefield1_d.tga and /dev/null differ diff --git a/textures/fx/forcefields/healpod1_d.tga b/textures/fx/forcefields/healpod1_d.tga deleted file mode 100644 index f7677719..00000000 Binary files a/textures/fx/forcefields/healpod1_d.tga and /dev/null differ diff --git a/textures/fx/jumppad/jumppadfx1_a.tga b/textures/fx/jumppad/jumppadfx1_a.tga deleted file mode 100644 index a57d025c..00000000 Binary files a/textures/fx/jumppad/jumppadfx1_a.tga and /dev/null differ diff --git a/textures/fx/jumppad/jumppadfx1_b.tga b/textures/fx/jumppad/jumppadfx1_b.tga deleted file mode 100644 index a35bb266..00000000 Binary files a/textures/fx/jumppad/jumppadfx1_b.tga and /dev/null differ diff --git a/textures/fx/jumppad/jumppadfx1_c.tga b/textures/fx/jumppad/jumppadfx1_c.tga deleted file mode 100644 index bf071a95..00000000 Binary files a/textures/fx/jumppad/jumppadfx1_c.tga and /dev/null differ diff --git a/textures/fx/jumppad/jumppadfx1_d.tga b/textures/fx/jumppad/jumppadfx1_d.tga deleted file mode 100644 index a6dc70bd..00000000 Binary files a/textures/fx/jumppad/jumppadfx1_d.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_1.tga b/textures/fx/lightnings/lightning1_1.tga deleted file mode 100644 index f63178ad..00000000 Binary files a/textures/fx/lightnings/lightning1_1.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_10.tga b/textures/fx/lightnings/lightning1_10.tga deleted file mode 100644 index 29979197..00000000 Binary files a/textures/fx/lightnings/lightning1_10.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_11.tga b/textures/fx/lightnings/lightning1_11.tga deleted file mode 100644 index 0605d60b..00000000 Binary files a/textures/fx/lightnings/lightning1_11.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_2.tga b/textures/fx/lightnings/lightning1_2.tga deleted file mode 100644 index e4e3c319..00000000 Binary files a/textures/fx/lightnings/lightning1_2.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_3.tga b/textures/fx/lightnings/lightning1_3.tga deleted file mode 100644 index 16ee8731..00000000 Binary files a/textures/fx/lightnings/lightning1_3.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_4.tga b/textures/fx/lightnings/lightning1_4.tga deleted file mode 100644 index 433203af..00000000 Binary files a/textures/fx/lightnings/lightning1_4.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_5.tga b/textures/fx/lightnings/lightning1_5.tga deleted file mode 100644 index d057f534..00000000 Binary files a/textures/fx/lightnings/lightning1_5.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_6.tga b/textures/fx/lightnings/lightning1_6.tga deleted file mode 100644 index c824b6a3..00000000 Binary files a/textures/fx/lightnings/lightning1_6.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_7.tga b/textures/fx/lightnings/lightning1_7.tga deleted file mode 100644 index 4bf30c6e..00000000 Binary files a/textures/fx/lightnings/lightning1_7.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_8.tga b/textures/fx/lightnings/lightning1_8.tga deleted file mode 100644 index 28ad42be..00000000 Binary files a/textures/fx/lightnings/lightning1_8.tga and /dev/null differ diff --git a/textures/fx/lightnings/lightning1_9.tga b/textures/fx/lightnings/lightning1_9.tga deleted file mode 100644 index d5bc91d6..00000000 Binary files a/textures/fx/lightnings/lightning1_9.tga and /dev/null differ