Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

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

diff --git a/scripts/turrets.shader b/scripts/turrets.shader
index c0d223c56689b93ab9c2eed0e84dbb3c8b7218e2..f407aba1536818066149dd82d120ce4ecdb073bb 100644 (file)
--- a/scripts/turrets.shader
+++ b/scripts/turrets.shader
@@ -1,57 +1,65 @@
-models/turrets/tesla_chrome\r
-{\r
-\r
-       qer_editorimage models/turrets/chrome.tga\r
-\r
-       //dp_reflect 0 0.75 0.75 1 0.5  \r
-       {\r
-               map models/turrets/chrome.tga   \r
-               rgbGen vertex\r
-               tcGen environment \r
-               tcMod scale 2 2\r
-               \r
-       }\r
-}\r
-\r
-models/turrets/phaser_beam\r
-{\r
-       surfaceparm trans\r
-       cull none\r
-       nopicmip\r
-\r
-       qer_editorimage models/turrets/phaser_beam\r
-       {               \r
-               map models/turrets/phaser_beam\r
-               blendFunc add\r
-       }\r
-\r
-}\r
-\r
-models/turrets/reactor_beams\r
-{\r
-       surfaceparm trans\r
-       cull none\r
-\r
-       qer_editorimage models/turrets/reactor\r
-       {               \r
-               map models/turrets/reactor\r
-               blendFunc add\r
-       }\r
-}\r
-\r
-models/turrets/r_fx1\r
-{\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       surfaceparm pointlight\r
-       surfaceparm nolightmap  \r
-       nopicmip\r
-       qer_editorimage models/turrets/r_fx1_1\r
-\r
-       {\r
-               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 \r
-       }\r
-\r
-}\r
-\r
-\r
+evil_basewall/mtl_gray
+{
+       {               
+               map textures/exx/base/base_metal01
+               rgbgen lightingDiffuse
+       }
+}
+
+models/turrets/tesla_chrome
+{
+
+       qer_editorimage models/turrets/chrome.tga
+
+       //dp_reflect 0 0.75 0.75 1 0.5  
+       {
+               map models/turrets/chrome.tga   
+               rgbGen vertex
+               tcGen environment 
+               tcMod scale 2 2
+               
+       }
+}
+
+models/turrets/phaser_beam
+{
+       surfaceparm trans
+       cull none
+       nopicmip
+
+       qer_editorimage models/turrets/phaser_beam
+       {               
+               map models/turrets/phaser_beam
+               blendFunc GL_SRC_ALPHA GL_ONE
+       }
+
+}
+
+models/turrets/reactor_beams
+{
+       surfaceparm trans
+       cull none
+
+       qer_editorimage models/turrets/reactor
+       {               
+               map models/turrets/reactor
+               blendFunc add
+       }
+}
+
+models/turrets/r_fx1
+{
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm pointlight
+       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 
+       }
+
+}
+
+