From: MirceaKitsune Date: Sat, 28 Jan 2012 12:56:39 +0000 (+0200) Subject: Light cubemaps for all evil sets X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=385072ba0415969155c4d84d11e10eff36f22df4;p=voretournament%2Fvoretournament.git Light cubemaps for all evil sets --- diff --git a/data/scripts/evil2_lights.shader b/data/scripts/evil2_lights.shader new file mode 100644 index 00000000..6a3222d6 --- /dev/null +++ b/data/scripts/evil2_lights.shader @@ -0,0 +1,64 @@ +textures/evil2_lights/smll_light +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil2_lights/smll_light + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil2_lights/smll_light2 +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil2_lights/smll_light2 + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil2_lights/smll_light3 +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil2_lights/smll_light3 + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil2_lights/trim_light +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil2_lights/trim_light + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil2_lights/trim_light_glow +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil2_lights/trim_light_glow + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} \ No newline at end of file diff --git a/data/scripts/evil3_lights.shader b/data/scripts/evil3_lights.shader index 15705627..cbe72cd6 100644 --- a/data/scripts/evil3_lights.shader +++ b/data/scripts/evil3_lights.shader @@ -8,6 +8,7 @@ textures/evil_lights/rlight_a { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil_lights/rlight_a.tga surfaceparm nomarks q3map_surfacelight 1500 diff --git a/data/scripts/evil4_lights.shader b/data/scripts/evil4_lights.shader index ba9629ff..f26606b4 100644 --- a/data/scripts/evil4_lights.shader +++ b/data/scripts/evil4_lights.shader @@ -1,5 +1,32 @@ +textures/evil4_lights/dwtrim_llight +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil4_lights/dwtrim_llight + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil4_lights/llight_s +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil4_lights/llight_s + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + textures/evil4_lights/steplight { + dpreflectcube cubemaps/exomorph/exomorph surfaceparm nomarks q3map_surfacelight 1000 //light1 @@ -20,6 +47,7 @@ textures/evil4_lights/steplight textures/evil4_lights/drkmtlsupport_light { + dpreflectcube cubemaps/exomorph/exomorph surfaceparm nomarks q3map_surfacelight 1000 { @@ -40,6 +68,7 @@ textures/evil4_lights/drkmtlsupport_light textures/evil4_lights/s_light { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil4_lights/s_light.jpg surfaceparm nomarks q3map_surfacelight 2500 @@ -57,6 +86,7 @@ textures/evil4_lights/s_light textures/evil4_lights/t_mtllight { + dpreflectcube cubemaps/exomorph/exomorph surfaceparm nomarks q3map_surfacelight 1000 //light1 @@ -73,6 +103,7 @@ textures/evil4_lights/t_mtllight textures/evil4_lights/mtl_lightsmll { + dpreflectcube cubemaps/exomorph/exomorph surfaceparm nomarks q3map_surfacelight 1000 //light1 @@ -91,6 +122,7 @@ textures/evil4_lights/mtl_lightsmll textures/evil4_lights/l_light_b { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 5000 q3map_lightimage textures/evil4_lights/l_light_b.jpg { @@ -106,6 +138,7 @@ textures/evil4_lights/l_light_b textures/evil4_lights/l_light_g { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 5000 q3map_lightimage textures/evil4_lights/l_light_g.jpg { @@ -121,6 +154,7 @@ textures/evil4_lights/l_light_g textures/evil4_lights/l_light_r { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 5000 q3map_lightimage textures/evil4_lights/l_light_r.jpg { @@ -136,6 +170,7 @@ textures/evil4_lights/l_light_r textures/evil4_lights/l_light_w { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 5000 q3map_lightimage textures/evil4_lights/l_light_w.jpg { @@ -151,6 +186,7 @@ textures/evil4_lights/l_light_w textures/evil4_lights/mtl_l1 { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 1000 q3map_lightimage textures/evil4_lights/mtl_l1.tga // LordHavoc: replaced most of this shader @@ -202,6 +238,7 @@ textures/evil4_lights/mtl_l1 textures/evil4_lights/trimtl_grlbtm_light { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 5000 qer_editorimage textures/evil4_lights/trimtl_grlbtm_light.tga { @@ -217,6 +254,7 @@ textures/evil4_lights/trimtl_grlbtm_light textures/evil4_lights/s_bluelight { + dpreflectcube cubemaps/exomorph/exomorph q3map_surfacelight 1000 q3map_lightimage textures/evil4_lights/s_bluelight.tga { diff --git a/data/scripts/evil6_lights.shader b/data/scripts/evil6_lights.shader index ed8f8f7a..bd224cb2 100644 --- a/data/scripts/evil6_lights.shader +++ b/data/scripts/evil6_lights.shader @@ -1,6 +1,20 @@ +textures/evil6_lights/e6mtltpnl_light +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil6_lights/e6mtltpnl_light + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + // textures/evil6_lights/ textures/evil6_lights/e6tinylight_s_1500 { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6tinylight.jpg q3map_surfacelight 1500 surfaceparm nomarks @@ -19,6 +33,7 @@ textures/evil6_lights/e6tinylight_s_1500 textures/evil6_lights/e6platelight_burnt_500 { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6platelight_burnt.jpg q3map_surfacelight 500 surfaceparm nomarks @@ -37,6 +52,7 @@ textures/evil6_lights/e6platelight_burnt_500 textures/evil6_lights/e6horzlight_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6horzlight.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -55,6 +71,7 @@ textures/evil6_lights/e6horzlight_s_nolight textures/evil6_lights/e6horzovallight_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6horzovallight.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -73,6 +90,7 @@ textures/evil6_lights/e6horzovallight_s_nolight textures/evil6_lights/e6platelight_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6platelight.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -93,6 +111,7 @@ textures/evil6_lights/e6platelight_s_nolight textures/evil6_lights/e6platelight_burnt_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6platelight_burnt.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -113,6 +132,7 @@ textures/evil6_lights/e6platelight_burnt_s_nolight textures/evil6_lights/e6tinylight_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6tinylight.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -133,6 +153,7 @@ textures/evil6_lights/e6tinylight_s_nolight textures/evil6_lights/e6v_light_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6v_light.jpg //q3map_surfacelight ? surfaceparm nomarks @@ -153,6 +174,7 @@ textures/evil6_lights/e6v_light_s_nolight textures/evil6_lights/e6walllight_s_nolight { + dpreflectcube cubemaps/exomorph/exomorph qer_editorimage textures/evil6_lights/e6walllight.jpg //q3map_surfacelight ? surfaceparm nomarks diff --git a/data/scripts/evil8_base.shader b/data/scripts/evil8_base.shader index 19a405ae..eed9e0e4 100644 --- a/data/scripts/evil8_base.shader +++ b/data/scripts/evil8_base.shader @@ -42,6 +42,19 @@ textures/e8/e8_base1broke } } +textures/evil8_lights/e8_rlighty +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil8_lights/e8_rlighty + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + textures/evil8_lights/e8btrimlight { qer_editorimage textures/evil8_lights/e8btrimlight.tga diff --git a/data/textures/evil2_lights/smll_light2_reflect.JPG b/data/textures/evil2_lights/smll_light2_reflect.JPG new file mode 100644 index 00000000..b0fffde6 Binary files /dev/null and b/data/textures/evil2_lights/smll_light2_reflect.JPG differ diff --git a/data/textures/evil2_lights/smll_light3_reflect.JPG b/data/textures/evil2_lights/smll_light3_reflect.JPG new file mode 100644 index 00000000..fda125fe Binary files /dev/null and b/data/textures/evil2_lights/smll_light3_reflect.JPG differ diff --git a/data/textures/evil2_lights/smll_light_reflect.JPG b/data/textures/evil2_lights/smll_light_reflect.JPG new file mode 100644 index 00000000..b73476ff Binary files /dev/null and b/data/textures/evil2_lights/smll_light_reflect.JPG differ diff --git a/data/textures/evil2_lights/trim_light_reflect.JPG b/data/textures/evil2_lights/trim_light_reflect.JPG new file mode 100644 index 00000000..5c5fd2c8 Binary files /dev/null and b/data/textures/evil2_lights/trim_light_reflect.JPG differ diff --git a/data/textures/evil3_lights/rlight_a_reflect.JPG b/data/textures/evil3_lights/rlight_a_reflect.JPG new file mode 100644 index 00000000..a9e08c93 Binary files /dev/null and b/data/textures/evil3_lights/rlight_a_reflect.JPG differ diff --git a/data/textures/evil4_lights/drkmtlsupport_light_reflect.JPG b/data/textures/evil4_lights/drkmtlsupport_light_reflect.JPG new file mode 100644 index 00000000..992046d8 Binary files /dev/null and b/data/textures/evil4_lights/drkmtlsupport_light_reflect.JPG differ diff --git a/data/textures/evil4_lights/dwtrim_llight_reflect.JPG b/data/textures/evil4_lights/dwtrim_llight_reflect.JPG new file mode 100644 index 00000000..4683af9e Binary files /dev/null and b/data/textures/evil4_lights/dwtrim_llight_reflect.JPG differ diff --git a/data/textures/evil4_lights/l_light_b_reflect.JPG b/data/textures/evil4_lights/l_light_b_reflect.JPG new file mode 100644 index 00000000..a8f12063 Binary files /dev/null and b/data/textures/evil4_lights/l_light_b_reflect.JPG differ diff --git a/data/textures/evil4_lights/l_light_g_reflect.JPG b/data/textures/evil4_lights/l_light_g_reflect.JPG new file mode 100644 index 00000000..2368b29e Binary files /dev/null and b/data/textures/evil4_lights/l_light_g_reflect.JPG differ diff --git a/data/textures/evil4_lights/l_light_r_reflect.JPG b/data/textures/evil4_lights/l_light_r_reflect.JPG new file mode 100644 index 00000000..2df15985 Binary files /dev/null and b/data/textures/evil4_lights/l_light_r_reflect.JPG differ diff --git a/data/textures/evil4_lights/l_light_w_reflect.JPG b/data/textures/evil4_lights/l_light_w_reflect.JPG new file mode 100644 index 00000000..74b42941 Binary files /dev/null and b/data/textures/evil4_lights/l_light_w_reflect.JPG differ diff --git a/data/textures/evil4_lights/llight_s_reflect.JPG b/data/textures/evil4_lights/llight_s_reflect.JPG new file mode 100644 index 00000000..af6afa7f Binary files /dev/null and b/data/textures/evil4_lights/llight_s_reflect.JPG differ diff --git a/data/textures/evil4_lights/mtl_l1_reflect.JPG b/data/textures/evil4_lights/mtl_l1_reflect.JPG new file mode 100644 index 00000000..635830ae Binary files /dev/null and b/data/textures/evil4_lights/mtl_l1_reflect.JPG differ diff --git a/data/textures/evil4_lights/mtl_lightsmll_reflect.JPG b/data/textures/evil4_lights/mtl_lightsmll_reflect.JPG new file mode 100644 index 00000000..65ef9cda Binary files /dev/null and b/data/textures/evil4_lights/mtl_lightsmll_reflect.JPG differ diff --git a/data/textures/evil4_lights/s_bluelight_reflect.JPG b/data/textures/evil4_lights/s_bluelight_reflect.JPG new file mode 100644 index 00000000..2ebad99f Binary files /dev/null and b/data/textures/evil4_lights/s_bluelight_reflect.JPG differ diff --git a/data/textures/evil4_lights/s_light_reflect.JPG b/data/textures/evil4_lights/s_light_reflect.JPG new file mode 100644 index 00000000..3c984a99 Binary files /dev/null and b/data/textures/evil4_lights/s_light_reflect.JPG differ diff --git a/data/textures/evil4_lights/steplight_reflect.JPG b/data/textures/evil4_lights/steplight_reflect.JPG new file mode 100644 index 00000000..59cffe8e Binary files /dev/null and b/data/textures/evil4_lights/steplight_reflect.JPG differ diff --git a/data/textures/evil4_lights/t_mtllight_reflect.JPG b/data/textures/evil4_lights/t_mtllight_reflect.JPG new file mode 100644 index 00000000..b601f900 Binary files /dev/null and b/data/textures/evil4_lights/t_mtllight_reflect.JPG differ diff --git a/data/textures/evil4_lights/trimtl_grlbtm_light_reflect.JPG b/data/textures/evil4_lights/trimtl_grlbtm_light_reflect.JPG new file mode 100644 index 00000000..2e4b9503 Binary files /dev/null and b/data/textures/evil4_lights/trimtl_grlbtm_light_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6horzlight_reflect.JPG b/data/textures/evil6_lights/e6horzlight_reflect.JPG new file mode 100644 index 00000000..0f168edb Binary files /dev/null and b/data/textures/evil6_lights/e6horzlight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6horzlight_s_nolight_reflect.JPG b/data/textures/evil6_lights/e6horzlight_s_nolight_reflect.JPG new file mode 100644 index 00000000..ab3deb25 Binary files /dev/null and b/data/textures/evil6_lights/e6horzlight_s_nolight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6horzovallight_a_reflect.JPG b/data/textures/evil6_lights/e6horzovallight_a_reflect.JPG new file mode 100644 index 00000000..5ade31c3 Binary files /dev/null and b/data/textures/evil6_lights/e6horzovallight_a_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6horzovallight_reflect.JPG b/data/textures/evil6_lights/e6horzovallight_reflect.JPG new file mode 100644 index 00000000..2ac25cb6 Binary files /dev/null and b/data/textures/evil6_lights/e6horzovallight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6mtltpnl_light_reflect.JPG b/data/textures/evil6_lights/e6mtltpnl_light_reflect.JPG new file mode 100644 index 00000000..43a2a5bd Binary files /dev/null and b/data/textures/evil6_lights/e6mtltpnl_light_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6platelight_burnt_reflect.JPG b/data/textures/evil6_lights/e6platelight_burnt_reflect.JPG new file mode 100644 index 00000000..44e8925b Binary files /dev/null and b/data/textures/evil6_lights/e6platelight_burnt_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6platelight_reflect.JPG b/data/textures/evil6_lights/e6platelight_reflect.JPG new file mode 100644 index 00000000..f4ebd83a Binary files /dev/null and b/data/textures/evil6_lights/e6platelight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6tinylight_reflect.JPG b/data/textures/evil6_lights/e6tinylight_reflect.JPG new file mode 100644 index 00000000..3a10d088 Binary files /dev/null and b/data/textures/evil6_lights/e6tinylight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6tinylight_s_nolight_reflect.JPG b/data/textures/evil6_lights/e6tinylight_s_nolight_reflect.JPG new file mode 100644 index 00000000..20f815c1 Binary files /dev/null and b/data/textures/evil6_lights/e6tinylight_s_nolight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6v_light_reflect.JPG b/data/textures/evil6_lights/e6v_light_reflect.JPG new file mode 100644 index 00000000..333c3471 Binary files /dev/null and b/data/textures/evil6_lights/e6v_light_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6v_light_s_nolight_reflect.JPG b/data/textures/evil6_lights/e6v_light_s_nolight_reflect.JPG new file mode 100644 index 00000000..21e960b9 Binary files /dev/null and b/data/textures/evil6_lights/e6v_light_s_nolight_reflect.JPG differ diff --git a/data/textures/evil6_lights/e6walllight_reflect.JPG b/data/textures/evil6_lights/e6walllight_reflect.JPG new file mode 100644 index 00000000..bfbe11f8 Binary files /dev/null and b/data/textures/evil6_lights/e6walllight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8_rlight_reflect.JPG b/data/textures/evil8_lights/e8_rlight_reflect.JPG new file mode 100644 index 00000000..6ecbcf5a Binary files /dev/null and b/data/textures/evil8_lights/e8_rlight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8_rlightb2_reflect.JPG b/data/textures/evil8_lights/e8_rlightb2_reflect.JPG new file mode 100644 index 00000000..5b01d1e0 Binary files /dev/null and b/data/textures/evil8_lights/e8_rlightb2_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8_rlightb_reflect.JPG b/data/textures/evil8_lights/e8_rlightb_reflect.JPG new file mode 100644 index 00000000..26f92b61 Binary files /dev/null and b/data/textures/evil8_lights/e8_rlightb_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8_rlighty_reflect.JPG b/data/textures/evil8_lights/e8_rlighty_reflect.JPG new file mode 100644 index 00000000..4ce4309e Binary files /dev/null and b/data/textures/evil8_lights/e8_rlighty_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8btrimlight_reflect.JPG b/data/textures/evil8_lights/e8btrimlight_reflect.JPG new file mode 100644 index 00000000..7ed43631 Binary files /dev/null and b/data/textures/evil8_lights/e8btrimlight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8minitrimlight_reflect.JPG b/data/textures/evil8_lights/e8minitrimlight_reflect.JPG new file mode 100644 index 00000000..6fc5b887 Binary files /dev/null and b/data/textures/evil8_lights/e8minitrimlight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8tinylight_reflect.JPG b/data/textures/evil8_lights/e8tinylight_reflect.JPG new file mode 100644 index 00000000..1c36b642 Binary files /dev/null and b/data/textures/evil8_lights/e8tinylight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8tinylightblue_reflect.JPG b/data/textures/evil8_lights/e8tinylightblue_reflect.JPG new file mode 100644 index 00000000..ac3f7e4f Binary files /dev/null and b/data/textures/evil8_lights/e8tinylightblue_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8tmtllight2_reflect.JPG b/data/textures/evil8_lights/e8tmtllight2_reflect.JPG new file mode 100644 index 00000000..462c88a7 Binary files /dev/null and b/data/textures/evil8_lights/e8tmtllight2_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8tmtllight2b_reflect.JPG b/data/textures/evil8_lights/e8tmtllight2b_reflect.JPG new file mode 100644 index 00000000..d21a7a98 Binary files /dev/null and b/data/textures/evil8_lights/e8tmtllight2b_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8tmtllight_reflect.JPG b/data/textures/evil8_lights/e8tmtllight_reflect.JPG new file mode 100644 index 00000000..b44c6e85 Binary files /dev/null and b/data/textures/evil8_lights/e8tmtllight_reflect.JPG differ diff --git a/data/textures/evil8_lights/e8trimlight_reflect.JPG b/data/textures/evil8_lights/e8trimlight_reflect.JPG new file mode 100644 index 00000000..558449ab Binary files /dev/null and b/data/textures/evil8_lights/e8trimlight_reflect.JPG differ