RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-05 10:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

Browse Source
This commit is contained in:
Rudolf Polzer 2011-04-16 19:05:45 +02:00
commit fe07dcce0e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc/tools/shadescript/shade.sh
View File

@ -41,26 +41,26 @@ find "textures/$1" -type f -path "textures/*/*/*.*" -not -name '*_norm.*' -not -
*water*)
noLightmap=true
isLiquid=true
shaderHead="$shaderHead surfaceparm trans\n surfaceparm water\n qer_trans 20\n"
shaderHead="$shaderHead surfaceparm trans$LF surfaceparm water$LF qer_trans 20$LF"
;;
*slime*)
noLightmap=true
isLiquid=true
shaderHead="$shaderHead surfaceparm trans\n surfaceparm slime\n qer_trans 20\n"
shaderHead="$shaderHead surfaceparm trans$LF surfaceparm slime$LF qer_trans 20$LF"
;;
*lava*)
noLightmap=true
isLiquid=true
shaderHead="$shaderHead surfaceparm trans\n surfaceparm lava\n qer_trans 20\n"
shaderHead="$shaderHead surfaceparm trans$LF surfaceparm lava$LF qer_trans 20$LF"
;;
*glass*)
noLightmap=true
shaderHead="$shaderHead surfaceparm trans\n"
diffuseExtra="$diffuseExtra blendfunc add\n"
shaderHead="$shaderHead surfaceparm trans$LF"
diffuseExtra="$diffuseExtra blendfunc add$LF"
;;
*metal*)
bounceScale=`echo "$bounceScale + 0.25" | bc -l`
shaderHead="$shaderHead surfaceparm metalsteps\n"
shaderHead="$shaderHead surfaceparm metalsteps$LF"
;;
esac
@ -68,8 +68,8 @@ find "textures/$1" -type f -path "textures/*/*/*.*" -not -name '*_norm.*' -not -
case "$F" in
*grate*)
bounceScale=`echo "$bounceScale + 0.25" | bc -l`
shaderHead="$shaderHead surfaceparm trans\n"
diffuseExtra="$diffuseExtra blendfunc blend\n"
shaderHead="$shaderHead surfaceparm trans$LF"
diffuseExtra="$diffuseExtra blendfunc blend$LF"
;;
esac
@ -82,7 +82,7 @@ find "textures/$1" -type f -path "textures/*/*/*.*" -not -name '*_norm.*' -not -
case "$F" in
*dirt*|*terrain*|*old*)
bounceScale=`echo "$bounceScale - 0.25" | bc -l`
shaderHead="$shaderHead surfaceparm dust\n"
shaderHead="$shaderHead surfaceparm dust$LF"
;;
esac
@ -98,13 +98,13 @@ find "textures/$1" -type f -path "textures/*/*/*.*" -not -name '*_norm.*' -not -
fi
if ! $noLightmap; then
shaderTail=" {\n map \$lightmap\n rgbGen identity\n tcGen lightmap\n blendfunc filter\n }"
shaderTail=" {$LF map \$lightmap$LF rgbGen identity$LF tcGen lightmap$LF blendfunc filter$LF }"
fi
case "$bounceScale" in
1|1.0|1.00)
;;
*)
shaderHead="$shaderHead q3map_bouncescale $bounceScale\n"
shaderHead="$shaderHead q3map_bouncescale $bounceScale$LF"
;;
esac

2
misc/tools/xonotic-map-compiler-autobuild
View File

@ -357,7 +357,7 @@ case "$1" in
runmakeindex
;;
download)
if ! cd data/xonotic-maps.pk3dir; then
if ! cd data/xonotic-maps.pk3dir >/dev/null 2>&1; then
echo "data/xonotic-maps.pk3dir does not exist, not downloading"
exit 0
fi