new laser model (needs testing)

diff --git a/models/weapons/g_laser.md3 b/models/weapons/g_laser.md3
index d1f168a61cfca337a173aaf03d38414cc3d26ce3..fd3f1e74a32950b2fa23247771c841d18445c160 100644 (file)
Binary files a/models/weapons/g_laser.md3 and b/models/weapons/g_laser.md3 differ

diff --git a/models/weapons/laser.tga b/models/weapons/laser.tga
new file mode 100644 (file)
index 0000000..2e49562
Binary files /dev/null and b/models/weapons/laser.tga differ

diff --git a/models/weapons/laser_gloss.tga b/models/weapons/laser_gloss.tga
new file mode 100644 (file)
index 0000000..fea4577
Binary files /dev/null and b/models/weapons/laser_gloss.tga differ

diff --git a/models/weapons/laser_glow.tga b/models/weapons/laser_glow.tga
new file mode 100644 (file)
index 0000000..8221e75
Binary files /dev/null and b/models/weapons/laser_glow.tga differ

diff --git a/models/weapons/laser_norm.tga b/models/weapons/laser_norm.tga
new file mode 100644 (file)
index 0000000..80f646a
Binary files /dev/null and b/models/weapons/laser_norm.tga differ

diff --git a/models/weapons/laser_reflect.tga b/models/weapons/laser_reflect.tga
new file mode 100644 (file)
index 0000000..8f9aca5
Binary files /dev/null and b/models/weapons/laser_reflect.tga differ

diff --git a/models/weapons/laser_shirt.tga b/models/weapons/laser_shirt.tga
new file mode 100644 (file)
index 0000000..3c42a16
Binary files /dev/null and b/models/weapons/laser_shirt.tga differ

diff --git a/models/weapons/v_laser.md3 b/models/weapons/v_laser.md3
index dc5e2674505c1f02c3652980c5e130f6ecce69c0..9e35e636feca4e7a524a14975090cc186f7d06ef 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ

diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index c093eb3334808095149715e2413d7ad8ef68f542..d9eac2bb90f14af51fee96ba0208bb8707841bd0 100644 (file)
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -70,11 +70,11 @@ rl
                rgbgen lightingDiffuse
        }
 }
-laser
+models/weapons/laser
 {
        dpreflectcube cubemaps/default/sky
        {
-               map textures/laser.tga
+               map models/weapons/laser.tga
                rgbgen lightingDiffuse
        }
 }

diff --git a/textures/laser.tga b/textures/laser.tga
deleted file mode 100644 (file)
index c0f2bc7..0000000
Binary files a/textures/laser.tga and /dev/null differ

diff --git a/textures/laser_bump.tga b/textures/laser_bump.tga
deleted file mode 100644 (file)
index 2180e6e..0000000
Binary files a/textures/laser_bump.tga and /dev/null differ

diff --git a/textures/laser_gloss.tga b/textures/laser_gloss.tga
deleted file mode 100644 (file)
index fc54840..0000000
Binary files a/textures/laser_gloss.tga and /dev/null differ

diff --git a/textures/laser_glow.tga b/textures/laser_glow.tga
deleted file mode 100644 (file)
index 90e32e7..0000000
Binary files a/textures/laser_glow.tga and /dev/null differ

diff --git a/textures/laser_shirt.tga b/textures/laser_shirt.tga
deleted file mode 100644 (file)
index 279c0e7..0000000
Binary files a/textures/laser_shirt.tga and /dev/null differ