lightspeed: use a cubemap reflection as fallback, instead of the current fixed image...

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index bf11e9d88f6100e542390f424cff6a4aa397aeb4..48ec25eb54b8c9ec1402fcf35b3ab2312dc5a657 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -90,19 +90,13 @@ textures/map_lightspeed/env1
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env1.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env1.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env1_
+       dp_reflect 0  1 1 1 1
 }
 
 textures/map_lightspeed/env2
@@ -115,19 +109,13 @@ textures/map_lightspeed/env2
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env2.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env2.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env2_
+       dp_reflect 0  1 1 1 1
 }
 
 textures/map_lightspeed/env3
@@ -140,19 +128,13 @@ textures/map_lightspeed/env3
        surfaceparm nolightmap
        cull none
        q3map_globaltexture
-       tessSize 256
        {
                map textures/map_lightspeed/env/env3.tga
-               tcMod turb 0 0.04 0 0.08
+               //tcMod turb 0 0.04 0 0.08
                blendfunc add
        }
-       dpreflectcube textures/map_lightspeed/env/env3.tga
-       {
-               map $lightmap
-               blendfunc add
-               tcGen lightmap
-       }       
-       dp_water 0.1 0.25  3 3  1 1 1  1 1 1  0.125
+       dpreflectcube textures/map_lightspeed/env/env3_
+       dp_reflect 0  1 1 1 1
 }
 
 //Lightning1-a

diff --git a/textures/map_lightspeed/env/env1.tga b/textures/map_lightspeed/env/env1.tga
index 7e7acd06fa755b078711c1296be9861a4facdf1b..f3de3329ba53a4a5f29a6997495b913666c39896 100644 (file)
Binary files a/textures/map_lightspeed/env/env1.tga and b/textures/map_lightspeed/env/env1.tga differ

diff --git a/textures/map_lightspeed/env/env1_nx.tga b/textures/map_lightspeed/env/env1_nx.tga
new file mode 100644 (file)
index 0000000..7e8b88f
Binary files /dev/null and b/textures/map_lightspeed/env/env1_nx.tga differ

diff --git a/textures/map_lightspeed/env/env1_ny.tga b/textures/map_lightspeed/env/env1_ny.tga
new file mode 100644 (file)
index 0000000..9087697
Binary files /dev/null and b/textures/map_lightspeed/env/env1_ny.tga differ

diff --git a/textures/map_lightspeed/env/env1_nz.tga b/textures/map_lightspeed/env/env1_nz.tga
new file mode 100644 (file)
index 0000000..40f0ae4
Binary files /dev/null and b/textures/map_lightspeed/env/env1_nz.tga differ

diff --git a/textures/map_lightspeed/env/env1_px.tga b/textures/map_lightspeed/env/env1_px.tga
new file mode 100644 (file)
index 0000000..d41f2b0
Binary files /dev/null and b/textures/map_lightspeed/env/env1_px.tga differ

diff --git a/textures/map_lightspeed/env/env1_py.tga b/textures/map_lightspeed/env/env1_py.tga
new file mode 100644 (file)
index 0000000..d582d61
Binary files /dev/null and b/textures/map_lightspeed/env/env1_py.tga differ

diff --git a/textures/map_lightspeed/env/env1_pz.tga b/textures/map_lightspeed/env/env1_pz.tga
new file mode 100644 (file)
index 0000000..e954bce
Binary files /dev/null and b/textures/map_lightspeed/env/env1_pz.tga differ

diff --git a/textures/map_lightspeed/env/env1_reflect.tga b/textures/map_lightspeed/env/env1_reflect.tga
new file mode 100644 (file)
index 0000000..d3f0de0
Binary files /dev/null and b/textures/map_lightspeed/env/env1_reflect.tga differ

diff --git a/textures/map_lightspeed/env/env2.tga b/textures/map_lightspeed/env/env2.tga
index a8d465cd15929b85540a76c7dab4be9353f3e682..f3de3329ba53a4a5f29a6997495b913666c39896 100644 (file)
Binary files a/textures/map_lightspeed/env/env2.tga and b/textures/map_lightspeed/env/env2.tga differ

diff --git a/textures/map_lightspeed/env/env2_nx.tga b/textures/map_lightspeed/env/env2_nx.tga
new file mode 100644 (file)
index 0000000..9bc8d4f
Binary files /dev/null and b/textures/map_lightspeed/env/env2_nx.tga differ

diff --git a/textures/map_lightspeed/env/env2_ny.tga b/textures/map_lightspeed/env/env2_ny.tga
new file mode 100644 (file)
index 0000000..372ab78
Binary files /dev/null and b/textures/map_lightspeed/env/env2_ny.tga differ

diff --git a/textures/map_lightspeed/env/env2_nz.tga b/textures/map_lightspeed/env/env2_nz.tga
new file mode 100644 (file)
index 0000000..c2bb2d1
Binary files /dev/null and b/textures/map_lightspeed/env/env2_nz.tga differ

diff --git a/textures/map_lightspeed/env/env2_px.tga b/textures/map_lightspeed/env/env2_px.tga
new file mode 100644 (file)
index 0000000..e8a3526
Binary files /dev/null and b/textures/map_lightspeed/env/env2_px.tga differ

diff --git a/textures/map_lightspeed/env/env2_py.tga b/textures/map_lightspeed/env/env2_py.tga
new file mode 100644 (file)
index 0000000..b2631bb
Binary files /dev/null and b/textures/map_lightspeed/env/env2_py.tga differ

diff --git a/textures/map_lightspeed/env/env2_pz.tga b/textures/map_lightspeed/env/env2_pz.tga
new file mode 100644 (file)
index 0000000..7650954
Binary files /dev/null and b/textures/map_lightspeed/env/env2_pz.tga differ

diff --git a/textures/map_lightspeed/env/env2_reflect.tga b/textures/map_lightspeed/env/env2_reflect.tga
new file mode 100644 (file)
index 0000000..d3f0de0
Binary files /dev/null and b/textures/map_lightspeed/env/env2_reflect.tga differ

diff --git a/textures/map_lightspeed/env/env3.tga b/textures/map_lightspeed/env/env3.tga
index 70654b0d84a578d979f9ca28a48142efe23ba416..f3de3329ba53a4a5f29a6997495b913666c39896 100644 (file)
Binary files a/textures/map_lightspeed/env/env3.tga and b/textures/map_lightspeed/env/env3.tga differ

diff --git a/textures/map_lightspeed/env/env3_nx.tga b/textures/map_lightspeed/env/env3_nx.tga
new file mode 100644 (file)
index 0000000..1722ebb
Binary files /dev/null and b/textures/map_lightspeed/env/env3_nx.tga differ

diff --git a/textures/map_lightspeed/env/env3_ny.tga b/textures/map_lightspeed/env/env3_ny.tga
new file mode 100644 (file)
index 0000000..d6a3d30
Binary files /dev/null and b/textures/map_lightspeed/env/env3_ny.tga differ

diff --git a/textures/map_lightspeed/env/env3_nz.tga b/textures/map_lightspeed/env/env3_nz.tga
new file mode 100644 (file)
index 0000000..090ae3a
Binary files /dev/null and b/textures/map_lightspeed/env/env3_nz.tga differ

diff --git a/textures/map_lightspeed/env/env3_px.tga b/textures/map_lightspeed/env/env3_px.tga
new file mode 100644 (file)
index 0000000..8dbbe85
Binary files /dev/null and b/textures/map_lightspeed/env/env3_px.tga differ

diff --git a/textures/map_lightspeed/env/env3_py.tga b/textures/map_lightspeed/env/env3_py.tga
new file mode 100644 (file)
index 0000000..a425e6b
Binary files /dev/null and b/textures/map_lightspeed/env/env3_py.tga differ

diff --git a/textures/map_lightspeed/env/env3_pz.tga b/textures/map_lightspeed/env/env3_pz.tga
new file mode 100644 (file)
index 0000000..54e3371
Binary files /dev/null and b/textures/map_lightspeed/env/env3_pz.tga differ

diff --git a/textures/map_lightspeed/env/env3_reflect.tga b/textures/map_lightspeed/env/env3_reflect.tga
new file mode 100644 (file)
index 0000000..d3f0de0
Binary files /dev/null and b/textures/map_lightspeed/env/env3_reflect.tga differ