From: Rudolf Polzer Date: Wed, 7 Sep 2011 07:26:47 +0000 (+0200) Subject: new laser model (needs testing) X-Git-Tag: xonotic-v0.6.0~68^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5cb100633efaef27b6d39f8e96796536ed528438;p=xonotic%2Fxonotic-data.pk3dir.git new laser model (needs testing) --- diff --git a/models/weapons/g_laser.md3 b/models/weapons/g_laser.md3 index d1f168a61..fd3f1e74a 100644 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 index 000000000..2e49562fc 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 index 000000000..fea457708 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 index 000000000..8221e7532 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 index 000000000..80f646a40 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 index 000000000..8f9aca5e9 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 index 000000000..3c42a1606 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 dc5e26745..9e35e636f 100644 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 c093eb333..d9eac2bb9 100644 --- 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 index c0f2bc78c..000000000 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 index 2180e6ec8..000000000 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 index fc548404b..000000000 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 index 90e32e723..000000000 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 index 279c0e7fb..000000000 Binary files a/textures/laser_shirt.tga and /dev/null differ