Squashed commit of the following:
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 17:09:51 +0000 (18:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 17:09:51 +0000 (18:09 +0100)
commit cc4b5ab2428b284ff03a8c84ed0c7345f3b22902
Author: Rudolf Polzer <divverent@alientrap.org>
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 <divverent@alientrap.org>
Date:   Tue Nov 30 18:06:57 2010 +0100

    fix a bump file format

commit bc4b77b9cfb123e0aed5e0fd6de91c9d9143cded
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:02:35 2010 +0100

    fix more of the mess

commit 1d8a972861b9062f876fa6403d54af8c28269b17
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 18:00:16 2010 +0100

    another buggy texture fixed

commit 1c77b1bb56703ff39ea79c82988f149e084062f5
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:29:59 2010 +0100

    fix my last fix

commit b5f6c34ad071856251149b4429bb44ae3f929d18
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 17:23:51 2010 +0100

    light_1: fix too

commit 907aa89cc4e601c10796f1787e168834ebe96c31
Author: Rudolf Polzer <divverent@alientrap.org>
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 <divverent@alientrap.org>
Date:   Tue Nov 30 17:09:51 2010 +0100

    more fixed bumps

commit c27ff2298415a924034462468ba94178f9b09697
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Nov 30 16:59:19 2010 +0100

    fix some more textures

commit 07edb984986ab6d6b32ca7bb0c33c40238d4cf4c
Merge: c8ebdfb 7bdcba4
Author: Rudolf Polzer <divverent@alientrap.org>
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 <divverent@alientrap.org>
Date:   Tue Nov 30 16:46:43 2010 +0100

    Merge branch 'master' into divVerent/ex2x-fixes23

commit 696b07c188109b3e341c34837b88f7508652f108
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:49:17 2010 +0200

    wall_purple1

commit 181b58e3443dd4c1b46f35b7bab7f510ce286bc6
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:46:22 2010 +0200

    trims too

commit e08c858c41dc01e37bd3f73ef2955ebc2a88367e
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:35:17 2010 +0200

    improve the metal3 bump

commit 57cfdb891e9b565a5fb0e06a71468f50df0f264a
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:25:07 2010 +0200

    remove the _norms that are borked anyway

commit 5ac190a08e880059bab20ccb127b4379bce4d93f
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:19:28 2010 +0200

    base_stone_metal

commit d304c4ac2007bd6e9cfa5a2d174bcd171e9b507c
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:17:10 2010 +0200

    more new bumps

commit e1a5a4d83e4a38b7c095fafd266815963e808166
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 11:01:41 2010 +0200

    base_metal2

commit c4e9671cc55054d34bc8225debae3589fea8b63d
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:45:35 2010 +0200

    metalmaterial

commit 67bbdfab5eabf71e61ce90839aa34efe1b7819ca
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sun Oct 3 10:41:19 2010 +0200

    some first bumpmaps generated "properly"

49 files changed:
scripts/ex2x.shader
textures/ex2x/base/base_bluepaint_norm.tga
textures/ex2x/base/base_chainlink_norm.tga
textures/ex2x/base/base_metal1_norm.tga
textures/ex2x/base/base_metal2_norm.tga
textures/ex2x/base/base_metal3_norm.tga
textures/ex2x/base/base_metal4_norm.tga
textures/ex2x/base/base_metalmaterial1_norm.tga [new file with mode: 0644]
textures/ex2x/base/base_stone_metal_norm.tga
textures/ex2x/base/base_yellowpaint_norm.tga
textures/ex2x/floor/floor_1_norm.tga
textures/ex2x/floor/floor_h1_norm.tga
textures/ex2x/floor/floor_h2_norm.tga
textures/ex2x/floor/floor_h3_norm.tga
textures/ex2x/floor/floor_h4_norm.tga
textures/ex2x/floor/floor_metal1.tga [deleted file]
textures/ex2x/floor/floor_metal1_gloss.tga [deleted file]
textures/ex2x/floor/floor_metal1_norm.tga [deleted file]
textures/ex2x/floor/floor_metal2.tga [deleted file]
textures/ex2x/floor/floor_metal2_gloss.tga [deleted file]
textures/ex2x/floor/floor_metal2_norm.tga [deleted file]
textures/ex2x/floor/floor_metal3_norm.tga
textures/ex2x/floor/floor_p1.tga [deleted file]
textures/ex2x/floor/floor_p1_gloss.tga [deleted file]
textures/ex2x/floor/floor_p1_norm.tga [deleted file]
textures/ex2x/floor/floor_plate1_norm.tga
textures/ex2x/floor/floor_plate2_norm.tga
textures/ex2x/floor/floor_r1.tga [deleted file]
textures/ex2x/floor/floor_r1_gloss.tga [deleted file]
textures/ex2x/floor/floor_r1_norm.tga [deleted file]
textures/ex2x/floor/floor_rust1.tga [deleted file]
textures/ex2x/floor/floor_rust1_gloss.tga [deleted file]
textures/ex2x/floor/floor_rust1_norm.tga [deleted file]
textures/ex2x/light/light_1_norm.tga
textures/ex2x/light/light_2.tga [deleted file]
textures/ex2x/light/light_2_gloss.tga [deleted file]
textures/ex2x/light/light_2_glow.tga [deleted file]
textures/ex2x/light/light_2_norm.tga [deleted file]
textures/ex2x/light/light_beam_blue_norm.tga
textures/ex2x/light/light_beam_red_norm.tga
textures/ex2x/trim/trim_green2_norm.tga
textures/ex2x/trim/trim_warn1_norm.tga
textures/ex2x/wall/wall_green1.tga [deleted file]
textures/ex2x/wall/wall_green1_gloss.tga [deleted file]
textures/ex2x/wall/wall_green1_norm.tga [deleted file]
textures/ex2x/wall/wall_green1dirt.tga [deleted file]
textures/ex2x/wall/wall_green1dirt_gloss.tga [deleted file]
textures/ex2x/wall/wall_green1dirt_norm.tga [deleted file]
textures/ex2x/wall/wall_purple1_norm.tga

index 9de868c..0de893d 100644 (file)
@@ -307,50 +307,6 @@ textures/ex2x/floor-h4
                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
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
 textures/ex2x/floor-metal3
 {
        qer_editorimage textures/ex2x/floor/floor_metal3.tga
@@ -373,28 +329,6 @@ textures/ex2x/floor-metal3
                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
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
 textures/ex2x/floor-plate1
 {
        qer_editorimage textures/ex2x/floor/floor_plate1.tga
@@ -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
        
@@ -505,28 +395,6 @@ textures/ex2x/light-1
                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
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
 textures/ex2x/light-beam_blue
 {
        qer_editorimage textures/ex2x/light/light_beam_blue.tga
@@ -617,50 +485,6 @@ textures/ex2x/trim-warn1
                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
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
 textures/ex2x/wall-purple1
 {
        qer_editorimage textures/ex2x/wall/wall_purple1.tga
index 1327878..8b64581 100644 (file)
Binary files a/textures/ex2x/base/base_bluepaint_norm.tga and b/textures/ex2x/base/base_bluepaint_norm.tga differ
index ee5d8ae..6d15a72 100644 (file)
Binary files a/textures/ex2x/base/base_chainlink_norm.tga and b/textures/ex2x/base/base_chainlink_norm.tga differ
index 589e454..e172b10 100644 (file)
Binary files a/textures/ex2x/base/base_metal1_norm.tga and b/textures/ex2x/base/base_metal1_norm.tga differ
index 8e37f9a..9d68a62 100644 (file)
Binary files a/textures/ex2x/base/base_metal2_norm.tga and b/textures/ex2x/base/base_metal2_norm.tga differ
index 11780e3..144ed7d 100644 (file)
Binary files a/textures/ex2x/base/base_metal3_norm.tga and b/textures/ex2x/base/base_metal3_norm.tga differ
index f3f15a2..4835810 100644 (file)
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 (file)
index 0000000..9cba270
Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1_norm.tga differ
index 6524e1d..8fdc356 100644 (file)
Binary files a/textures/ex2x/base/base_stone_metal_norm.tga and b/textures/ex2x/base/base_stone_metal_norm.tga differ
index 387378a..5d98ee5 100644 (file)
Binary files a/textures/ex2x/base/base_yellowpaint_norm.tga and b/textures/ex2x/base/base_yellowpaint_norm.tga differ
index 4187af7..8d96634 100644 (file)
Binary files a/textures/ex2x/floor/floor_1_norm.tga and b/textures/ex2x/floor/floor_1_norm.tga differ
index 155959e..b0f3fcc 100644 (file)
Binary files a/textures/ex2x/floor/floor_h1_norm.tga and b/textures/ex2x/floor/floor_h1_norm.tga differ
index ce7e4e2..0e59031 100644 (file)
Binary files a/textures/ex2x/floor/floor_h2_norm.tga and b/textures/ex2x/floor/floor_h2_norm.tga differ
index e91e1ae..4cb90d9 100644 (file)
Binary files a/textures/ex2x/floor/floor_h3_norm.tga and b/textures/ex2x/floor/floor_h3_norm.tga differ
index 61d1f33..67a493b 100644 (file)
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 (file)
index efc01f0..0000000
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 (file)
index f3cd3da..0000000
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 (file)
index 0973a3c..0000000
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 (file)
index dc10d51..0000000
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 (file)
index 1147b7b..0000000
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 (file)
index 2c2c6fd..0000000
Binary files a/textures/ex2x/floor/floor_metal2_norm.tga and /dev/null differ
index 589e78d..dc667ed 100644 (file)
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 (file)
index 775be14..0000000
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 (file)
index caf6e51..0000000
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 (file)
index 038e7f8..0000000
Binary files a/textures/ex2x/floor/floor_p1_norm.tga and /dev/null differ
index 6bc9708..83c42ae 100644 (file)
Binary files a/textures/ex2x/floor/floor_plate1_norm.tga and b/textures/ex2x/floor/floor_plate1_norm.tga differ
index add111e..8186ce0 100644 (file)
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 (file)
index 1d92227..0000000
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 (file)
index 57b2692..0000000
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 (file)
index 7ab0a31..0000000
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 (file)
index 120cf66..0000000
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 (file)
index 777547b..0000000
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 (file)
index 6ae99c1..0000000
Binary files a/textures/ex2x/floor/floor_rust1_norm.tga and /dev/null differ
index c3ef0a7..5083dda 100644 (file)
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 (file)
index 41e9379..0000000
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 (file)
index df3c4a8..0000000
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 (file)
index 7cedd91..0000000
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 (file)
index 3b7b150..0000000
Binary files a/textures/ex2x/light/light_2_norm.tga and /dev/null differ
index 17e0ad8..f179cb6 100644 (file)
Binary files a/textures/ex2x/light/light_beam_blue_norm.tga and b/textures/ex2x/light/light_beam_blue_norm.tga differ
index 17e0ad8..f179cb6 100644 (file)
Binary files a/textures/ex2x/light/light_beam_red_norm.tga and b/textures/ex2x/light/light_beam_red_norm.tga differ
index 39c3b07..e290bed 100644 (file)
Binary files a/textures/ex2x/trim/trim_green2_norm.tga and b/textures/ex2x/trim/trim_green2_norm.tga differ
index a6eaabc..d5b75d0 100644 (file)
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 (file)
index 0d1c9d8..0000000
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 (file)
index a74323b..0000000
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 (file)
index bf9f1da..0000000
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 (file)
index ab0df41..0000000
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 (file)
index a74323b..0000000
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 (file)
index 694ba6e..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt_norm.tga and /dev/null differ
index ac7c276..abee33e 100644 (file)
Binary files a/textures/ex2x/wall/wall_purple1_norm.tga and b/textures/ex2x/wall/wall_purple1_norm.tga differ