Merge branch 'master' into develop

[xonotic/xonotic-data.pk3dir.git] / scripts / turrets.shader

diff --git a/scripts/turrets.shader b/scripts/turrets.shader
index f407aba1536818066149dd82d120ce4ecdb073bb..a31bd59b79b0d8ba0e6ec41e52a03f2838c8ad5c 100644 (file)
--- a/scripts/turrets.shader
+++ b/scripts/turrets.shader
@@ -1,6 +1,6 @@
 evil_basewall/mtl_gray
 {
-       {               
+       {
                map textures/exx/base/base_metal01
                rgbgen lightingDiffuse
        }
@@ -8,16 +8,14 @@ evil_basewall/mtl_gray
 
 models/turrets/tesla_chrome
 {
-
        qer_editorimage models/turrets/chrome.tga
 
-       //dp_reflect 0 0.75 0.75 1 0.5  
+       //dp_reflect 0 0.75 0.75 1 0.5
        {
-               map models/turrets/chrome.tga   
+               map models/turrets/chrome.tga
                rgbGen vertex
-               tcGen environment 
+               tcGen environment
                tcMod scale 2 2
-               
        }
 }
 
@@ -28,11 +26,10 @@ models/turrets/phaser_beam
        nopicmip
 
        qer_editorimage models/turrets/phaser_beam
-       {               
+       {
                map models/turrets/phaser_beam
                blendFunc GL_SRC_ALPHA GL_ONE
        }
-
 }
 
 models/turrets/reactor_beams
@@ -41,7 +38,7 @@ models/turrets/reactor_beams
        cull none
 
        qer_editorimage models/turrets/reactor
-       {               
+       {
                map models/turrets/reactor
                blendFunc add
        }
@@ -52,14 +49,11 @@ models/turrets/r_fx1
        surfaceparm nomarks
        surfaceparm trans
        surfaceparm pointlight
-       surfaceparm nolightmap  
+       surfaceparm nolightmap
        nopicmip
        qer_editorimage models/turrets/r_fx1_1
 
        {
-               animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 
+               animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2 models/turrets/r_fx1_1 models/turrets/r_fx1_2
        }
-
 }
-
-