Merge remote-tracking branch 'upstream/master' into walldriving

.gitignore

@@ -6,12 +6,15 @@ build-win/
 cmake_build/
 dependencies/
 CMakeFiles/
+stk-editor/
 
 .config/
 supertuxkart-64
 
+data/editor
 data/karts
 data/library
+data/models
 data/music
 data/sfx
 data/textures

.travis.yml

@@ -15,8 +15,9 @@ before_install:
   - sudo apt-get update -qq
   # Install dependencies
   - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
-  # Install mesa from an other repo (a newer version is required)
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu quantal main restricted"
+  # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
+  # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
+  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
   - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
   - sudo apt-get update -qq
   - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev

CMakeLists.txt

@@ -124,9 +124,9 @@ if(UNIX AND USE_XRANDR)
 endif()
 
 if(UNIX)
-    if(USE_CPP2011)
-        add_definitions("-std=c++0x")
-    endif()
+#    if(USE_CPP2011)
+        add_definitions("-std=gnu++0x")
+#    endif()
 endif()
 
 # OpenGL

data/gui/custom_video_settings.stkgui

@@ -70,27 +70,11 @@
             </div>
         </div>
 
-        <spacer height="20" width="10" />
-
-        <div layout="horizontal-row" width="100%" proportion="1">
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="motionblur"/>
-                <spacer width="10" height="10"/>
-                <label text="Motion blur" I18N="Video settings"/>
-            </div>
-
-            <spacer height="4" width="10" />
-
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="texture_compression"/>
-                <spacer width="10" height="10"/>
-                <label text="Texture compression" I18N="Video settings"/>
-            </div>
-        </div>
-
         <spacer height="4" width="10" />
 
         <div layout="horizontal-row" width="100%" proportion="1">
+            <spacer width="70" height="10"/>
+        
             <div layout="horizontal-row" proportion="1" height="fit">
                 <checkbox id="glow"/>
                 <spacer width="10" height="10"/>
@@ -105,7 +89,27 @@
                 <label text="Anti-aliasing" I18N="Video settings"/>
             </div>
         </div>
+        
+        <spacer height="4" width="10" />
 
+        <div layout="horizontal-row" width="100%" proportion="1">
+            <spacer width="70" height="10"/>
+            
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="motionblur"/>
+                <spacer width="10" height="10"/>
+                <label text="Motion blur" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
+
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="dof"/>
+                <spacer width="10" height="10"/>
+                <label text="Depth of field" I18N="Video settings"/>
+            </div>
+        </div>
+        
         <spacer height="4" width="10" />
 
         <div layout="horizontal-row" width="100%" proportion="1">
@@ -136,9 +140,9 @@
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="dof"/>
+                <checkbox id="texture_compression"/>
                 <spacer width="10" height="10"/>
-                <label text="Depth of field" I18N="Video settings"/>
+                <label text="Texture compression" I18N="Video settings"/>
             </div>
         </div>
 

data/models/License.txt

@@ -1,82 +0,0 @@
-* plunger model, cake model, bomb model, anchor model
-    created by MiniBjorn (c) 2008
-    released under Creative Commons Attribution-Share Alike 3.0
-    [http://creativecommons.org/licenses/by-sa/3.0/]
-
-* bubblegum model, nitrotank-big model, nitrotank-small model, giftbox model
-    created by MiniBjorn (c) 2008
-    released under Creative Commons Attribution-Share Alike 3.0
-    [http://creativecommons.org/licenses/by-sa/3.0/]
-
-* banana.ac
-    created by horace aka thomas oppl (toppl@fh-sbg.ac.at) (c) 2008
-    released under Creative Commons Attribution-Share Alike 3.0
-    [http://creativecommons.org/licenses/by-sa/3.0/]
-
-* chest*
-    by MiniBjorn (c) 2010
-    released under Creative Commons Attribution-Share Alike 3.0
-    [http://creativecommons.org/licenses/by-sa/3.0/]
-
-* gplose
-    released under CC-BY-SA 3.0 [http://creativecommons.org/licenses/by-sa/3.0/]
-    oak by Julius Krischan Makowka, released un CC-BY-SA 3.0
-    Tires by Thomas Oppl, released under CC-BY-SA 3.0
-    scene and finishing touches by Marianne Gagnon
-
-* Hammer.jpg
-    by Marianne Gagnon, released under CC-BY-SA 3.0
-    Incorporates image by Philipp Zinger, released under CCBY 3.0
-                 image by Louise Price, released under CC-BY 2.0 (considered a derivate work thus allowing to upgrade the license version),
-                 image by Smoth 007, released under CC-BY-SA 2.0 (considered a derivate work thus allowing to upgrade the license version),
-                 image by Juangonzalez64 released under the public domain
-    
-* swatter, christmas_hat
-    released under CC-BY-SA 3.0
-    by Funto
-
-* tire
-    based on work by Thomas Oppl, released under CC-BY-SA 3.0
-    with modifications by Marianne Gagnon
-
-* tnt-bomb
-    by Fraang, released under CC-BY-SA 3.0
-    
-* village
-    released under CC-BY-SA 3.0 [http://creativecommons.org/licenses/by-sa/3.0/]
-    oak by Julius Krischan Makowka, released un CC-BY-SA 3.0
-    mushrooms by pfunked, with modifications by Marianne Gagnon, released under CC-BY-SA 3.0
-    pinos by Moser Juan José, with minor modifications by Marianne Gagnon, released under CC-BY-SA 3.0
-    scene and finishing touches by Marianne Gagnon
-
-* shroom_color* textures by Julius Krischan Makowka, released un CC-BY-SA 3.0
-
-* door.png by Marianne Gagnon, released under CC-BY-SA 3.0, based on a public domain image
-    from BurningWell.
-
-* zipper_collect
-    by Connor, released as Public Domain
-
-* rubber_ball and jump-bomb.jpg
-    by Samuncle, released under CC-BY-SA
-
-* thunderbird model
-    by Funto & Kinsu, released under CC-BY-SA 3.0
-
-* thunderbird texture, easter egg, bomb texture
-    by Fraag, released under CC-BY-SA 3.0
-
-* swatter-icon
-    by Totoplus62, released under CC-0
-  
-* balldimpleddark
-    by Hero, released under CC-BY-SA 3.0
-
-* rubber_ball-icon, plunger icon, easter egg icon, cake icon, bowling ball texture and icon
-    by Totoplus62, released under CC-BY-SA 3.0
-
-* shield-icon
-   by tuxfan, release under CC-BY-SA 3.0
-    
-    
-Others are GPL, by the original (super)TuxKart team

data/models/materials.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-  <material name="banana.png"/>
-  <material name="gift-box.png"/>
-  <material name="gift-loop.png"  shader="spheremap"/>
-  <material name="gold.png"  light="Y" shader="spheremap"/>
-  <material name="silver.png"  light="Y" shader="spheremap"/>
-  <material name="bronze.png"  light="Y" shader="spheremap"/>
-
-  <material name="stk_mod_nitroBarrel.png" /> 
-  <material name="stk_mod_nitroBottle.png" />
-  <material name="stk_mod_nitroLogo.png" shader="additive" disable-z-write="Y" />
-
-  <material name="traffic_light_green.jpg" shader="unlit"/>
-  <material name="traffic_light_yellow.jpg" shader="unlit"/>
-  <material name="traffic_light_red.jpg" shader="unlit"/>
-  
-  <material name="bubblegum_shield.png" shader="alphablend" disable-z-write="Y"/>
-  <material name="bubblegum_shield_nolok.png" shader="alphablend" disable-z-write="Y"/>
-  <material name="parachute.png" backface-culling="n" ignore="Y"/>
-  <material name="zipper.png" shader="unlit" zipper="Y"/>
-</materials>
-

data/models/referee.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!-- model: the model filename to load as referee
-    {first,last}-rescue-frame: Frame numbers for the rescue animation.
-    {first,last}-start-frame: Frame numbers for the start animation.
-    start-offset: XYZ offset relative to kart where to display the start referee
-    scale: Scales the mesh. 
-    start-rotation: Rotation of the referee at start
-    colors: Three texture names that are used for ready, set, go.  -->
-
-<referee model="thunderbird.b3d"
-         first-rescue-frame="625"
-         last-rescue-frame="700"
-         first-start-frame="265"
-         last-start-frame="290"
-         start-offset="-1.2 2 2"
-         scale = "0.2 0.2 0.2"
-         start-rotation="0 180 0"
-         colors="traffic_light_red.jpg traffic_light_yellow.jpg traffic_light_green.jpg"
-/>

data/shaders/displace.frag

@@ -42,14 +42,6 @@ void main()
 	// Fade according to distance to cam
 	float fade = 1.0 - smoothstep(1.0, 100.0, camdist);
 
-	// Fade according to distance from the edges
-	const float mindist = 0.1;
-	fade *= smoothstep(0.0, mindist, uv_bis.x) * smoothstep(0.0, mindist, uv_bis.y) *
-		(1.0 - smoothstep(1.0 - mindist, 1.0, uv_bis.x)) *
-		(1.0 - smoothstep(1.0 - mindist, 1.0, uv_bis.y));
-
-	offset *= 50.0 * fade * maxlen;
-
 	vec4 shiftval;
 	shiftval.r = step(offset.x, 0.0) * -offset.x;
 	shiftval.g = step(0.0, offset.x) * offset.x;

data/shaders/grass_pass.vert

@@ -1,7 +1,23 @@
-uniform vec3 windDir;
-uniform mat4 ModelViewProjectionMatrix;
-uniform mat4 TransposeInverseModelView;
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+#else
+layout (std140) uniform MatrixesData
+{
+    mat4 ViewMatrix;
+    mat4 ProjectionMatrix;
+    mat4 InverseViewMatrix;
+    mat4 InverseProjectionMatrix;
+    mat4 ShadowViewProjMatrixes[4];
+    vec2 screen;
+};
+#endif
 
+uniform vec3 windDir;
+uniform mat4 ModelMatrix;
+uniform mat4 InverseModelMatrix;
 
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;
@@ -20,7 +36,9 @@ out vec2 uv;
 
 void main()
 {
-	uv = Texcoord;
-	nor = (TransposeInverseModelView * vec4(Normal, 1.)).xyz;
-	gl_Position = ModelViewProjectionMatrix * vec4(Position + windDir * Color.r, 1.);
+    uv = Texcoord;
+    mat4 ModelViewProjectionMatrix = ProjectionMatrix * ViewMatrix * ModelMatrix;
+    mat4 TransposeInverseModelView = transpose(InverseModelMatrix * InverseViewMatrix);
+    nor = (TransposeInverseModelView * vec4(Normal, 1.)).xyz;
+    gl_Position = ModelViewProjectionMatrix * vec4(Position + windDir * Color.r, 1.);
 }

data/shaders/grass_pass2.frag

@@ -1,8 +1,24 @@
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+uniform vec2 screen;
+#else
+layout (std140) uniform MatrixesData
+{
+    mat4 ViewMatrix;
+    mat4 ProjectionMatrix;
+    mat4 InverseViewMatrix;
+    mat4 InverseProjectionMatrix;
+    mat4 ShadowViewProjMatrixes[4];
+    vec2 screen;
+};
+#endif
+
 uniform sampler2D Albedo;
 uniform vec3 SunDir;
-uniform mat4 invproj;
 uniform sampler2D dtex;
-uniform vec2 screen;
 
 in vec3 nor;
 in vec2 uv;
@@ -16,7 +32,7 @@ void main(void)
     float z = texture(dtex, texc).x;
 
     vec4 xpos = 2.0 * vec4(texc, z, 1.0) - 1.0f;
-    xpos = invproj * xpos;
+    xpos = InverseProjectionMatrix * xpos;
     xpos /= xpos.w;
     vec3 eyedir = normalize(xpos.xyz);