From: Rudolf Polzer Date: Sat, 9 Jul 2011 20:15:38 +0000 (+0200) Subject: lightspeed: use a cubemap reflection as fallback, instead of the current fixed image... X-Git-Tag: xonotic-v0.6.0~79 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4edc574ab7b1643f960ce87adcdaa9ceb1ae1b68;p=xonotic%2Fxonotic-maps.pk3dir.git lightspeed: use a cubemap reflection as fallback, instead of the current fixed image; use dp_reflect (1 extra render) instead of dp_water (2 extra renders) here as we don't use refraction anyway --- diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader index bf11e9d8..48ec25eb 100644 --- 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 7e7acd06..f3de3329 100644 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 index 00000000..7e8b88f5 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 index 00000000..90876975 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 index 00000000..40f0ae4f 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 index 00000000..d41f2b0c 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 index 00000000..d582d616 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 index 00000000..e954bce3 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 index 00000000..d3f0de0a 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 a8d465cd..f3de3329 100644 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 index 00000000..9bc8d4f5 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 index 00000000..372ab78f 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 index 00000000..c2bb2d1c 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 index 00000000..e8a35263 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 index 00000000..b2631bb3 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 index 00000000..76509540 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 index 00000000..d3f0de0a 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 70654b0d..f3de3329 100644 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 index 00000000..1722ebb5 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 index 00000000..d6a3d306 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 index 00000000..090ae3aa 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 index 00000000..8dbbe859 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 index 00000000..a425e6b4 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 index 00000000..54e3371f 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 index 00000000..d3f0de0a Binary files /dev/null and b/textures/map_lightspeed/env/env3_reflect.tga differ