diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/D.png b/Aircraft/Generic/Effects/CubeMaps/buildings/D.png new file mode 100644 index 000000000..6f9707d52 Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/D.png differ diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/E.png b/Aircraft/Generic/Effects/CubeMaps/buildings/E.png new file mode 100644 index 000000000..56df94924 Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/E.png differ diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/N.png b/Aircraft/Generic/Effects/CubeMaps/buildings/N.png new file mode 100644 index 000000000..98e69e328 Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/N.png differ diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/S.png b/Aircraft/Generic/Effects/CubeMaps/buildings/S.png new file mode 100644 index 000000000..caea2e151 Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/S.png differ diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/U.png b/Aircraft/Generic/Effects/CubeMaps/buildings/U.png new file mode 100644 index 000000000..cba9b21e6 Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/U.png differ diff --git a/Aircraft/Generic/Effects/CubeMaps/buildings/W.png b/Aircraft/Generic/Effects/CubeMaps/buildings/W.png new file mode 100644 index 000000000..35797c9cd Binary files /dev/null and b/Aircraft/Generic/Effects/CubeMaps/buildings/W.png differ diff --git a/Effects/building.eff b/Effects/building.eff index 645622c97..13807c209 100644 --- a/Effects/building.eff +++ b/Effects/building.eff @@ -37,9 +37,9 @@ 1.0 1.0 1.0 --> 1 - - 0 - 0.10 + 1 + + -0.15 0 0.0 0.0 @@ -47,12 +47,12 @@ cubemap - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png - Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + Aircraft/Generic/Effects/CubeMaps/buildings/N.png + Aircraft/Generic/Effects/CubeMaps/buildings/S.png + Aircraft/Generic/Effects/CubeMaps/buildings/W.png + Aircraft/Generic/Effects/CubeMaps/buildings/E.png + Aircraft/Generic/Effects/CubeMaps/buildings/U.png + Aircraft/Generic/Effects/CubeMaps/buildings/D.png diff --git a/Shaders/building-ubershader.vert b/Shaders/building-ubershader.vert index 1d52f692d..3821ce950 100644 --- a/Shaders/building-ubershader.vert +++ b/Shaders/building-ubershader.vert @@ -61,9 +61,9 @@ void main(void) // Rotate the normal. vec3 normal = gl_Normal; normal.xy = vec2(dot(normal.xy, vec2(cr, sr)), dot(normal.xy, vec2(-sr, cr))); - normal = gl_NormalMatrix * normal; + //normal = gl_NormalMatrix * normal; - VNormal = normalize(normal); + VNormal = normalize(gl_NormalMatrix * normal); if (nmap_enabled > 0 && shader_qual > 2){ VTangent = normalize(gl_NormalMatrix * tangent); VBinormal = normalize(gl_NormalMatrix * binormal);