Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -1,4 +1,4 @@
-bld/
+bld*/
 build/
 build-32/
 build-64/
@@ -35,6 +35,7 @@ data/.svn
 *.vcxproj
 *.vcxproj.filters
 *.vcxproj.user
+*~
 
 packets_log.txt
 history.dat

README.md

@@ -26,13 +26,16 @@ Hope you enjoy the game.
 ##Compiling SuperTuxKart
 
 ###Windows
-A project file for Visual Studio 9 (e.g. the free 2008 express 
-edition) is included in the sources in `src/ide/vc9`. A separate
-dependency package is available on SuperTuxKart's sourceforge 
-page, which includes all necessary libraries, header files, 
-and dlls to compile and run the source code.
+1. Install VS 2012 or later. The free express versions work fine.
+2. Download and install a source package - either a released package or from our [git/svn repositories](http://supertuxkart.sourceforge.net/Source_control)
+3. Download the latest dependency package depdendencies_for_0.8.2.zip from [here](https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart%20Dependencies/Windows/). Unzip it in the root directory, so that the dependencies directory is next to the src and data directory (if you are updating from a previous dependency package, you can delete the .dll files in the root directory, they are not needed anymore).
+4. Download cmake and install it. Then start cmake-gui and select the STK root directory as 'Where is the source code', and a new directory in the root directory (next to src, data etc) as build directory (for now I assume that this directory is called bld).
+5. Click on configure. You will be asked to create the directory (yes), then for your VS version. Make sure to select the right version (be aware of the easy to confuse version numbers: VS 2012 = version 11; VS 2013 = version 12). Click on configure, then generate. This will create the directory 'bld', and a VS solution in that directory.
+6. In Visual Studio open the project file generated in the 'bld' folder
+7. Right click on the supertuxkart project in the solution explorer, and select "Set as StartUp Project".
+8. Select Build->Build Solution (or press F7) to compile.
 
-While compilation with cygwin is not officially supported,
+Compilation with cygwin is not officially supported, but
 this has been done (check with the forum for details).
 
 ###Mac OS X

data/shaders/billboard.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/billboard.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform vec3 Position;

data/shaders/bloom.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform float low;
 

data/shaders/bloomblend.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/bloompower.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform float power;
 uniform sampler2D tex;
 

data/shaders/bubble.frag

@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform float transparency;
 in vec2 uv;

data/shaders/bubble.vert

@@ -17,7 +17,7 @@
 
 
 // Creates a bubble (wave) effect by distorting the texture depending on time
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform float time;
 

data/shaders/caustics.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D caustictex;
 uniform vec2 dir;

data/shaders/collapse.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D oldtex;
 uniform vec2 pixel;

data/shaders/color_levels.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec3 inlevel;
 uniform vec2 outlevel;

data/shaders/coloredquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform ivec4 color;
 
 out vec4 FragColor;

data/shaders/coloredquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 

data/shaders/colorize.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 col;
 
 out vec4 FragColor;

data/shaders/colortexturedquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/colortexturedquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 uniform vec2 texcenter;

data/shaders/detailledobject_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D Detail;
 uniform sampler2D DiffuseMap;

data/shaders/displace.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 dir;
 uniform vec2 dir2;

data/shaders/displace.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 ModelViewMatrix;
 

data/shaders/farplane.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform mat4 ModelViewProjectionMatrix;
 
 void main() {

data/shaders/flipparticle.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ProjectionMatrix;
 uniform mat4 ViewMatrix;
 

data/shaders/fog.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 uniform float fogmax;

data/shaders/gaussian3h.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian3v.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian6h.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian6v.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/glow.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/godfade.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec3 col;
 out vec4 FragColor;

data/shaders/godray.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec2 sunpos;
 

data/shaders/grass_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 windDir;
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;

data/shaders/grass_pass2.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 windDir;
 uniform mat4 ModelViewProjectionMatrix;
 

data/shaders/mipviz.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 
 uniform sampler2D tex;
 uniform vec2 texsize;

data/shaders/mlaa_blend2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 #define MAX_SEARCH_STEPS 8.0
 #define MAX_DISTANCE 33.0
 

data/shaders/mlaa_color1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 in vec4 offset[2];
 in vec2 uv;
 

data/shaders/mlaa_neigh3.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 in vec4 offset[2];
 in vec2 uv;
 out vec4 FragColor;

data/shaders/mlaa_offset.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform vec2 PIXEL_SIZE;
 uniform mat4 ModelViewProjectionMatrix;
 

data/shaders/motion_blur.frag

@@ -21,7 +21,7 @@
 // The actual boost amount (which linearly scales the blur to be shown).
 // should be in the range [0.0, 1.0], though a larger value might make
 // the blurring too string. Atm we are using [0, 0.5].
-#version 130
+#version 330 compatibility
 uniform float boost_amount;
 
 // The color buffer to use.

data/shaders/motion_blur.vert

@@ -17,7 +17,7 @@
 
 
 // motion_blur.vert
-#version 130
+#version 330 compatibility
 
 void main()
 {

data/shaders/movingtexture.frag

@@ -0,0 +1,22 @@
+#version 330
+uniform sampler2D Albedo;
+uniform sampler2D DiffuseMap;
+uniform sampler2D SpecularMap;
+uniform sampler2D SSAO;
+uniform vec2 screen;
+uniform vec3 ambient;
+
+in vec2 uv;
+out vec4 FragColor;
+
+void main(void)
+{
+    vec2 tc = gl_FragCoord.xy / screen;
+    vec4 color = texture(Albedo, uv);
+    vec3 DiffuseComponent = texture(DiffuseMap, tc).xyz;
+    vec3 SpecularComponent = texture(SpecularMap, tc).xyz;
+	float ao = texture(SSAO, tc).x;
+    vec3 LightFactor = ao * ambient + DiffuseComponent + SpecularComponent * (1. - color.a);
+    FragColor = vec4(color.xyz * LightFactor * (0.4 + ao*0.6), 1.);
+    //FragColor = vec4(color.xyz * LightFactor, 1.);
+}

data/shaders/movingtexture.vert

@@ -0,0 +1,16 @@
+#version 330
+uniform mat4 ModelViewProjectionMatrix;
+uniform mat4 TextureMatrix;
+
+in vec3 Position;
+in vec2 Texcoord;
+in vec2 SecondTexcoord;
+out vec2 uv;
+out vec2 uv_bis;
+
+void main(void)
+{
+    uv = (TextureMatrix * vec4(Texcoord, 1., 1.)).xy;
+	uv_bis = SecondTexcoord;
+    gl_Position = ModelViewProjectionMatrix * vec4(Position, 1.);
+}

data/shaders/multiply.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex1;
 uniform sampler2D tex2;
 

data/shaders/normalmap.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D normalMap;
 
 noperspective in vec3 tangent;

data/shaders/normalmap.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/object_pass1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 noperspective in vec3 nor;
 out vec2 EncodedNormal;
 

data/shaders/object_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/object_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/object_pass2.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 
 in vec3 Position;

data/shaders/object_unlit.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 in vec2 uv;
 out vec4 FragColor;

data/shaders/objectpass.frag

@@ -1,32 +0,0 @@
-#version 130
-uniform sampler2D tex;
-uniform sampler2D lighttex;
-uniform int hastex;
-uniform int haslightmap;
-
-noperspective in vec3 nor;
-in vec4 color;
-in vec2 uv0;
-in vec2 uv1;
-out vec4 Albedo;
-out vec4 NormalDepth;
-out vec4 Specular;
-
-void main() {
-	vec4 light = vec4(1.0);
-	vec4 col;
-
-	if (haslightmap != 0) {
-		light = texture(lighttex, uv1);
-	}
-
-	if (hastex != 0)
-		col = texture(tex, uv0) * light;
-	else
-		col = color;
-
-	Albedo = vec4(col.xyz, 1.);
-	NormalDepth = vec4(0.5 * normalize(nor) + 0.5, gl_FragCoord.z);
-	Specular = vec4(1. - col.a);
-}
-

data/shaders/objectpass.vert

@@ -1,19 +0,0 @@
-#version 130
-uniform mat4 ModelViewProjectionMatrix;
-uniform mat4 TransposeInverseModelView;
-uniform mat4 TextureMatrix0;
-uniform mat4 TextureMatrix1;
-
-noperspective out vec3 nor;
-out vec4 color;
-out vec2 uv0;
-out vec2 uv1;
-
-void main() {
-
-	nor = (TransposeInverseModelView * vec4(gl_Normal, 1.)).xyz;
-	uv0 = (gl_TextureMatrix[0] * gl_MultiTexCoord0).st;
-	uv1 = (gl_TextureMatrix[1] * gl_MultiTexCoord1).st;
-	gl_Position = ModelViewProjectionMatrix * gl_Vertex;
-	color = gl_Color;
-}

data/shaders/objectpass_ref.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform int hastex;
 uniform float objectid;

data/shaders/objectpass_rimlit.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/objectpass_rimlit.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/objectpass_spheremap.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 noperspective in vec3 nor;

data/shaders/objectref_pass1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 noperspective in vec3 nor;

data/shaders/objectref_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/objectref_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/particle.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D dtex;
 uniform mat4 invproj;

data/shaders/particle.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ProjectionMatrix;
 uniform mat4 ViewMatrix;
 

data/shaders/particlesimheightmap.vert

@@ -1,4 +1,4 @@
-#version 140
+#version 330
 uniform int dt;
 uniform mat4 sourcematrix;
 uniform int level;

data/shaders/pass.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 
 out vec4 FragColor;

data/shaders/pass.vert

@@ -1,5 +1,5 @@
 // Passthrough shader for drawQuad()
-#version 130
+#version 330 compatibility
 
 out vec2 uv;
 

data/shaders/penumbrah.frag

@@ -1,7 +1,8 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 
+in vec2 uv;
 out vec4 FragColor;
 // Separated penumbra, horizontal
 
@@ -9,8 +10,8 @@ void main()
 {
 	float sum = 0.0;
 	vec4 tmp;
-	float X = gl_TexCoord[0].x;
-	float Y = gl_TexCoord[0].y;
+	float X = uv.x;
+	float Y = uv.y;
 	float width = 0.0;
 	float zsum = 0.00001;
 

data/shaders/penumbrav.frag

@@ -1,7 +1,8 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 
+in vec2 uv;
 out vec4 FragColor;
 
 // Separated penumbra, vertical
@@ -10,8 +11,8 @@ void main()
 {
 	float sum = 0.0;
 	vec4 tmp;
-	float X = gl_TexCoord[0].x;
-	float Y = gl_TexCoord[0].y;
+	float X = uv.x;
+	float Y = uv.y;
 	float width = 0.0;
 	float zsum = 0.00001;
 

data/shaders/pointemitter.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform int dt;
 uniform mat4 sourcematrix;
 uniform int level;

data/shaders/pointlight.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 

data/shaders/ppdisplace.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D dtex;
 

data/shaders/rain.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D normals_and_depth;
 uniform mat4 invproj;

data/shaders/rain.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform float screenw;
 
 void main()

data/shaders/rainsim.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform float time;
 uniform vec3 campos;
 uniform mat4 viewm;

data/shaders/screenquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 in vec2 Position;
 in vec2 Texcoord;

data/shaders/shadow.geom

@@ -0,0 +1,24 @@
+#version 330
+uniform mat4 ModelViewProjectionMatrix[4];
+
+layout(triangles) in;
+layout(triangle_strip, max_vertices=12) out;
+
+in vec2 tc[3];
+
+out vec2 uv;
+
+void main(void)
+{
+  for (int j = 0; j<4; j++)
+  {
+    gl_Layer = j;
+    for(int i=0; i<3; i++)
+    {
+      uv = tc[i];
+      gl_Position = ModelViewProjectionMatrix[j] * gl_in[i].gl_Position;
+      EmitVertex();
+    }
+    EndPrimitive();
+  }
+}

data/shaders/shadow.vert

@@ -0,0 +1,14 @@
+#version 330
+
+in vec3 Position;
+in vec2 Texcoord;
+
+
+out vec2 tc;
+
+
+void main(void)
+{
+    tc = Texcoord;
+    gl_Position = vec4(Position, 1.);
+}

data/shaders/shadowgen.frag

@@ -1,15 +1,17 @@
-#version 130
+#version 330
 uniform sampler2D halft; // half is a reserved word
 uniform sampler2D quarter;
 uniform sampler2D eighth;
+
+in vec2 uv;
 out vec4 FragColor;
 
 void main()
 {
 	vec3 val[3];
-	val[0] = texture(halft, gl_TexCoord[0].xy).xyz;
-	val[1] = texture(quarter, gl_TexCoord[0].xy).xyz;
-	val[2] = texture(eighth, gl_TexCoord[0].xy).xyz;
+	val[0] = texture(halft, uv).xyz;
+	val[1] = texture(quarter, uv).xyz;
+	val[2] = texture(eighth, uv).xyz;
 
 	// Find the first level with a penumbra value
 	int i;

data/shaders/shadowimportance.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D ntex;
 uniform sampler2D ctex;
 uniform vec3 campos;

data/shaders/shadowimportance.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D dtex;
 uniform mat4 ipvmat;
 uniform mat4 shadowmat;

data/shaders/shadowpass.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int hastex;
 uniform int viz;

data/shaders/shadowpass.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D warpx;
 uniform sampler2D warpy;
 

data/shaders/shadowwarph.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;

data/shaders/shadowwarpv.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;

data/shaders/skinning.vert

@@ -16,7 +16,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // skinning.vert
-#version 130
+#version 330 compatibility
 #define MAX_JOINT_NUM 36
 #define MAX_LIGHT_NUM 8
 

data/shaders/skybox.frag

@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D glow_tex;
 uniform float transparency;

data/shaders/skybox.vert

@@ -17,7 +17,7 @@
 
 
 // Creates a bubble (wave) effect by distorting the texture depending on time
-#version 130
+#version 330 compatibility
 uniform mat4 ModelViewProjectionMatrix;
 uniform float time;
 

data/shaders/splatting.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex_layout;
 uniform sampler2D tex_detail0;
 uniform sampler2D tex_detail1;

data/shaders/splatting.vert

@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/ssao.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform sampler2D noise_texture;

data/shaders/sunlight.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 //uniform sampler2D cloudtex;
@@ -12,7 +12,6 @@ uniform mat4 invproj;
 in vec2 uv;
 out vec4 Diff;
 out vec4 Spec;
-out vec4 SpecularMap;
 
 vec3 DecodeNormal(vec2 n)
 {
@@ -58,5 +57,4 @@ void main() {
 
 	Diff = vec4(NdotL * col, 1.);
 	Spec = vec4(Specular * col, 1.);
-	SpecularMap = vec4(1.0);
 }

data/shaders/sunlightshadow.frag

@@ -1,95 +1,125 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
-uniform sampler2D cloudtex;
-uniform sampler2D shadowtex;
-uniform sampler2D warpx;
-uniform sampler2D warpy;
+uniform sampler2DArrayShadow shadowtex;
+//uniform sampler2D warpx;
+///uniform sampler2D warpy;
 
-uniform vec3 center;
+uniform vec3 direction;
 uniform vec3 col;
-uniform vec2 screen;
-uniform mat4 invprojview;
-uniform mat4 shadowmat;
-uniform int hasclouds;
-uniform vec2 wind;
-uniform float shadowoffset;
+uniform mat4 invproj;
+uniform mat4 shadowmat[4];
+//uniform int hasclouds;
+//uniform vec2 wind;
+//uniform float shadowoffset;
 
-out vec4 FragColor;
-out vec4 OtherOutput;
+in vec2 uv;
+out vec4 Diff;
+out vec4 Spec;
 
-float decdepth(vec4 rgba) {
-	return dot(rgba, vec4(1.0, 1.0/255.0, 1.0/65025.0, 1.0/16581375.0));
+vec3 DecodeNormal(vec2 n)
+{
+  float z = dot(n, n) * 2. - 1.;
+  vec2 xy = normalize(n) * sqrt(1. - z * z);
+  return vec3(xy,z);
+}
+
+float getShadowFactor(vec3 pos, float bias, int index)
+{
+  //float a[5] = float[](3.4, 4.2, 5.0, 5.2, 1.1);
+  
+	const vec2 shadowoffset[4] = vec2[](
+		vec2(-1., -1.),
+		vec2(-1., 1.),
+		vec2(1., -1.),
+		vec2(1., 1.)
+	);
+
+	vec4 shadowcoord = (shadowmat[index] * vec4(pos, 1.0));
+	shadowcoord /= shadowcoord.w;
+	vec2 shadowtexcoord = shadowcoord.xy * 0.5 + 0.5;
+//	shadowcoord = (shadowcoord * 0.5) + vec3(0.5);
+
+//	float movex = decdepth(texture(warpx, shadowcoord.xy));
+//	float movey = decdepth(texture(warpy, shadowcoord.xy));
+//	float dx = movex * 2.0 - 1.0;
+//	float dy = movey * 2.0 - 1.0;
+//	shadowcoord.xy += vec2(dx, dy);*/
+
+//float shadowmapz = 2. * texture(shadowtex, vec3(shadowtexcoord, shadowcoord.z).x - 1.;
+//	bias += smoothstep(0.001, 0.1, moved) * 0.014; // According to the warping
+	float sum = 0.;
+	for (int i = 0; i < 4; i++)
+	{
+		sum += texture(shadowtex, vec4(shadowtexcoord + 0.0005 * shadowoffset[i], float(index), 0.5 * (shadowcoord.z + bias * 0.001) + 0.5));
+	}
+	return sum / 4.;
 }
 
 void main() {
+	float z = texture(dtex, uv).x;
+	vec4 xpos = 2.0 * vec4(uv, z, 1.0) - 1.0;
+	xpos = invproj * xpos;
+	xpos.xyz /= xpos.w;
 
-	vec2 texc = gl_FragCoord.xy / screen;
-	vec4 depthread = texture(dtex, texc);
-	float z = decdepth(vec4(depthread.xyz, 0.0));
-
-	if (z < 0.03)
-	{
-		// Skyboxes are fully lit
-		FragColor = vec4(1.0);
-		OtherOutput = vec4(0.0);
-		return;
-	}
-
-	vec3 norm = texture(ntex, texc).xyz;
-	norm = (norm - 0.5) * 2.0;
+	vec3 norm = normalize(DecodeNormal(2. * texture(ntex, uv).xy - 1.));
 
 	// Normalized on the cpu
-	vec3 L = center;
+	vec3 L = direction;
 
 	float NdotL = max(0.0, dot(norm, L));
-	if (NdotL < 0.01) discard;
+	vec3 R = reflect(L, norm);
+	float RdotE = max(0.0, dot(R, normalize(xpos.xyz)));
+	float Specular = pow(RdotE, 200);
 
 	vec3 outcol = NdotL * col;
 
-	// World-space position
-	vec3 tmp = vec3(texc, z);
-	tmp = tmp * 2.0 - 1.0;
+//	if (hasclouds == 1)
+//	{
+//		vec2 cloudcoord = (xpos.xz * 0.00833333) + wind;
+//		float cloud = texture(cloudtex, cloudcoord).x;
+//		//float cloud = step(0.5, cloudcoord.x) * step(0.5, cloudcoord.y);
 
-	vec4 xpos = vec4(tmp, 1.0);
-	xpos = invprojview * xpos;
-	xpos.xyz /= xpos.w;
-
-	if (hasclouds == 1)
-	{
-		vec2 cloudcoord = (xpos.xz * 0.00833333) + wind;
-		float cloud = texture(cloudtex, cloudcoord).x;
-		//float cloud = step(0.5, cloudcoord.x) * step(0.5, cloudcoord.y);
-
-		outcol *= cloud;
-	}
+//		outcol *= cloud;
+//	}
 
 	// Shadows
-	vec3 shadowcoord = (shadowmat * vec4(xpos.xyz, 1.0)).xyz;
-	shadowcoord = (shadowcoord * 0.5) + vec3(0.5);
-
-	float movex = decdepth(texture(warpx, shadowcoord.xy));
-	float movey = decdepth(texture(warpy, shadowcoord.xy));
-	float dx = movex * 2.0 - 1.0;
-	float dy = movey * 2.0 - 1.0;
-	shadowcoord.xy += vec2(dx, dy);
-
-	vec4 shadowread = texture(shadowtex, shadowcoord.xy);
-	float shadowmapz = decdepth(vec4(shadowread.xyz, 0.0));
-
-	float moved = (abs(dx) + abs(dy)) * 0.5;
-
-
-/*
 	float bias = 0.002 * tan(acos(NdotL)); // According to the slope
-	bias += smoothstep(0.001, 0.1, moved) * 0.014; // According to the warping
 	bias = clamp(bias, 0.001, 0.014);
-*/
-/*
-  float avi = 0.002;
-  float abi = 0.0025; */
+	float factor;
+	if (xpos.z < 20.)
+		factor = getShadowFactor(xpos.xyz, bias, 0);
+	else if (xpos.z < 25.)
+	{
+		float a = getShadowFactor(xpos.xyz, bias, 0), b = getShadowFactor(xpos.xyz, bias, 1);
+		factor = mix(a, b, (xpos.z - 20.) / 5.);
+	}
+	else if (xpos.z < 50.)
+		factor = getShadowFactor(xpos.xyz, bias, 1);
+	else if (xpos.z < 60.)
+	{
+		float a = getShadowFactor(xpos.xyz, bias, 1), b = getShadowFactor(xpos.xyz, bias, 2);
+		factor = mix(a, b, (xpos.z - 50.) / 10.);
+	}
+	else if (xpos.z < 100.)
+		factor = getShadowFactor(xpos.xyz, bias, 2);
+	else if (xpos.z < 120.)
+	{
+		float a = getShadowFactor(xpos.xyz, bias, 2), b = getShadowFactor(xpos.xyz, bias, 3);
+		factor = mix(a, b, (xpos.z - 100.) / 20.);
+	}
+	else
+		factor = getShadowFactor(xpos.xyz, bias, 3);
+	Diff = vec4(factor * NdotL * col, 1.);
+	Spec = vec4(factor * Specular * col, 1.);
+	return;
 
-  float avi = 0.0018;
+//	float moved = (abs(dx) + abs(dy)) * 0.5;
+
+//  float avi = 0.002;
+//  float abi = 0.0025;
+
+/*  float avi = 0.0018;
   float abi = 0.002;
 
 	float bias = avi * tan(acos(NdotL)); // According to the slope
@@ -113,11 +143,11 @@ void main() {
 	float shadowed = step(shadowmapz + bias, shadowcoord.z);
 	float dist = (shadowcoord.z / shadowmapz) - 1.0;
 	float penumbra = dist * softness / gl_FragCoord.z;
-	penumbra *= shadowed;
+	penumbra *= shadowed;*/
 
 /*	outcol.r = (shadowcoord.z - shadowmapz) * 50.0;
 	outcol.g = moved;*/
 
-	FragColor = vec4(outcol, 0.05);
-	OtherOutput = vec4(shadowed, penumbra, shadowed, shadowed);
+//	FragColor = vec4(outcol, 0.05);
+//	OtherOutput = vec4(shadowed, penumbra, shadowed, shadowed);
 }

data/shaders/texturedquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/texturedquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 uniform vec2 texcenter;

data/shaders/transparent.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/transparent.vert

@@ -1,5 +1,6 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
+uniform mat4 TextureMatrix;
 
 in vec3 Position;
 in vec2 Texcoord;
@@ -7,6 +8,6 @@ out vec2 uv;
 
 void main()
 {
-	uv = Texcoord;
+    uv = (TextureMatrix * vec4(Texcoord, 1., 1.)).xy;
     gl_Position = ModelViewProjectionMatrix * vec4(Position, 1.);
 }

data/shaders/transparentfog.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 uniform float fogmax;

data/shaders/untextured_object.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;
 uniform sampler2D SSAO;

data/shaders/untextured_object.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 
 in vec3 Position;

data/shaders/water.frag

@@ -1,6 +1,6 @@
 // Shader based on work by Fabien Sanglard
 // Released under the terms of CC-BY 3.0
-#version 130
+#version 330 compatibility
 uniform sampler2D BumpTex1; // Normal map 1
 uniform sampler2D BumpTex2; // Normal map 2
 uniform sampler2D DecalTex; //The texture

data/shaders/water.vert

@@ -1,6 +1,6 @@
 // Shader based on work by Fabien Sanglard
 // Released under the terms of CC-BY 3.0
-#version 130
+#version 330 compatibility
 uniform float speed;
 uniform float height;
 uniform float waveLength;

data/shaders/white.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 out vec4 FragColor;
 void main()
 {

lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp

@@ -744,9 +744,8 @@ bool CIrrDeviceLinux::createWindow()
 			int context_attribs[] =
 				{
 					GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-					GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-					// Uncomment to discard deprecated features
-					//GLX_CONTEXT_FLAGS_ARB        , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
+					GLX_CONTEXT_MINOR_VERSION_ARB, 3,
+                    GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //GLX_CONTEXT_CORE_PROFILE_BIT_ARB
 					GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_DEBUG_BIT_ARB,
 					None
 				};