diff --git a/Source/gs-entbase/client/env_cubemap.cpp b/Source/gs-entbase/client/env_cubemap.cpp index cc860bd0..e9cc20e2 100644 --- a/Source/gs-entbase/client/env_cubemap.cpp +++ b/Source/gs-entbase/client/env_cubemap.cpp @@ -115,7 +115,7 @@ void CMap_Check(void) ================= CMap_Build - Called upon 'dev_buildcubemaps' + Called upon 'buildcubemaps' ================= */ void CMap_Build(void) diff --git a/cstrike/data.pk3dir/csprogs.dat b/cstrike/data.pk3dir/csprogs.dat index 8da56edd..6e0a7d17 100644 Binary files a/cstrike/data.pk3dir/csprogs.dat and b/cstrike/data.pk3dir/csprogs.dat differ diff --git a/cstrike/data.pk3dir/progs.dat b/cstrike/data.pk3dir/progs.dat index 4d1bd47c..38615e9e 100644 Binary files a/cstrike/data.pk3dir/progs.dat and b/cstrike/data.pk3dir/progs.dat differ diff --git a/rewolf/data.pk3dir/csprogs.dat b/rewolf/data.pk3dir/csprogs.dat index 156eb0e8..aa52f4a5 100644 Binary files a/rewolf/data.pk3dir/csprogs.dat and b/rewolf/data.pk3dir/csprogs.dat differ diff --git a/rewolf/data.pk3dir/progs.dat b/rewolf/data.pk3dir/progs.dat index 197d441d..75dcd0f4 100644 Binary files a/rewolf/data.pk3dir/progs.dat and b/rewolf/data.pk3dir/progs.dat differ diff --git a/scihunt/data.pk3dir/csprogs.dat b/scihunt/data.pk3dir/csprogs.dat index f445aba2..5e4ee9f1 100644 Binary files a/scihunt/data.pk3dir/csprogs.dat and b/scihunt/data.pk3dir/csprogs.dat differ diff --git a/scihunt/data.pk3dir/progs.dat b/scihunt/data.pk3dir/progs.dat index 028bae07..c019a4fa 100644 Binary files a/scihunt/data.pk3dir/progs.dat and b/scihunt/data.pk3dir/progs.dat differ diff --git a/valve/data.pk3dir/csprogs.dat b/valve/data.pk3dir/csprogs.dat index 0a370044..cdd7ca1e 100644 Binary files a/valve/data.pk3dir/csprogs.dat and b/valve/data.pk3dir/csprogs.dat differ diff --git a/valve/data.pk3dir/glsl/defaultwall.glsl b/valve/data.pk3dir/glsl/defaultwall.glsl index f3e03fe3..575e4211 100644 --- a/valve/data.pk3dir/glsl/defaultwall.glsl +++ b/valve/data.pk3dir/glsl/defaultwall.glsl @@ -1,5 +1,5 @@ !!ver 110 -!!samps diffuse lightmap reflectcube +!!samps diffuse lightmap reflectcube normalmap !!cvardf gl_fake16bit=0 !!cvardf gl_monochrome=0 !!cvardf gl_brighten=0 @@ -45,13 +45,16 @@ varying mat3 invsurface; } #ifdef REFLECTCUBE + #ifdef BUMP + vec3 normal_f = normalize(texture2D(s_normalmap, tex_c).rgb - 0.5); + #else + vec3 normal_f = vec4(0, 0, 1); + #endif vec3 cube_c; vec4 out_f = vec4( 1.0, 1.0, 1.0, 1.0 ); - - // Modulate the final pixel with the lightmap value diffuse_f.rgb *= light.rgb * e_lmscale.rgb; - cube_c = reflect( normalize(-eyevector), vec3(0, 0, 1)); + cube_c = reflect( normalize(-eyevector), normal_f); cube_c = cube_c.x * invsurface[0] + cube_c.y * invsurface[1] + cube_c.z * invsurface[2]; cube_c = ( m_model * vec4(cube_c.xyz, 0.0)).xyz; out_f.rgb = mix( textureCube(s_reflectcube, cube_c ).rgb, diffuse_f.rgb, diffuse_f.a); diff --git a/valve/data.pk3dir/menu.dat b/valve/data.pk3dir/menu.dat index 8421a153..c8951d97 100644 Binary files a/valve/data.pk3dir/menu.dat and b/valve/data.pk3dir/menu.dat differ diff --git a/valve/data.pk3dir/progs.dat b/valve/data.pk3dir/progs.dat index a9d5d552..0c7cfff4 100644 Binary files a/valve/data.pk3dir/progs.dat and b/valve/data.pk3dir/progs.dat differ