From: Rudolf Polzer Date: Tue, 30 Nov 2010 17:09:51 +0000 (+0100) Subject: Squashed commit of the following: X-Git-Tag: xonotic-v0.1.0preview~20 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f3178e8eb1917ca0090c9bffd221c0d06543376;p=xonotic%2Fxonotic-maps.pk3dir.git Squashed commit of the following: commit cc4b5ab2428b284ff03a8c84ed0c7345f3b22902 Author: Rudolf Polzer Date: Tue Nov 30 18:07:28 2010 +0100 for X in */*_bump.tga; do echo "$X"; ~/Games/Xonotic/misc/tools/fft-normalmap-to-heightmap "$X" "${X%_bump.tga}_norm.tga" scharr3 -6 2; done commit 1e3a70e7752a9ac590150369c3e35eb064555269 Author: Rudolf Polzer Date: Tue Nov 30 18:06:57 2010 +0100 fix a bump file format commit bc4b77b9cfb123e0aed5e0fd6de91c9d9143cded Author: Rudolf Polzer Date: Tue Nov 30 18:02:35 2010 +0100 fix more of the mess commit 1d8a972861b9062f876fa6403d54af8c28269b17 Author: Rudolf Polzer Date: Tue Nov 30 18:00:16 2010 +0100 another buggy texture fixed commit 1c77b1bb56703ff39ea79c82988f149e084062f5 Author: Rudolf Polzer Date: Tue Nov 30 17:29:59 2010 +0100 fix my last fix commit b5f6c34ad071856251149b4429bb44ae3f929d18 Author: Rudolf Polzer Date: Tue Nov 30 17:23:51 2010 +0100 light_1: fix too commit 907aa89cc4e601c10796f1787e168834ebe96c31 Author: Rudolf Polzer Date: Tue Nov 30 17:18:38 2010 +0100 delete some really hard to fix ex2x textures (no map in master uses these) commit a49cd504db8132eb11c5c300cfaeb58f79091ca7 Author: Rudolf Polzer Date: Tue Nov 30 17:09:51 2010 +0100 more fixed bumps commit c27ff2298415a924034462468ba94178f9b09697 Author: Rudolf Polzer Date: Tue Nov 30 16:59:19 2010 +0100 fix some more textures commit 07edb984986ab6d6b32ca7bb0c33c40238d4cf4c Merge: c8ebdfb 7bdcba4 Author: Rudolf Polzer Date: Tue Nov 30 16:49:05 2010 +0100 Merge remote branch 'origin/fruitiex/stormkeep' into divVerent/ex2x-fixes23 commit c8ebdfb80807ef02a504f651a46aa6c1a211d554 Merge: 696b07c 5b0b940 Author: Rudolf Polzer Date: Tue Nov 30 16:46:43 2010 +0100 Merge branch 'master' into divVerent/ex2x-fixes23 commit 696b07c188109b3e341c34837b88f7508652f108 Author: Rudolf Polzer Date: Sun Oct 3 11:49:17 2010 +0200 wall_purple1 commit 181b58e3443dd4c1b46f35b7bab7f510ce286bc6 Author: Rudolf Polzer Date: Sun Oct 3 11:46:22 2010 +0200 trims too commit e08c858c41dc01e37bd3f73ef2955ebc2a88367e Author: Rudolf Polzer Date: Sun Oct 3 11:35:17 2010 +0200 improve the metal3 bump commit 57cfdb891e9b565a5fb0e06a71468f50df0f264a Author: Rudolf Polzer Date: Sun Oct 3 11:25:07 2010 +0200 remove the _norms that are borked anyway commit 5ac190a08e880059bab20ccb127b4379bce4d93f Author: Rudolf Polzer Date: Sun Oct 3 11:19:28 2010 +0200 base_stone_metal commit d304c4ac2007bd6e9cfa5a2d174bcd171e9b507c Author: Rudolf Polzer Date: Sun Oct 3 11:17:10 2010 +0200 more new bumps commit e1a5a4d83e4a38b7c095fafd266815963e808166 Author: Rudolf Polzer Date: Sun Oct 3 11:01:41 2010 +0200 base_metal2 commit c4e9671cc55054d34bc8225debae3589fea8b63d Author: Rudolf Polzer Date: Sun Oct 3 10:45:35 2010 +0200 metalmaterial commit 67bbdfab5eabf71e61ce90839aa34efe1b7819ca Author: Rudolf Polzer Date: Sun Oct 3 10:41:19 2010 +0200 some first bumpmaps generated "properly" --- diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader index 9de868cd..0de893da 100644 --- a/scripts/ex2x.shader +++ b/scripts/ex2x.shader @@ -299,50 +299,6 @@ textures/ex2x/floor-h4 map textures/ex2x/floor/floor_h4.tga - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/floor-metal1 -{ - qer_editorimage textures/ex2x/floor/floor_metal1.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/floor/floor_metal1.tga - - - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/floor-metal2 -{ - qer_editorimage textures/ex2x/floor/floor_metal2.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/floor/floor_metal2.tga - - } { map $lightmap @@ -365,28 +321,6 @@ textures/ex2x/floor-metal3 map textures/ex2x/floor/floor_metal3.tga - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/floor-p1 -{ - qer_editorimage textures/ex2x/floor/floor_p1.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/floor/floor_p1.tga - - } { map $lightmap @@ -439,51 +373,7 @@ textures/ex2x/floor-plate2 blendfunc filter } } -textures/ex2x/floor-r1 -{ - qer_editorimage textures/ex2x/floor/floor_r1.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/floor/floor_r1.tga - - - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/floor-rust1 -{ - qer_editorimage textures/ex2x/floor/floor_rust1.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/floor/floor_rust1.tga - - - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/light-1 +extures/ex2x/light-1 { qer_editorimage textures/ex2x/light/light_1.tga @@ -497,28 +387,6 @@ textures/ex2x/light-1 map textures/ex2x/light/light_1.tga - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/light-2 -{ - qer_editorimage textures/ex2x/light/light_2.tga - - q3map_bounceScale 0.75 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/light/light_2.tga - - } { map $lightmap @@ -609,50 +477,6 @@ textures/ex2x/trim-warn1 map textures/ex2x/trim/trim_warn1.tga - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/wall-green1 -{ - qer_editorimage textures/ex2x/wall/wall_green1.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/wall/wall_green1.tga - - - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} -textures/ex2x/wall-green1dirt -{ - qer_editorimage textures/ex2x/wall/wall_green1dirt.tga - - q3map_bounceScale 0.5 - dpoffsetmapping - 0.5 - dpglossintensitymod 3 - dpglossexponentmod 4 - - - { - map textures/ex2x/wall/wall_green1dirt.tga - - } { map $lightmap diff --git a/textures/ex2x/base/base_bluepaint_norm.tga b/textures/ex2x/base/base_bluepaint_norm.tga index 1327878d..8b645811 100644 Binary files a/textures/ex2x/base/base_bluepaint_norm.tga and b/textures/ex2x/base/base_bluepaint_norm.tga differ diff --git a/textures/ex2x/base/base_chainlink_norm.tga b/textures/ex2x/base/base_chainlink_norm.tga index ee5d8aef..6d15a723 100644 Binary files a/textures/ex2x/base/base_chainlink_norm.tga and b/textures/ex2x/base/base_chainlink_norm.tga differ diff --git a/textures/ex2x/base/base_metal1_norm.tga b/textures/ex2x/base/base_metal1_norm.tga index 589e4543..e172b103 100644 Binary files a/textures/ex2x/base/base_metal1_norm.tga and b/textures/ex2x/base/base_metal1_norm.tga differ diff --git a/textures/ex2x/base/base_metal2_norm.tga b/textures/ex2x/base/base_metal2_norm.tga index 8e37f9ab..9d68a624 100644 Binary files a/textures/ex2x/base/base_metal2_norm.tga and b/textures/ex2x/base/base_metal2_norm.tga differ diff --git a/textures/ex2x/base/base_metal3_norm.tga b/textures/ex2x/base/base_metal3_norm.tga index 11780e3c..144ed7d8 100644 Binary files a/textures/ex2x/base/base_metal3_norm.tga and b/textures/ex2x/base/base_metal3_norm.tga differ diff --git a/textures/ex2x/base/base_metal4_norm.tga b/textures/ex2x/base/base_metal4_norm.tga index f3f15a2b..4835810e 100644 Binary files a/textures/ex2x/base/base_metal4_norm.tga and b/textures/ex2x/base/base_metal4_norm.tga differ diff --git a/textures/ex2x/base/base_metalmaterial1_norm.tga b/textures/ex2x/base/base_metalmaterial1_norm.tga new file mode 100644 index 00000000..9cba270f Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1_norm.tga differ diff --git a/textures/ex2x/base/base_stone_metal_norm.tga b/textures/ex2x/base/base_stone_metal_norm.tga index 6524e1d5..8fdc3564 100644 Binary files a/textures/ex2x/base/base_stone_metal_norm.tga and b/textures/ex2x/base/base_stone_metal_norm.tga differ diff --git a/textures/ex2x/base/base_yellowpaint_norm.tga b/textures/ex2x/base/base_yellowpaint_norm.tga index 387378a8..5d98ee5b 100644 Binary files a/textures/ex2x/base/base_yellowpaint_norm.tga and b/textures/ex2x/base/base_yellowpaint_norm.tga differ diff --git a/textures/ex2x/floor/floor_1_norm.tga b/textures/ex2x/floor/floor_1_norm.tga index 4187af7c..8d966345 100644 Binary files a/textures/ex2x/floor/floor_1_norm.tga and b/textures/ex2x/floor/floor_1_norm.tga differ diff --git a/textures/ex2x/floor/floor_h1_norm.tga b/textures/ex2x/floor/floor_h1_norm.tga index 155959ee..b0f3fccc 100644 Binary files a/textures/ex2x/floor/floor_h1_norm.tga and b/textures/ex2x/floor/floor_h1_norm.tga differ diff --git a/textures/ex2x/floor/floor_h2_norm.tga b/textures/ex2x/floor/floor_h2_norm.tga index ce7e4e2a..0e590311 100644 Binary files a/textures/ex2x/floor/floor_h2_norm.tga and b/textures/ex2x/floor/floor_h2_norm.tga differ diff --git a/textures/ex2x/floor/floor_h3_norm.tga b/textures/ex2x/floor/floor_h3_norm.tga index e91e1ae4..4cb90d98 100644 Binary files a/textures/ex2x/floor/floor_h3_norm.tga and b/textures/ex2x/floor/floor_h3_norm.tga differ diff --git a/textures/ex2x/floor/floor_h4_norm.tga b/textures/ex2x/floor/floor_h4_norm.tga index 61d1f33f..67a493be 100644 Binary files a/textures/ex2x/floor/floor_h4_norm.tga and b/textures/ex2x/floor/floor_h4_norm.tga differ diff --git a/textures/ex2x/floor/floor_metal1.tga b/textures/ex2x/floor/floor_metal1.tga deleted file mode 100644 index efc01f09..00000000 Binary files a/textures/ex2x/floor/floor_metal1.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal1_gloss.tga b/textures/ex2x/floor/floor_metal1_gloss.tga deleted file mode 100644 index f3cd3da8..00000000 Binary files a/textures/ex2x/floor/floor_metal1_gloss.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal1_norm.tga b/textures/ex2x/floor/floor_metal1_norm.tga deleted file mode 100644 index 0973a3c9..00000000 Binary files a/textures/ex2x/floor/floor_metal1_norm.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal2.tga b/textures/ex2x/floor/floor_metal2.tga deleted file mode 100644 index dc10d515..00000000 Binary files a/textures/ex2x/floor/floor_metal2.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal2_gloss.tga b/textures/ex2x/floor/floor_metal2_gloss.tga deleted file mode 100644 index 1147b7b1..00000000 Binary files a/textures/ex2x/floor/floor_metal2_gloss.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal2_norm.tga b/textures/ex2x/floor/floor_metal2_norm.tga deleted file mode 100644 index 2c2c6fd1..00000000 Binary files a/textures/ex2x/floor/floor_metal2_norm.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_metal3_norm.tga b/textures/ex2x/floor/floor_metal3_norm.tga index 589e78d6..dc667ed4 100644 Binary files a/textures/ex2x/floor/floor_metal3_norm.tga and b/textures/ex2x/floor/floor_metal3_norm.tga differ diff --git a/textures/ex2x/floor/floor_p1.tga b/textures/ex2x/floor/floor_p1.tga deleted file mode 100644 index 775be14f..00000000 Binary files a/textures/ex2x/floor/floor_p1.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_p1_gloss.tga b/textures/ex2x/floor/floor_p1_gloss.tga deleted file mode 100644 index caf6e511..00000000 Binary files a/textures/ex2x/floor/floor_p1_gloss.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_p1_norm.tga b/textures/ex2x/floor/floor_p1_norm.tga deleted file mode 100644 index 038e7f8e..00000000 Binary files a/textures/ex2x/floor/floor_p1_norm.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_plate1_norm.tga b/textures/ex2x/floor/floor_plate1_norm.tga index 6bc97084..83c42ae2 100644 Binary files a/textures/ex2x/floor/floor_plate1_norm.tga and b/textures/ex2x/floor/floor_plate1_norm.tga differ diff --git a/textures/ex2x/floor/floor_plate2_norm.tga b/textures/ex2x/floor/floor_plate2_norm.tga index add111ec..8186ce0a 100644 Binary files a/textures/ex2x/floor/floor_plate2_norm.tga and b/textures/ex2x/floor/floor_plate2_norm.tga differ diff --git a/textures/ex2x/floor/floor_r1.tga b/textures/ex2x/floor/floor_r1.tga deleted file mode 100644 index 1d922273..00000000 Binary files a/textures/ex2x/floor/floor_r1.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_r1_gloss.tga b/textures/ex2x/floor/floor_r1_gloss.tga deleted file mode 100644 index 57b2692e..00000000 Binary files a/textures/ex2x/floor/floor_r1_gloss.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_r1_norm.tga b/textures/ex2x/floor/floor_r1_norm.tga deleted file mode 100644 index 7ab0a31e..00000000 Binary files a/textures/ex2x/floor/floor_r1_norm.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_rust1.tga b/textures/ex2x/floor/floor_rust1.tga deleted file mode 100644 index 120cf66b..00000000 Binary files a/textures/ex2x/floor/floor_rust1.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_rust1_gloss.tga b/textures/ex2x/floor/floor_rust1_gloss.tga deleted file mode 100644 index 777547bf..00000000 Binary files a/textures/ex2x/floor/floor_rust1_gloss.tga and /dev/null differ diff --git a/textures/ex2x/floor/floor_rust1_norm.tga b/textures/ex2x/floor/floor_rust1_norm.tga deleted file mode 100644 index 6ae99c1d..00000000 Binary files a/textures/ex2x/floor/floor_rust1_norm.tga and /dev/null differ diff --git a/textures/ex2x/light/light_1_norm.tga b/textures/ex2x/light/light_1_norm.tga index c3ef0a74..5083dda2 100644 Binary files a/textures/ex2x/light/light_1_norm.tga and b/textures/ex2x/light/light_1_norm.tga differ diff --git a/textures/ex2x/light/light_2.tga b/textures/ex2x/light/light_2.tga deleted file mode 100644 index 41e93795..00000000 Binary files a/textures/ex2x/light/light_2.tga and /dev/null differ diff --git a/textures/ex2x/light/light_2_gloss.tga b/textures/ex2x/light/light_2_gloss.tga deleted file mode 100644 index df3c4a8f..00000000 Binary files a/textures/ex2x/light/light_2_gloss.tga and /dev/null differ diff --git a/textures/ex2x/light/light_2_glow.tga b/textures/ex2x/light/light_2_glow.tga deleted file mode 100644 index 7cedd91b..00000000 Binary files a/textures/ex2x/light/light_2_glow.tga and /dev/null differ diff --git a/textures/ex2x/light/light_2_norm.tga b/textures/ex2x/light/light_2_norm.tga deleted file mode 100644 index 3b7b1504..00000000 Binary files a/textures/ex2x/light/light_2_norm.tga and /dev/null differ diff --git a/textures/ex2x/light/light_beam_blue_norm.tga b/textures/ex2x/light/light_beam_blue_norm.tga index 17e0ad86..f179cb67 100644 Binary files a/textures/ex2x/light/light_beam_blue_norm.tga and b/textures/ex2x/light/light_beam_blue_norm.tga differ diff --git a/textures/ex2x/light/light_beam_red_norm.tga b/textures/ex2x/light/light_beam_red_norm.tga index 17e0ad86..f179cb67 100644 Binary files a/textures/ex2x/light/light_beam_red_norm.tga and b/textures/ex2x/light/light_beam_red_norm.tga differ diff --git a/textures/ex2x/trim/trim_green2_norm.tga b/textures/ex2x/trim/trim_green2_norm.tga index 39c3b07b..e290bedb 100644 Binary files a/textures/ex2x/trim/trim_green2_norm.tga and b/textures/ex2x/trim/trim_green2_norm.tga differ diff --git a/textures/ex2x/trim/trim_warn1_norm.tga b/textures/ex2x/trim/trim_warn1_norm.tga index a6eaabc1..d5b75d06 100644 Binary files a/textures/ex2x/trim/trim_warn1_norm.tga and b/textures/ex2x/trim/trim_warn1_norm.tga differ diff --git a/textures/ex2x/wall/wall_green1.tga b/textures/ex2x/wall/wall_green1.tga deleted file mode 100644 index 0d1c9d8a..00000000 Binary files a/textures/ex2x/wall/wall_green1.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_green1_gloss.tga b/textures/ex2x/wall/wall_green1_gloss.tga deleted file mode 100644 index a74323b4..00000000 Binary files a/textures/ex2x/wall/wall_green1_gloss.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_green1_norm.tga b/textures/ex2x/wall/wall_green1_norm.tga deleted file mode 100644 index bf9f1da4..00000000 Binary files a/textures/ex2x/wall/wall_green1_norm.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_green1dirt.tga b/textures/ex2x/wall/wall_green1dirt.tga deleted file mode 100644 index ab0df41f..00000000 Binary files a/textures/ex2x/wall/wall_green1dirt.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_green1dirt_gloss.tga b/textures/ex2x/wall/wall_green1dirt_gloss.tga deleted file mode 100644 index a74323b4..00000000 Binary files a/textures/ex2x/wall/wall_green1dirt_gloss.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_green1dirt_norm.tga b/textures/ex2x/wall/wall_green1dirt_norm.tga deleted file mode 100644 index 694ba6ec..00000000 Binary files a/textures/ex2x/wall/wall_green1dirt_norm.tga and /dev/null differ diff --git a/textures/ex2x/wall/wall_purple1_norm.tga b/textures/ex2x/wall/wall_purple1_norm.tga index ac7c276d..abee33e5 100644 Binary files a/textures/ex2x/wall/wall_purple1_norm.tga and b/textures/ex2x/wall/wall_purple1_norm.tga differ