From: Rudolf Polzer Date: Mon, 2 Aug 2010 14:54:01 +0000 (+0200) Subject: adhere to xonotic shader naming convention X-Git-Tag: xonotic-v0.1.0preview~141^2~7^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52ce7ca0b26dd7588d820b11b799ce987f6d77ed;p=xonotic%2Fxonotic-maps.pk3dir.git adhere to xonotic shader naming convention --- diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin index e5692977..dbeb8f84 100644 --- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin +++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin @@ -1,5 +1,5 @@ -flame,textures/xonotic_jumppad01/jumpglow_red -energy,textures/xonotic_jumppad01/energy_red_anim +flame,models/xonotic_jumppad01/jumpglow_red +energy,models/xonotic_jumppad01/energy_red_anim 1,textures/trak5x/panel-grate1a 2,textures/trak5x/wall-wall1a 3,textures/trak5x/base-pipe1a diff --git a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin index b3cf0955..3384f0b0 100644 --- a/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin +++ b/models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin @@ -1,5 +1,5 @@ -flame,textures/xonotic_jumppad01/jumpglow_blue -energy,textures/xonotic_jumppad01/energy_blue_anim +flame,models/xonotic_jumppad01/jumpglow_blue +energy,models/xonotic_jumppad01/energy_blue_anim 1,textures/trak5x/panel-grate1a 2,textures/trak5x/wall-wall1a 3,textures/trak5x/base-pipe1a diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin index e5692977..dbeb8f84 100644 --- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin +++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin @@ -1,5 +1,5 @@ -flame,textures/xonotic_jumppad01/jumpglow_red -energy,textures/xonotic_jumppad01/energy_red_anim +flame,models/xonotic_jumppad01/jumpglow_red +energy,models/xonotic_jumppad01/energy_red_anim 1,textures/trak5x/panel-grate1a 2,textures/trak5x/wall-wall1a 3,textures/trak5x/base-pipe1a diff --git a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin index b3cf0955..3384f0b0 100644 --- a/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin +++ b/models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin @@ -1,5 +1,5 @@ -flame,textures/xonotic_jumppad01/jumpglow_blue -energy,textures/xonotic_jumppad01/energy_blue_anim +flame,models/xonotic_jumppad01/jumpglow_blue +energy,models/xonotic_jumppad01/energy_blue_anim 1,textures/trak5x/panel-grate1a 2,textures/trak5x/wall-wall1a 3,textures/trak5x/base-pipe1a diff --git a/scripts/model_xonotic_jumppad01.shader b/scripts/model_xonotic_jumppad01.shader new file mode 100644 index 00000000..a4d01a91 --- /dev/null +++ b/scripts/model_xonotic_jumppad01.shader @@ -0,0 +1,91 @@ +models/xonotic_jumppad01/jumpglow_orange +{ + qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga + cull none + { + map models/xonotic_jumppad01/jumpglow_o.tga + blendfunc add + tcmod page 3 1 0.02 + } +} + +models/xonotic_jumppad01/jumpglow_red +{ + qer_editorimage models/xonotic_jumppad01/jumpglow_r.tga + cull none + { + map models/xonotic_jumppad01/jumpglow_r.tga + blendfunc add + tcmod page 3 1 0.02 + } +} + +models/xonotic_jumppad01/jumpglow_green +{ + cull none + { + map models/xonotic_jumppad01/jumpglow_g.tga + blendfunc add + tcmod page 3 1 0.02 + } +} + +models/xonotic_jumppad01/jumpglow_blue +{ + cull none + { + map models/xonotic_jumppad01/jumpglow_b.tga + blendfunc add + tcmod page 3 1 0.02 + } +} + +models/xonotic_jumppad01/energy_red_anim +{ + qer_editorimage models/xonotic_jumppad01/energy_red.tga + nopicmip + surfaceparm nolightmap +// surfaceparm nonsolid + surfaceparm trans +// surfaceparm slick + cull none + surfaceparm nomarks // Added +// surfaceparm noimpact // by +// surfaceparm playerclip // Q + qer_trans 0.8 +// alphaFunc GE128 + + { + map models/xonotic_jumppad01/energy_red.tga + tcGen environment +// tcmod scale .6 .6 + blendfunc GL_ONE GL_ONE + tcMod turb 0 0.25 0 0.5 + tcMod scroll -.5 -.3 + } +} + +models/xonotic_jumppad01/energy_blue_anim +{ + qer_editorimage models/xonotic_jumppad01/energy_blue.tga + nopicmip + surfaceparm nolightmap +// surfaceparm nonsolid + surfaceparm trans +// surfaceparm slick + cull none + surfaceparm nomarks // Added +// surfaceparm noimpact // by +// surfaceparm playerclip // Q + qer_trans 0.8 +// alphaFunc GE128 + + { + map models/xonotic_jumppad01/energy_blue.tga + tcGen environment +// tcmod scale .6 .6 + blendfunc GL_ONE GL_ONE + tcMod turb 0 0.25 0 0.5 + tcMod scroll -.5 -.3 + } +} diff --git a/scripts/xonotic_jumppad01.shader b/scripts/xonotic_jumppad01.shader deleted file mode 100644 index 879cc24b..00000000 --- a/scripts/xonotic_jumppad01.shader +++ /dev/null @@ -1,91 +0,0 @@ -textures/xonotic_jumppad01/jumpglow_orange -{ - qer_editorimage models/xonotic_jumppad01/jumpglow_o.tga - cull none - { - map models/xonotic_jumppad01/jumpglow_o.tga - blendfunc add - tcmod page 3 1 0.02 - } -} - -textures/xonotic_jumppad01/jumpglow_red -{ - qer_editorimage models/xonotic_jumppad01/jumpglow_r.tga - cull none - { - map models/xonotic_jumppad01/jumpglow_r.tga - blendfunc add - tcmod page 3 1 0.02 - } -} - -textures/xonotic_jumppad01/jumpglow_green -{ - cull none - { - map models/xonotic_jumppad01/jumpglow_g.tga - blendfunc add - tcmod page 3 1 0.02 - } -} - -textures/xonotic_jumppad01/jumpglow_blue -{ - cull none - { - map models/xonotic_jumppad01/jumpglow_b.tga - blendfunc add - tcmod page 3 1 0.02 - } -} - -textures/xonotic_jumppad01/energy_red_anim -{ - qer_editorimage models/xonotic_jumppad01/energy_red.tga - nopicmip - surfaceparm nolightmap -// surfaceparm nonsolid - surfaceparm trans -// surfaceparm slick - cull none - surfaceparm nomarks // Added -// surfaceparm noimpact // by -// surfaceparm playerclip // Q - qer_trans 0.8 -// alphaFunc GE128 - - { - map models/xonotic_jumppad01/energy_red.tga - tcGen environment -// tcmod scale .6 .6 - blendfunc GL_ONE GL_ONE - tcMod turb 0 0.25 0 0.5 - tcMod scroll -.5 -.3 - } -} - -textures/xonotic_jumppad01/energy_blue_anim -{ - qer_editorimage models/xonotic_jumppad01/energy_blue.tga - nopicmip - surfaceparm nolightmap -// surfaceparm nonsolid - surfaceparm trans -// surfaceparm slick - cull none - surfaceparm nomarks // Added -// surfaceparm noimpact // by -// surfaceparm playerclip // Q - qer_trans 0.8 -// alphaFunc GE128 - - { - map models/xonotic_jumppad01/energy_blue.tga - tcGen environment -// tcmod scale .6 .6 - blendfunc GL_ONE GL_ONE - tcMod turb 0 0.25 0 0.5 - tcMod scroll -.5 -.3 - } -}