From: Morphed <morphed@o2.pl>
Date: Fri, 2 Mar 2012 20:21:24 +0000 (+0100)
Subject: I remade first person laser animations and its now centered when player wants it
X-Git-Tag: xonotic-v0.6.0~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bf6ba1fc66de6b8fe2e8c2a6d1f6f5384720eed;p=xonotic%2Fxonotic-data.pk3dir.git

I remade first person laser animations and its now centered when player wants it
---

diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
index 25fefcaf8..f2ef53637 100644
Binary files a/models/weapons/h_laser.iqm and b/models/weapons/h_laser.iqm differ
diff --git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups
index 0a59625b6..5b1ac992e 100644
--- a/models/weapons/h_laser.iqm.framegroups
+++ b/models/weapons/h_laser.iqm.framegroups
@@ -1,4 +1,10 @@
-1 8 20 0 // fire
-9 5 20 0 // fire2
-15 200 20 1 // idle
-215 40 20 0 // reload
+/*
+Generated framegroups file for h_laser
+Used by DarkPlaces to simulate frame groups in DPM models.
+*/
+
+1 16 30 0 // h_laser mgafire
+17 16 30 0 // h_laser mgafire
+33 101 5 1 // h_laser mgaidle
+134 61 30 1 // h_laser mgareload
+195 61 30 1 // h_laser mgamelee
diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 5a2532e64..dfbbd5e8a 100644
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -65,6 +65,16 @@ rl
 models/weapons/laser
 {
 	dpreflectcube cubemaps/default/sky
+    dpoffsetmapping - 0.25 match8 128
+ 	{
+		map models/weapons/laser.tga
+		rgbgen lightingDiffuse
+	}
+}
+laser
+{
+	dpreflectcube cubemaps/default/sky
+	dpoffsetmapping - 0.25 match8 128
  	{
 		map models/weapons/laser.tga
 		rgbgen lightingDiffuse