From: Rudolf Polzer Date: Tue, 11 May 2010 15:04:54 +0000 (+0200) Subject: get rid of redundant textures/ prefix in more shader and texture names X-Git-Tag: xonotic-v0.1.0preview~629^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=87c2164ec2518975794b37a880aa0c58ac66601f;p=xonotic%2Fxonotic-data.pk3dir.git get rid of redundant textures/ prefix in more shader and texture names --- diff --git a/models/weapons/g_seeker.md3 b/models/weapons/g_seeker.md3 index db25bf545..da02fb617 100644 Binary files a/models/weapons/g_seeker.md3 and b/models/weapons/g_seeker.md3 differ diff --git a/models/weapons/h_seeker.dpm b/models/weapons/h_seeker.dpm index dd94bbc46..d4cb641d3 100644 Binary files a/models/weapons/h_seeker.dpm and b/models/weapons/h_seeker.dpm differ diff --git a/models/weapons/v_seeker.md3 b/models/weapons/v_seeker.md3 index 8a21e6569..d6555162e 100644 Binary files a/models/weapons/v_seeker.md3 and b/models/weapons/v_seeker.md3 differ diff --git a/scripts/electro.shader b/scripts/electro.shader index 29fa15a3e..84fa24050 100644 --- a/scripts/electro.shader +++ b/scripts/electro.shader @@ -1,4 +1,4 @@ -textures/electro_plasma +electro_plasma { { map textures/electro_plasma.tga @@ -6,7 +6,7 @@ textures/electro_plasma } } -textures/electro_plasma_hull +electro_plasma_hull { { map textures/electro_plasma_hull.tga diff --git a/scripts/fireball.shader b/scripts/fireball.shader index aeed387ec..822be77f7 100644 --- a/scripts/fireball.shader +++ b/scripts/fireball.shader @@ -1,4 +1,4 @@ -textures/fireball +fireball { { map textures/fireball diff --git a/scripts/flags.shader b/scripts/flags.shader index 12ba575d3..1ed38d6cc 100644 --- a/scripts/flags.shader +++ b/scripts/flags.shader @@ -1,4 +1,4 @@ -textures/flags/flag_red_cloth { +flags/flag_red_cloth { cull none deformVertexes wave 100 sin 0 0.4 0 2.5 { @@ -6,7 +6,7 @@ textures/flags/flag_red_cloth { } } -textures/flags/flag_red_laser { +flags/flag_red_laser { { map textures/flags/flag_red_laser.tga tcMod scroll 0.2 -1 @@ -15,7 +15,7 @@ textures/flags/flag_red_laser { } -textures/flags/flag_blue_cloth { +flags/flag_blue_cloth { cull none deformVertexes wave 100 sin 0 0.4 0 2.5 { @@ -23,7 +23,7 @@ textures/flags/flag_blue_cloth { } } -textures/flags/flag_blue_laser { +flags/flag_blue_laser { { map textures/flags/flag_blue_laser.tga tcMod scroll 0.2 -1 diff --git a/scripts/portals.shader b/scripts/portals.shader index 9473c3ae0..08732b1e0 100644 --- a/scripts/portals.shader +++ b/scripts/portals.shader @@ -31,7 +31,7 @@ portals_inactive_vortex } } -textures/portals/portals_red +portals/portals_red { surfaceparm nonsolid { @@ -43,7 +43,7 @@ textures/portals/portals_red } } -textures/portals/portals_blue +portals/portals_blue { surfaceparm nonsolid { @@ -55,7 +55,7 @@ textures/portals/portals_blue } } -textures/portals/portals_inactive +portals/portals_inactive { surfaceparm nonsolid { diff --git a/scripts/shotgun.shader b/scripts/shotgun.shader index 039230427..6bd301b7a 100644 --- a/scripts/shotgun.shader +++ b/scripts/shotgun.shader @@ -1,4 +1,4 @@ -textures/shotgun_sight +shotgun_sight { surfaceparm trans diff --git a/scripts/tuba.shader b/scripts/tuba.shader index e5e0da415..c66a894b7 100644 --- a/scripts/tuba.shader +++ b/scripts/tuba.shader @@ -1,4 +1,4 @@ -textures/tuba +tuba { { map textures/tuba @@ -8,7 +8,7 @@ textures/tuba map $lightmap } } -textures/tuba_misc +tuba_misc { { map textures/tuba diff --git a/scripts/weapons.shader b/scripts/weapons.shader index 261fd93a6..ce83a5bfd 100644 --- a/scripts/weapons.shader +++ b/scripts/weapons.shader @@ -1,11 +1,3 @@ -textures/electro -{ - dpreflectcube cubemaps/default/sky - { - map textures/electro.tga - rgbgen lightingDiffuse - } -} electro { dpreflectcube cubemaps/default/sky @@ -14,15 +6,7 @@ electro rgbgen lightingDiffuse } } -textures/nexgun.tga -{ - dpreflectcube cubemaps/default/sky - { - map textures/nexgun.tga - rgbgen lightingDiffuse - } -} -nexgun.tga +nexgun { dpreflectcube cubemaps/default/sky { @@ -30,7 +14,7 @@ nexgun.tga rgbgen lightingDiffuse } } -textures/uzi.tga +uzi { dpreflectcube cubemaps/default/sky { @@ -38,7 +22,7 @@ textures/uzi.tga rgbgen lightingDiffuse } } -textures/glauncher +glauncher { dpreflectcube cubemaps/default/sky { @@ -46,7 +30,7 @@ textures/glauncher rgbgen lightingDiffuse } } -textures/hagar2.tga +hagar2 { dpreflectcube cubemaps/default/sky { @@ -54,7 +38,7 @@ textures/hagar2.tga rgbgen lightingDiffuse } } -textures/crylink.tga +crylink { dpreflectcube cubemaps/default/sky { @@ -62,15 +46,7 @@ textures/crylink.tga rgbgen lightingDiffuse } } -crylink.tga -{ - dpreflectcube cubemaps/default/sky - { - map textures/crylink.tga - rgbgen lightingDiffuse - } -} -textures/hlac_body.tga +hlac_body { dpreflectcube cubemaps/default/sky { @@ -78,7 +54,7 @@ textures/hlac_body.tga rgbgen lightingDiffuse } } -textures/hlac_accessory.tga +hlac_accessory { dpreflectcube cubemaps/default/sky { @@ -86,7 +62,7 @@ textures/hlac_accessory.tga rgbgen lightingDiffuse } } -textures/shotgun2 +shotgun2 { dpreflectcube cubemaps/default/sky { @@ -94,7 +70,7 @@ textures/shotgun2 rgbgen lightingDiffuse } } -textures/nex.tga +nex { dpreflectcube cubemaps/default/sky { @@ -102,7 +78,7 @@ textures/nex.tga rgbgen lightingDiffuse } } -textures/rl.tga +rl { dpreflectcube cubemaps/default/sky { @@ -110,35 +86,35 @@ textures/rl.tga rgbgen lightingDiffuse } } -marine +laser { dpreflectcube cubemaps/default/sky { - map textures/marine.tga + map textures/laser.tga rgbgen lightingDiffuse } } -laser.tga +hlac_accessory { dpreflectcube cubemaps/default/sky { - map textures/laser.tga + map textures/hlac_accessory.tga rgbgen lightingDiffuse } } -textures/hlac_accessory +hlac_body { dpreflectcube cubemaps/default/sky { - map textures/hlac_accessory.tga + map textures/hlac_body.tga rgbgen lightingDiffuse } } -textures/hlac_body +seeker { dpreflectcube cubemaps/default/sky { - map textures/hlac_body.tga + map textures/seeker.tga rgbgen lightingDiffuse } -} \ No newline at end of file +}