From: LegendaryGuard <rootuser999@gmail.com>
Date: Fri, 30 Dec 2022 15:52:02 +0000 (+0100)
Subject: Add comments in the shader scripts about model materials and rename some shader scripts
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff519e2bf977903ed134133d8ad281b1668b4d57;p=xonotic%2Fxonotic-data.pk3dir.git

Add comments in the shader scripts about model materials and rename some shader scripts
---

diff --git a/scripts/devastator.shader b/scripts/devastator.shader
new file mode 100644
index 000000000..ddb12890d
--- /dev/null
+++ b/scripts/devastator.shader
@@ -0,0 +1,18 @@
+RL // devastator
+{
+	dpreflectcube cubemaps/default/sky
+	{
+		map textures/rl_new.tga
+		rgbgen lightingDiffuse
+	}
+}
+RocketThrust // devastator_rocket
+{
+	cull none
+	{
+	animMap 50 textures/rl_trust01.tga textures/rl_trust02.tga textures/rl_trust03.tga textures/rl_trust04.tga
+	blendFunc GL_ONE GL_ONE
+	rgbGen wave sawtooth 0 1 0 10
+	}
+
+}
diff --git a/scripts/gl.shader b/scripts/gl.shader
deleted file mode 100644
index c5ff5dcc7..000000000
--- a/scripts/gl.shader
+++ /dev/null
@@ -1,16 +0,0 @@
-grenadelauncher
-{
-	dpreflectcube cubemaps/default/sky
-	{
-		map textures/grenadelauncher.tga
-		rgbgen lightingDiffuse
-	}
-}
-grenadelauncher_sight
-{
-	{
-	animMap 1 textures/glsight01.tga textures/glsight02.tga textures/glsight03.tga
-	blendFunc GL_ONE GL_ONE
-	rgbGen wave sawtooth 0 1 0 10
-	}
-}
diff --git a/scripts/mnex.shader b/scripts/mnex.shader
deleted file mode 100644
index 835eb6d62..000000000
--- a/scripts/mnex.shader
+++ /dev/null
@@ -1,10 +0,0 @@
-MNex-Diffuse
-{
-	dpglossexponentmod 64
-	dpreflectcube env/exomorph/exomorph
-	dpoffsetmapping - 0.125 match8 128
-	{
-		map models/weapons/mnex.tga
-		rgbgen lightingDiffuse
-	}
-}
diff --git a/scripts/mortar.shader b/scripts/mortar.shader
new file mode 100644
index 000000000..5292f3893
--- /dev/null
+++ b/scripts/mortar.shader
@@ -0,0 +1,16 @@
+grenadelauncher // mortar
+{
+	dpreflectcube cubemaps/default/sky
+	{
+		map textures/grenadelauncher.tga
+		rgbgen lightingDiffuse
+	}
+}
+grenadelauncher_sight  // mortar_sight
+{
+	{
+	animMap 1 textures/glsight01.tga textures/glsight02.tga textures/glsight03.tga
+	blendFunc GL_ONE GL_ONE
+	rgbGen wave sawtooth 0 1 0 10
+	}
+}
diff --git a/scripts/okweapons.shader b/scripts/okweapons.shader
index 95057f006..895dc237a 100644
--- a/scripts/okweapons.shader
+++ b/scripts/okweapons.shader
@@ -1,4 +1,4 @@
-OK_SMG
+OK_SMG // ok_mg
 {
 	dpglossexponentmod 64
 	dpreflectcube env/exomorph/exomorph
@@ -8,7 +8,7 @@ OK_SMG
 	}
 }
 
-OK_Railgun
+OK_Railgun // ok_nex
 {
 	dpglossexponentmod 64
 	dpreflectcube env/exomorph/exomorph
@@ -39,7 +39,7 @@ minsta
 	}
 }
 
-okrocketthrust
+okrocketthrust // ok_rpc rocket
 {
 	deformVertexes autosprite2
 	cull none
@@ -50,7 +50,7 @@ okrocketthrust
 	}
 }
 
-okrocketthrust2
+okrocketthrust2 // ok_rpc rocketthrust2
 {
 	deformVertexes autosprite
 	{
diff --git a/scripts/rl.shader b/scripts/rl.shader
deleted file mode 100644
index d016c17ed..000000000
--- a/scripts/rl.shader
+++ /dev/null
@@ -1,18 +0,0 @@
-RL
-{
-	dpreflectcube cubemaps/default/sky
-	{
-		map textures/rl_new.tga
-		rgbgen lightingDiffuse
-	}
-}
-RocketThrust
-{
-	cull none
-	{
-	animMap 50 textures/rl_trust01.tga textures/rl_trust02.tga textures/rl_trust03.tga textures/rl_trust04.tga
-	blendFunc GL_ONE GL_ONE
-	rgbGen wave sawtooth 0 1 0 10
-	}
-
-}
diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index fcc9d3c64..7da5d608d 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,20 +1,21 @@
 domination
+devastator
 electro
 fireball
 flags
-gl
 hlac
 model-common
+mortar
 onslaught
 portals
 pyria
-rl
 shotgun
 spiderbot
 teamfx
 tree
 tuba
 turrets
+vaporizer
 weapons
 monsters
 ok_nade_counter
diff --git a/scripts/vaporizer.shader b/scripts/vaporizer.shader
new file mode 100644
index 000000000..478f291d0
--- /dev/null
+++ b/scripts/vaporizer.shader
@@ -0,0 +1,10 @@
+MNex-Diffuse // vaporizer
+{
+	dpglossexponentmod 64
+	dpreflectcube env/exomorph/exomorph
+	dpoffsetmapping - 0.125 match8 128
+	{
+		map models/weapons/mnex.tga
+		rgbgen lightingDiffuse
+	}
+}
diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index e2df34813..41e7f9040 100644
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -1,4 +1,4 @@
-nexgun
+nexgun // vortex
 {
 	dpreflectcube cubemaps/default/sky
  	dpoffsetmapping - 0.3 match8 64
@@ -7,7 +7,7 @@ nexgun
 		rgbgen lightingDiffuse
 	}
 }
-uzi
+uzi // machinegun
 {
 	dpreflectcube cubemaps/default/sky
  	{
@@ -39,7 +39,7 @@ shotgun2
 		rgbgen lightingDiffuse
 	}
 }
-models/weapons/laser
+models/weapons/laser // blaster
 {
 	dpreflectcube cubemaps/default/sky
  	{
@@ -87,7 +87,7 @@ shotgun
 		rgbgen lightingDiffuse
 	}
 }
-SniperRifle
+SniperRifle // rifle
 {
 	dpreflectcube cubemaps/default/sky
  	{