Merge remote branch 'origin/master' into new_login

data/gui/custom_video_settings.stkgui

@@ -124,13 +124,12 @@
         </div>
         
         <spacer height="4" width="10" />
-        <!--
+        
         <div layout="horizontal-row" proportion="1" height="fit">
-            <checkbox id="anim_gfx"/>
+            <checkbox id="dof"/>
             <spacer width="10" height="10"/>
-            <label text="Animated Scenery" I18N="Video settings"/>
+            <label text="Depth of field" I18N="Video settings"/>
         </div>
-        -->
     </div>
     
     <spacer height="20" width="10" />

data/shaders/fog.frag

@@ -6,27 +6,33 @@ uniform float endH;
 uniform float start;
 uniform float end;
 uniform vec3 col;
-uniform mat4 ipvmat;
 
-#if __VERSION__ >= 130
-in vec2 uv;
-out vec4 FragColor;
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
 #else
-varying vec2 uv;
-#define FragColor gl_FragColor
+layout (std140) uniform MatrixesData
+{
+    mat4 ViewMatrix;
+    mat4 ProjectionMatrix;
+    mat4 InverseViewMatrix;
+    mat4 InverseProjectionMatrix;
+    mat4 ShadowViewProjMatrixes[4];
+};
 #endif
 
+in vec2 uv;
+out vec4 FragColor;
+
+
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
 
 void main()
 {
 	float z = texture(tex, uv).x;
-
-	vec3 tmp = vec3(uv, z);
-	tmp = tmp * 2.0 - 1.0;
-
-	vec4 xpos = vec4(tmp, 1.0);
-	xpos = ipvmat * xpos;
-	xpos.xyz /= xpos.w;
+	vec4 xpos = getPosFromUVDepth(vec3(uv, z), InverseProjectionMatrix);
 
 	float dist = length(xpos.xyz);
 	float fog = smoothstep(start, end, dist);

data/shaders/objectpass_spheremap.frag

@@ -1,3 +1,9 @@
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+#else
 layout (std140) uniform MatrixesData
 {
     mat4 ViewMatrix;
@@ -6,6 +12,7 @@ layout (std140) uniform MatrixesData
     mat4 InverseProjectionMatrix;
     mat4 ShadowViewProjMatrixes[4];
 };
+#endif
 
 uniform samplerCube tex;
 uniform vec2 screen;

data/shaders/pointlight.frag

@@ -1,10 +1,24 @@
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform float spec;
-uniform mat4 invproj;
-uniform mat4 ViewMatrix;
 uniform vec2 screen;
 
+#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];
+};
+#endif
+
 flat in vec3 center;
 flat in float energy;
 flat in vec3 col;
@@ -14,6 +28,7 @@ out vec4 Specular;
 
 vec3 DecodeNormal(vec2 n);
 vec3 getSpecular(vec3 normal, vec3 eyedir, vec3 lightdir, vec3 color, float roughness);
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
 
 void main()
 {
@@ -22,9 +37,7 @@ void main()
     vec3 norm = normalize(DecodeNormal(2. * texture(ntex, texc).xy - 1.));
     float roughness = texture(ntex, texc).z;
 
-    vec4 xpos = 2.0 * vec4(texc, z, 1.0) - 1.0f;
-    xpos = invproj * xpos;
-    xpos /= xpos.w;
+    vec4 xpos = getPosFromUVDepth(vec3(texc, z), InverseProjectionMatrix);
     vec3 eyedir = -normalize(xpos.xyz);
 
     vec4 pseudocenter = ViewMatrix * vec4(center.xyz, 1.0);
@@ -33,6 +46,9 @@ void main()
     vec3 light_col = col.xyz;
     float d = distance(light_pos, xpos.xyz);
     float att = energy * 200. / (1. + 33. * d + 33. * d * d);
+    float max_d = 20. * energy;
+    att *= (max_d - d) / max_d;
+    if (att <= 0.) discard;
 
     // Light Direction
     vec3 L = -normalize(xpos.xyz - light_pos);

data/shaders/pointlight.vert

@@ -1,39 +1,122 @@
+#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];
+};
+#endif
 
 in vec3 Position;
 in float Energy;
 in vec3 Color;
 
-in vec2 Corner;
-
 flat out vec3 center;
 flat out float energy;
 flat out vec3 col;
 
 const float zNear = 1.;
 
-void main(void)
+// Code borrowed from https://software.intel.com/en-us/articles/deferred-rendering-for-current-and-future-rendering-pipelines
+// Maths explanations are found here http://www.gamasutra.com/view/feature/131351/the_mechanics_of_robust_stencil_.php?page=6
+
+vec2 UpdateClipRegionRoot(float nc,          /* Tangent plane x/y normal coordinate (view space) */
+                          float lc,          /* Light x/y coordinate (view space) */
+                          float lz,          /* Light z coordinate (view space) */
+                          float lightRadius,
+                          float cameraScale  /* Project scale for coordinate (_11 or _22 for x/y respectively) */)
 {
-    // Beyond that value, light is too attenuated
-    float r = 100 * Energy;
-    center = Position;
-    energy = Energy;
-    vec4 Center = ViewMatrix * vec4(Position, 1.);
-    vec4 ProjectedCornerPosition = ProjectionMatrix * (Center + r * vec4(Corner, 0., 0.));
-    float adjustedDepth = ProjectedCornerPosition.z;
-    if (Center.z > zNear) // Light is in front of the cam
-    {
-        adjustedDepth = max(Center.z - r, zNear);
+    float nz = (lightRadius - nc * lc) / lz;
+    float pz = (lc * lc + lz * lz - lightRadius * lightRadius) /
+               (lz - (nz / nc) * lc);
+
+    if (pz > 0.) {
+        float c = -nz * cameraScale / nc;
+        if (nc > 0.) // Left side boundary
+            return vec2(c, 1.);
+        else // Right side boundary
+            return vec2(-1., c);
     }
-    else if (Center.z + r > zNear) // Light is behind the cam but in range
-    {
-        adjustedDepth = zNear;
+    return vec2(-1., 1.);
+}
+
+vec2 UpdateClipRegion(float lc,          /* Light x/y coordinate (view space) */
+                      float lz,          /* Light z coordinate (view space) */
+                      float lightRadius,
+                      float cameraScale  /* Project scale for coordinate (_11 or _22 for x/y respectively) */)
+{
+    float rSq = lightRadius * lightRadius;
+    float lcSqPluslzSq = lc * lc + lz * lz;
+    float d = rSq * lc * lc - lcSqPluslzSq * (rSq - lz * lz);
+
+    // The camera is inside lignt bounding sphere, quad fits whole screen
+    if (d <= 0.)
+        return vec2(-1., 1.);
+
+    float a = lightRadius * lc;
+    float b = sqrt(d);
+    float nx0 = (a + b) / lcSqPluslzSq;
+    float nx1 = (a - b) / lcSqPluslzSq;
+
+    vec2 clip0 = UpdateClipRegionRoot(nx0, lc, lz, lightRadius, cameraScale);
+    vec2 clip1 = UpdateClipRegionRoot(nx1, lc, lz, lightRadius, cameraScale);
+    return vec2(max(clip0.x, clip1.x), min(clip0.y, clip1.y));
+}
+
+// Returns bounding box [min.x, max.x, min.y, max.y] in clip [-1, 1] space.
+vec4 ComputeClipRegion(vec3 lightPosView, float lightRadius)
+{
+    if (lightPosView.z + lightRadius >= zNear) {
+        vec2 clipX = UpdateClipRegion(lightPosView.x, lightPosView.z, lightRadius, ProjectionMatrix[0][0]);
+        vec2 clipY = UpdateClipRegion(lightPosView.y, lightPosView.z, lightRadius, ProjectionMatrix[1][1]);
+
+        return vec4(clipX, clipY);
     }
 
-    ProjectedCornerPosition /= ProjectedCornerPosition.w;
-    ProjectedCornerPosition.zw = (ProjectionMatrix * vec4(0., 0., adjustedDepth, 1.)).zw;
-    ProjectedCornerPosition.xy *= ProjectedCornerPosition.w;
-    col = Color;
-    gl_Position = ProjectedCornerPosition;
+    return vec4(0.);
+}
+
+
+void main(void)
+{
+    float radius = 20. * Energy;
+    vec4 Center = ViewMatrix * vec4(Position, 1.);
+    Center /= Center.w;
+
+    vec2 ProjectedCornerPosition;
+    vec4 clip = ComputeClipRegion(Center.xyz, radius);
+    switch (gl_VertexID)
+    {
+    case 0:
+        ProjectedCornerPosition = clip.xz;
+        break;
+    case 1:
+        ProjectedCornerPosition = clip.xw;
+        break;
+    case 2:
+        ProjectedCornerPosition = clip.yz;
+        break;
+    case 3:
+        ProjectedCornerPosition = clip.yw;
+        break;
+    }
+
+    // Work out nearest depth for quad Z
+    // Clamp to near plane in case this light intersects the near plane... don't want our quad to be clipped
+    float quadDepth = max(zNear, Center.z - radius);
+
+    // Project quad depth into clip space
+    vec4 quadClip = ProjectionMatrix * vec4(0., 0., quadDepth, 1.0f);
+    gl_Position = vec4(ProjectedCornerPosition, quadClip.z / quadClip.w, 1.);
+
+    col = Color;
+    center = Position;
+    energy = Energy;
 }

data/shaders/sky.frag

@@ -1,3 +1,9 @@
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+#else
 layout (std140) uniform MatrixesData
 {
     mat4 ViewMatrix;
@@ -6,6 +12,7 @@ layout (std140) uniform MatrixesData
     mat4 InverseProjectionMatrix;
     mat4 ShadowViewProjMatrixes[4];
 };
+#endif
 
 uniform samplerCube tex;
 uniform vec2 screen;

data/shaders/ssao.frag

@@ -1,17 +1,26 @@
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform sampler2D noise_texture;
-uniform mat4 invprojm;
-uniform mat4 projm;
 uniform vec4 samplePoints[16];
 
-#if __VERSION__ >= 130
+#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];
+};
+#endif
+
 in vec2 uv;
 out float AO;
-#else
-varying vec2 uv;
-#define AO gl_FragColor.x
-#endif
 
 const float strengh = 5.;
 const float radius = 1.f;
@@ -28,13 +37,13 @@ vec3 rand(vec2 co)
 }
 
 vec3 DecodeNormal(vec2 n);
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
 
 void main(void)
 {
 	vec4 cur = texture(ntex, uv);
 	float curdepth = texture(dtex, uv).x;
-	vec4 FragPos = invprojm * (2.0f * vec4(uv, curdepth, 1.0f) - 1.0f);
-	FragPos /= FragPos.w;
+    vec4 FragPos = getPosFromUVDepth(vec3(uv, curdepth), InverseProjectionMatrix);
 
 	// get the normal of current fragment
 	vec3 norm = normalize(DecodeNormal(2. * texture(ntex, uv).xy - 1.));
@@ -52,15 +61,14 @@ void main(void)
 		vec3 sampleDir = samplePoints[i].x * tangent + samplePoints[i].y * bitangent + samplePoints[i].z * norm;
 		sampleDir *= samplePoints[i].w;
 		vec4 samplePos = FragPos + radius * vec4(sampleDir, 0.0);
-		vec4 sampleProj = projm * samplePos;
+		vec4 sampleProj = ProjectionMatrix * samplePos;
 		sampleProj /= sampleProj.w;
 
 		bool isInsideTexture = (sampleProj.x > -1.) && (sampleProj.x < 1.) && (sampleProj.y > -1.) && (sampleProj.y < 1.);
 		// get the depth of the occluder fragment
 		float occluderFragmentDepth = texture(dtex, (sampleProj.xy * 0.5) + 0.5).x;
 		// Position of the occluder fragment in worldSpace
-		vec4 occluderPos = invprojm * vec4(sampleProj.xy, 2.0 * occluderFragmentDepth - 1.0, 1.0f);
-		occluderPos /= occluderPos.w;
+		vec4 occluderPos = getPosFromUVDepth(vec3((sampleProj.xy * 0.5) + 0.5, occluderFragmentDepth), InverseProjectionMatrix);
 
 		bool isOccluded = isInsideTexture && (sampleProj.z > (2. * occluderFragmentDepth - 1.0)) && (distance(FragPos, occluderPos) < radius);
 		bl += isOccluded ? samplePoints[i].z * smoothstep(5 * radius, 0, distance(samplePos, FragPos)) : 0.;

data/shaders/sunlight.frag

@@ -8,6 +8,22 @@ uniform mat4 invproj;
 //uniform int hasclouds;
 //uniform vec2 wind;
 
+#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];
+};
+#endif
+
 #if __VERSION__ >= 130
 in vec2 uv;
 out vec4 Diff;
@@ -21,12 +37,11 @@ varying vec2 uv;
 
 vec3 DecodeNormal(vec2 n);
 vec3 getSpecular(vec3 normal, vec3 eyedir, vec3 lightdir, vec3 color, float roughness);
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
 
 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;
+	vec4 xpos = getPosFromUVDepth(vec3(uv, z), InverseProjectionMatrix);
 
 	if (z < 0.03)
 	{

data/shaders/sunlightshadow.frag

@@ -10,6 +10,13 @@ uniform vec3 col;
 //uniform vec2 wind;
 //uniform float shadowoffset;
 
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+uniform mat4 ShadowViewProjMatrixes[4];
+#else
 layout (std140) uniform MatrixesData
 {
     mat4 ViewMatrix;
@@ -18,6 +25,7 @@ layout (std140) uniform MatrixesData
     mat4 InverseProjectionMatrix;
     mat4 ShadowViewProjMatrixes[4];
 };
+#endif
 
 in vec2 uv;
 out vec4 Diff;
@@ -25,6 +33,7 @@ out vec4 Spec;
 
 vec3 DecodeNormal(vec2 n);
 vec3 getSpecular(vec3 normal, vec3 eyedir, vec3 lightdir, vec3 color, float roughness);
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
 
 float getShadowFactor(vec3 pos, float bias, int index)
 {
@@ -60,9 +69,7 @@ float getShadowFactor(vec3 pos, float bias, int index)
 
 void main() {
 	float z = texture(dtex, uv).x;
-	vec4 xpos = 2.0 * vec4(uv, z, 1.0) - 1.0;
-	xpos = InverseProjectionMatrix * xpos;
-	xpos.xyz /= xpos.w;
+	vec4 xpos = getPosFromUVDepth(vec3(uv, z), InverseProjectionMatrix);
 
 	vec3 norm = normalize(DecodeNormal(2. * texture(ntex, uv).xy - 1.));
     float roughness =texture(ntex, uv).z;

data/shaders/sunlightshadowdebug.frag

@@ -5,6 +5,13 @@ uniform sampler2DArrayShadow shadowtex;
 uniform vec3 direction;
 uniform vec3 col;
 
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+uniform mat4 ShadowViewProjMatrixes[4];
+#else
 layout (std140) uniform MatrixesData
 {
     mat4 ViewMatrix;
@@ -13,6 +20,7 @@ layout (std140) uniform MatrixesData
     mat4 InverseProjectionMatrix;
     mat4 ShadowViewProjMatrixes[4];
 };
+#endif
 
 
 in vec2 uv;

data/shaders/utils/getPosFromUVDepth.frag

@@ -0,0 +1,8 @@
+vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix)
+{
+    vec4 pos = 2.0 * vec4(uvDepth, 1.0) - 1.0f;
+    pos.xy *= vec2(InverseProjectionMatrix[0][0], InverseProjectionMatrix[1][1]);
+    pos.zw = vec2(pos.z * InverseProjectionMatrix[2][2] + pos.w, pos.z * InverseProjectionMatrix[2][3] + pos.w);
+    pos /= pos.w;
+    return pos;
+}

src/animations/animation_base.hpp

@@ -47,9 +47,6 @@ private:
     *  one time only (which might get triggered more than once). */
     enum AnimTimeType { ATT_CYCLIC, ATT_CYCLIC_ONCE } m_anim_type;
 
-    /** True if the animation is currently playing. */
-    bool  m_playing;
-
     /** The current time used in the IPOs. */
     float m_current_time;
 
@@ -66,6 +63,9 @@ protected:
     /** All IPOs for this animation. */
     PtrVector<Ipo>  m_all_ipos;
 
+    /** True if the animation is currently playing. */
+    bool  m_playing;
+    
 public:
                  AnimationBase(const XMLNode &node);
                  AnimationBase(Ipo *ipo);

src/animations/three_d_animation.cpp

@@ -81,6 +81,8 @@ void ThreeDAnimation::update(float dt)
         //m_node->setPosition(xyz.toIrrVector());
         //m_node->setScale(scale.toIrrVector());
 
+        if (!m_playing) return;
+
         // Note that the rotation order of irrlicht is different from the one
         // in blender. So in order to reproduce the blender IPO rotations
         // correctly, we have to get the rotations around each axis and combine

src/config/user_config.hpp

@@ -458,6 +458,9 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam        m_dynamic_lights
         PARAM_DEFAULT(BoolUserConfigParam(false, "enable_dynamic_lights",
         &m_video_group, "Enable Dynamic Lights"));
+    PARAM_PREFIX BoolUserConfigParam        m_dof
+        PARAM_DEFAULT(BoolUserConfigParam(false, "enable_dof",
+        &m_video_group, "Enable Depth of Field"));
 
     // ---- Debug - not saved to config file
     /** If gamepad debugging is enabled. */

src/graphics/glwrap.cpp

@@ -304,6 +304,11 @@ GLuint getDepthTexture(irr::video::ITexture *tex)
 
 std::set<irr::video::ITexture *> AlreadyTransformedTexture;
 
+void resetTextureTable()
+{
+    AlreadyTransformedTexture.clear();
+}
+
 void compressTexture(irr::video::ITexture *tex, bool srgb)
 {
     if (AlreadyTransformedTexture.find(tex) != AlreadyTransformedTexture.end())

src/graphics/glwrap.hpp

@@ -159,6 +159,7 @@ GLint LoadProgram(Types ... args)
 
 GLuint getTextureGLuint(irr::video::ITexture *tex);
 GLuint getDepthTexture(irr::video::ITexture *tex);
+void resetTextureTable();
 void compressTexture(irr::video::ITexture *tex, bool srgb);
 void blitFBO(GLuint Src, GLuint Dst, size_t width, size_t height);
 

src/graphics/irr_driver.cpp

@@ -463,6 +463,7 @@ void IrrDriver::initDevice()
 
         irr::video::COpenGLDriver*    gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
         gl_driver->extGlGenQueries(1, &m_lensflare_query);
+        gl_driver->extGlGenQueries(Q_LAST, m_perf_query);
         m_query_issued = false;
 
         scene::IMesh * const sphere = m_scene_manager->getGeometryCreator()->createSphereMesh(1, 16, 16);
@@ -1810,14 +1811,21 @@ void IrrDriver::update(float dt)
     World *world = World::getWorld();
 
     if (GUIEngine::getCurrentScreen() != NULL &&
-             GUIEngine::getCurrentScreen()->needs3D())
+        GUIEngine::getCurrentScreen()->needs3D() &&
+        world != NULL)
     {
         //printf("Screen that needs 3D\n");
-        m_video_driver->beginScene(/*backBuffer clear*/true, /*zBuffer*/true,
-                                   video::SColor(0,0,0,255));
-        m_scene_manager->drawAll();
+        //m_video_driver->beginScene(/*backBuffer clear*/true, /*zBuffer*/true,
+        //                           video::SColor(0,0,0,255));
+        //m_scene_manager->drawAll();
+
+        if (m_glsl)
+            renderGLSL(dt);
+        else
+            renderFixed(dt);
+
         GUIEngine::render(dt);
-        m_video_driver->endScene();
+        //m_video_driver->endScene();
         return;
     }
     else if (!world)

src/graphics/irr_driver.hpp

@@ -74,6 +74,15 @@ enum STKRenderingPass
     PASS_COUNT,
 };
 
+enum QueryPerf
+{
+    Q_SOLID_PASS1,
+    Q_SOLID_PASS2,
+    Q_LIGHT,
+    Q_SHADOWS,
+    Q_LAST
+};
+
 /**
   * \brief class that creates the irrLicht device and offers higher-level
   *  ways to manage the 3D scene
@@ -211,6 +220,7 @@ private:
     unsigned             object_count[PASS_COUNT];
     u32                  m_renderpass;
     u32                  m_lensflare_query;
+    u32                  m_perf_query[Q_LAST];
     bool                 m_query_issued;
     class STKMeshSceneNode *m_sun_interposer;
     scene::CLensFlareSceneNode *m_lensflare;

src/graphics/material_manager.cpp

@@ -111,9 +111,9 @@ void MaterialManager::setAllMaterialFlags(video::ITexture* t,
 
     mb->getMaterial().ColorMaterial = video::ECM_DIFFUSE_AND_AMBIENT;
 
-    if (World::getWorld() != NULL && World::getWorld()->getTrack() != NULL)
+    if (World::getWorld() != NULL)
     {
-        mb->getMaterial().FogEnable = World::getWorld()->getTrack()->isFogEnabled();
+        mb->getMaterial().FogEnable = World::getWorld()->isFogEnabled();
     }
 
 

src/graphics/post_processing.cpp

@@ -274,7 +274,7 @@ void PostProcessing::renderSunlight()
   glBindVertexArray(FullScreenShader::SunLightShader::vao);
   setTexture(0, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
   setTexture(1, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-  FullScreenShader::SunLightShader::setUniforms(cb->getPosition(), irr_driver->getInvProjMatrix(), cb->getRed(), cb->getGreen(), cb->getBlue(), 0, 1);
+  FullScreenShader::SunLightShader::setUniforms(cb->getPosition(), cb->getRed(), cb->getGreen(), cb->getBlue(), 0, 1);
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   glBindVertexArray(0);
 }
@@ -412,7 +412,7 @@ void PostProcessing::renderGlow(unsigned tex)
 
 ITexture *noise_tex = 0;
 
-void PostProcessing::renderSSAO(const core::matrix4 &invprojm, const core::matrix4 &projm)
+void PostProcessing::renderSSAO()
 {
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
@@ -427,12 +427,12 @@ void PostProcessing::renderSSAO(const core::matrix4 &invprojm, const core::matri
     setTexture(1, irr_driver->getDepthStencilTexture(), GL_LINEAR, GL_LINEAR);
     setTexture(2, getTextureGLuint(noise_tex), GL_LINEAR, GL_LINEAR);
 
-    FullScreenShader::SSAOShader::setUniforms(projm, invprojm, 0, 1, 2);
+    FullScreenShader::SSAOShader::setUniforms(0, 1, 2);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
-void PostProcessing::renderFog(const core::matrix4 &ipvmat)
+void PostProcessing::renderFog()
 {
     const Track * const track = World::getWorld()->getTrack();
 
@@ -457,7 +457,7 @@ void PostProcessing::renderFog(const core::matrix4 &ipvmat)
     glBindVertexArray(FullScreenShader::FogShader::vao);
 
     setTexture(0, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
-    FullScreenShader::FogShader::setUniforms(ipvmat, fogmax, startH, endH, start, end, col, 0);
+    FullScreenShader::FogShader::setUniforms(fogmax, startH, endH, start, end, col, 0);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
@@ -650,9 +650,12 @@ void PostProcessing::render()
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_BLEND);
 
-        renderDoF(out_fbo, in_rtt);
-        std::swap(in_rtt, out_rtt);
-        std::swap(in_fbo, out_fbo);
+        if (UserConfigParams::m_dof)
+        {
+            renderDoF(out_fbo, in_rtt);
+            std::swap(in_rtt, out_rtt);
+            std::swap(in_fbo, out_fbo);
+        }
 
         PROFILER_PUSH_CPU_MARKER("- Godrays", 0xFF, 0x00, 0x00);
         const bool hasgodrays = World::getWorld()->getTrack()->hasGodRays();

src/graphics/post_processing.hpp

@@ -76,8 +76,8 @@ public:
     void         renderSunlight();
     void         renderShadowedSunlight(const std::vector<core::matrix4> &sun_ortho_matrix, unsigned depthtex);
 
-    void renderFog(const core::matrix4 &ipvmat);
-    void renderSSAO(const core::matrix4 &invprojm, const core::matrix4 &projm);
+    void renderFog();
+    void renderSSAO();
     void renderDiffuseEnvMap(const float *bSHCoeff, const float *gSHCoeff, const float *rSHCoeff);
 
     /** Blur the in texture */

src/graphics/render.cpp

@@ -124,7 +124,7 @@ void IrrDriver::renderGLSL(float dt)
 
     RaceGUIBase *rg = world->getRaceGUI();
     if (rg) rg->update(dt);
-
+    irr::video::COpenGLDriver*	gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
 
     for(unsigned int cam = 0; cam < Camera::getNumCameras(); cam++)
     {
@@ -212,10 +212,10 @@ void IrrDriver::renderGLSL(float dt)
         renderSolidSecondPass();
         PROFILER_POP_CPU_MARKER();
 
-        if (UserConfigParams::m_dynamic_lights && World::getWorld()->getTrack()->isFogEnabled())
+        if (UserConfigParams::m_dynamic_lights && World::getWorld()->isFogEnabled())
         {
             PROFILER_PUSH_CPU_MARKER("- Fog", 0xFF, 0x00, 0x00);
-            m_post_processing->renderFog(irr_driver->getInvProjMatrix());
+            m_post_processing->renderFog();
             PROFILER_POP_CPU_MARKER();
         }
 
@@ -238,8 +238,6 @@ void IrrDriver::renderGLSL(float dt)
         const bool hasgodrays = World::getWorld()->getTrack()->hasGodRays();
         if (UserConfigParams::m_light_shaft && hasgodrays)//hasflare || hasgodrays)
         {
-            irr::video::COpenGLDriver*	gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
-
             GLuint res = 0;
             if (m_query_issued)
                 gl_driver->extGlGetQueryObjectuiv(m_lensflare_query, GL_QUERY_RESULT, &res);
@@ -301,6 +299,13 @@ void IrrDriver::renderGLSL(float dt)
         glDisable(GL_FRAMEBUFFER_SRGB);
     PROFILER_POP_CPU_MARKER();
 
+    GLuint perf_query_res[Q_LAST];
+    for (unsigned i = 0; i < Q_LAST; i++)
+    {
+        gl_driver->extGlGetQueryObjectuiv(m_perf_query[i], GL_QUERY_RESULT, &perf_query_res[i]);
+        Log::info("GPU Perf", "Phase %d : %d us\n", i, perf_query_res[i] / 1000);
+    }
+
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
@@ -440,6 +445,8 @@ void IrrDriver::renderSolidFirstPass()
     GroupedFPSM<FPSM_ALPHA_REF_TEXTURE>::reset();
     GroupedFPSM<FPSM_NORMAL_MAP>::reset();
 
+    irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
+    gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, m_perf_query[Q_SOLID_PASS1]);
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
     if (!UserConfigParams::m_dynamic_lights)
@@ -460,6 +467,7 @@ void IrrDriver::renderSolidFirstPass()
     {
         drawNormalPass(*GroupedFPSM<FPSM_NORMAL_MAP>::MeshSet[i], GroupedFPSM<FPSM_NORMAL_MAP>::MVPSet[i], GroupedFPSM<FPSM_NORMAL_MAP>::TIMVSet[i]);
     }
+    gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
 }
 
 void IrrDriver::renderSolidSecondPass()
@@ -492,6 +500,8 @@ void IrrDriver::renderSolidSecondPass()
     setTexture(0, m_rtts->getRenderTarget(RTT_TMP1), GL_NEAREST, GL_NEAREST);
     setTexture(1, m_rtts->getRenderTarget(RTT_TMP2), GL_NEAREST, GL_NEAREST);
     setTexture(2, m_rtts->getRenderTarget(RTT_SSAO), GL_NEAREST, GL_NEAREST);
+    irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
+    gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, m_perf_query[Q_SOLID_PASS2]);
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
 
     glUseProgram(MeshShader::ObjectPass2Shader::Program);
@@ -525,6 +535,7 @@ void IrrDriver::renderSolidSecondPass()
     glUseProgram(MeshShader::UntexturedObjectShader::Program);
     for (unsigned i = 0; i < GroupedSM<SM_UNTEXTURED>::MeshSet.size(); i++)
         drawUntexturedObject(*GroupedSM<SM_UNTEXTURED>::MeshSet[i], GroupedSM<SM_UNTEXTURED>::MVPSet[i]);
+    gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
 }
 
 void IrrDriver::renderTransparent()
@@ -673,7 +684,10 @@ void IrrDriver::renderShadows(//ShadowImportanceProvider * const sicb,
     glDrawBuffer(GL_NONE);
 
     glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO);
+    irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
+    gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, m_perf_query[Q_SHADOWS]);
     m_scene_manager->drawAll(scene::ESNRP_SOLID);
+    gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
     glDisable(GL_POLYGON_OFFSET_FILL);
 
 
@@ -858,11 +872,9 @@ static void renderPointLights(unsigned count)
     setTexture(0, irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), GL_NEAREST, GL_NEAREST);
     setTexture(1, irr_driver->getDepthStencilTexture(), GL_NEAREST, GL_NEAREST);
     LightShader::PointLightShader
-               ::setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(),
-                            irr_driver->getInvProjMatrix(), 
-                            core::vector2df(float(UserConfigParams::m_width),
-                                            float(UserConfigParams::m_height) ), 
-                            200, 0, 1);
+               ::setUniforms(core::vector2df(float(UserConfigParams::m_width),
+                             float(UserConfigParams::m_height) ), 
+                             200, 0, 1);
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, count);
 }
@@ -895,6 +907,7 @@ void IrrDriver::renderLights(const core::aabbox3df& cambox,
     const core::vector3df &campos =
         irr_driver->getSceneManager()->getActiveCamera()->getAbsolutePosition();
 
+    gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, m_perf_query[Q_LIGHT]);
     std::vector<LightNode *> BucketedLN[15];
     for (unsigned int i = 0; i < lightcount; i++)
     {
@@ -968,12 +981,13 @@ void IrrDriver::renderLights(const core::aabbox3df& cambox,
         glClearColor(1., 1., 1., 1.);
         glClear(GL_COLOR_BUFFER_BIT);
         glViewport(0, 0, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-        m_post_processing->renderSSAO(irr_driver->getInvProjMatrix(), irr_driver->getProjMatrix());
+        m_post_processing->renderSSAO();
         // Blur it to reduce noise.
         m_post_processing->renderGaussian6Blur(irr_driver->getFBO(FBO_SSAO), irr_driver->getRenderTargetTexture(RTT_SSAO),
             irr_driver->getFBO(FBO_HALF1), irr_driver->getRenderTargetTexture(RTT_HALF1), UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
         glViewport(0, 0, UserConfigParams::m_width, UserConfigParams::m_height);
     }
+    gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
 }
 
 static void getXYZ(GLenum face, float i, float j, float &x, float &y, float &z)

src/graphics/shaders.cpp

@@ -1627,6 +1627,7 @@ namespace MeshShader
 
     void GrassShadowShader::init()
     {
+        return;
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/grass_pass.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
@@ -1636,6 +1637,8 @@ namespace MeshShader
         uniform_tex = glGetUniformLocation(Program, "tex");
         attrib_color = glGetAttribLocation(Program, "Color");
         uniform_windDir = glGetUniformLocation(Program, "windDir");
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
     void GrassShadowShader::setUniforms(const core::matrix4 &ModelViewProjectionMatrix, const core::vector3df &windDirection, unsigned TU_tex)
@@ -1751,14 +1754,10 @@ namespace LightShader
     GLuint PointLightShader::attrib_Position;
     GLuint PointLightShader::attrib_Color;
     GLuint PointLightShader::attrib_Energy;
-    GLuint PointLightShader::attrib_Corner;
     GLuint PointLightShader::uniform_ntex;
     GLuint PointLightShader::uniform_dtex;
     GLuint PointLightShader::uniform_spec;
     GLuint PointLightShader::uniform_screen;
-    GLuint PointLightShader::uniform_invproj;
-    GLuint PointLightShader::uniform_VM;
-    GLuint PointLightShader::uniform_PM;
     GLuint PointLightShader::vbo;
     GLuint PointLightShader::vao;
 
@@ -1768,26 +1767,19 @@ namespace LightShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/pointlight.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/pointlight.frag").c_str());
         attrib_Position = glGetAttribLocation(Program, "Position");
         attrib_Color = glGetAttribLocation(Program, "Color");
         attrib_Energy = glGetAttribLocation(Program, "Energy");
-        attrib_Corner = glGetAttribLocation(Program, "Corner");
         uniform_ntex = glGetUniformLocation(Program, "ntex");
         uniform_dtex = glGetUniformLocation(Program, "dtex");
         uniform_spec = glGetUniformLocation(Program, "spec");
-        uniform_invproj = glGetUniformLocation(Program, "invproj");
         uniform_screen = glGetUniformLocation(Program, "screen");
-        uniform_VM = glGetUniformLocation(Program, "ViewMatrix");
-        uniform_PM = glGetUniformLocation(Program, "ProjectionMatrix");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
 
-        glBindBuffer(GL_ARRAY_BUFFER, SharedObject::billboardvbo);
-        glEnableVertexAttribArray(attrib_Corner);
-        glVertexAttribPointer(attrib_Corner, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
-
         glGenBuffers(1, &vbo);
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0, GL_DYNAMIC_DRAW);
@@ -1804,13 +1796,12 @@ namespace LightShader
         glVertexAttribDivisor(attrib_Color, 1);
     }
 
-    void PointLightShader::setUniforms(const core::matrix4 &ViewMatrix, const core::matrix4 &ProjMatrix, const core::matrix4 &InvProjMatrix, const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex)
+    void PointLightShader::setUniforms(const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex)
     {
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform1f(uniform_spec, 200);
         glUniform2f(uniform_screen, screen.X, screen.Y);
-        glUniformMatrix4fv(uniform_invproj, 1, GL_FALSE, InvProjMatrix.pointer());
-        glUniformMatrix4fv(uniform_VM, 1, GL_FALSE, ViewMatrix.pointer());
-        glUniformMatrix4fv(uniform_PM, 1, GL_FALSE, ProjMatrix.pointer());
 
         glUniform1i(uniform_ntex, TU_ntex);
         glUniform1i(uniform_dtex, TU_dtex);
@@ -2149,7 +2140,6 @@ namespace FullScreenShader
     GLuint SunLightShader::uniform_dtex;
     GLuint SunLightShader::uniform_direction;
     GLuint SunLightShader::uniform_col;
-    GLuint SunLightShader::uniform_invproj;
     GLuint SunLightShader::vao;
 
     void SunLightShader::init()
@@ -2158,18 +2148,21 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlight.frag").c_str());
         uniform_ntex = glGetUniformLocation(Program, "ntex");
         uniform_dtex = glGetUniformLocation(Program, "dtex");
         uniform_direction = glGetUniformLocation(Program, "direction");
         uniform_col = glGetUniformLocation(Program, "col");
-        uniform_invproj = glGetUniformLocation(Program, "invproj");
         vao = createVAO(Program);
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
-    void SunLightShader::setUniforms(const core::vector3df &direction, const core::matrix4 &InvProjMatrix, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex)
+    void SunLightShader::setUniforms(const core::vector3df &direction, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex)
     {
-        glUniformMatrix4fv(uniform_invproj, 1, GL_FALSE, InvProjMatrix.pointer());
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform3f(uniform_direction, direction.X, direction.Y, direction.Z);
         glUniform3f(uniform_col, r, g, b);
         glUniform1i(uniform_ntex, TU_ntex);
@@ -2221,6 +2214,7 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getSpecular.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlightshadow.frag").c_str());
         uniform_ntex = glGetUniformLocation(Program, "ntex");
         uniform_dtex = glGetUniformLocation(Program, "dtex");
@@ -2234,6 +2228,8 @@ namespace FullScreenShader
 
     void ShadowedSunLightShader::setUniforms(const core::vector3df &direction, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_shadowtex)
     {
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform3f(uniform_direction, direction.X, direction.Y, direction.Z);
         glUniform3f(uniform_col, r, g, b);
         glUniform1i(uniform_ntex, TU_ntex);
@@ -2268,6 +2264,8 @@ namespace FullScreenShader
 
     void ShadowedSunLightDebugShader::setUniforms(const core::vector3df &direction, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_shadowtex)
     {
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform3f(uniform_direction, direction.X, direction.Y, direction.Z);
         glUniform3f(uniform_col, r, g, b);
         glUniform1i(uniform_ntex, TU_ntex);
@@ -2422,8 +2420,6 @@ namespace FullScreenShader
     GLuint SSAOShader::uniform_ntex;
     GLuint SSAOShader::uniform_dtex;
     GLuint SSAOShader::uniform_noise_texture;
-    GLuint SSAOShader::uniform_invprojm;
-    GLuint SSAOShader::uniform_projm;
     GLuint SSAOShader::uniform_samplePoints;
     GLuint SSAOShader::vao;
     float SSAOShader::SSAOSamples[64];
@@ -2433,14 +2429,15 @@ namespace FullScreenShader
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/ssao.frag").c_str());
         uniform_ntex = glGetUniformLocation(Program, "ntex");
         uniform_dtex = glGetUniformLocation(Program, "dtex");
         uniform_noise_texture = glGetUniformLocation(Program, "noise_texture");
-        uniform_invprojm = glGetUniformLocation(Program, "invprojm");
-        uniform_projm = glGetUniformLocation(Program, "projm");
         uniform_samplePoints = glGetUniformLocation(Program, "samplePoints[0]");
         vao = createVAO(Program);
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
 
         // SSAOSamples[4 * i] and SSAOSamples[4 * i + 1] can be negative
 
@@ -2556,10 +2553,10 @@ namespace FullScreenShader
                     }*/
     }
 
-    void SSAOShader::setUniforms(const core::matrix4& projm, const core::matrix4 &invprojm, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_noise)
+    void SSAOShader::setUniforms(unsigned TU_ntex, unsigned TU_dtex, unsigned TU_noise)
     {
-        glUniformMatrix4fv(FullScreenShader::SSAOShader::uniform_invprojm, 1, GL_FALSE, invprojm.pointer());
-        glUniformMatrix4fv(FullScreenShader::SSAOShader::uniform_projm, 1, GL_FALSE, projm.pointer());
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform4fv(FullScreenShader::SSAOShader::uniform_samplePoints, 16, FullScreenShader::SSAOShader::SSAOSamples);
 
         glUniform1i(FullScreenShader::SSAOShader::uniform_ntex, TU_ntex);
@@ -2575,13 +2572,13 @@ namespace FullScreenShader
     GLuint FogShader::uniform_start;
     GLuint FogShader::uniform_end;
     GLuint FogShader::uniform_col;
-    GLuint FogShader::uniform_ipvmat;
     GLuint FogShader::vao;
 
     void FogShader::init()
     {
         Program = LoadProgram(
             GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
             GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/fog.frag").c_str());
         uniform_tex = glGetUniformLocation(Program, "tex");
         uniform_fogmax = glGetUniformLocation(Program, "fogmax");
@@ -2590,19 +2587,21 @@ namespace FullScreenShader
         uniform_start = glGetUniformLocation(Program, "start");
         uniform_end = glGetUniformLocation(Program, "end");
         uniform_col = glGetUniformLocation(Program, "col");
-        uniform_ipvmat = glGetUniformLocation(Program, "ipvmat");
         vao = createVAO(Program);
+        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
+        glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
     }
 
-    void FogShader::setUniforms(const core::matrix4 &ipvmat, float fogmax, float startH, float endH, float start, float end, const core::vector3df &col, unsigned TU_ntex)
+    void FogShader::setUniforms(float fogmax, float startH, float endH, float start, float end, const core::vector3df &col, unsigned TU_ntex)
     {
+        if (UserConfigParams::m_ubo_disabled)
+            bypassUBO(Program);
         glUniform1f(uniform_fogmax, fogmax);
         glUniform1f(uniform_startH, startH);
         glUniform1f(uniform_endH, endH);
         glUniform1f(uniform_start, start);
         glUniform1f(uniform_end, end);
         glUniform3f(uniform_col, col.X, col.Y, col.Z);
-        glUniformMatrix4fv(uniform_ipvmat, 1, GL_FALSE, ipvmat.pointer());
         glUniform1i(uniform_tex, TU_ntex);
     }
 

src/graphics/shaders.hpp

@@ -412,7 +412,7 @@ public:
 
 }
 
-#define MAXLIGHT 16
+#define MAXLIGHT 32
 
 namespace LightShader
 {
@@ -434,13 +434,12 @@ namespace LightShader
     public:
         static GLuint Program;
         static GLuint attrib_Position, attrib_Energy, attrib_Color;
-        static GLuint attrib_Corner;
-        static GLuint uniform_ntex, uniform_dtex, uniform_spec, uniform_screen, uniform_invproj, uniform_VM, uniform_PM;
+        static GLuint uniform_ntex, uniform_dtex, uniform_spec, uniform_screen;
         static GLuint vbo;
         static GLuint vao;
 
         static void init();
-        static void setUniforms(const core::matrix4 &ViewMatrix, const core::matrix4 &ProjMatrix, const core::matrix4 &InvProjMatrix, const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex);
+        static void setUniforms(const core::vector2df &screen, unsigned spec, unsigned TU_ntex, unsigned TU_dtex);
     };
 }
 
@@ -556,11 +555,11 @@ class SunLightShader
 {
 public:
     static GLuint Program;
-    static GLuint uniform_ntex, uniform_dtex, uniform_direction, uniform_col, uniform_invproj;
+    static GLuint uniform_ntex, uniform_dtex, uniform_direction, uniform_col;
     static GLuint vao;
 
     static void init();
-    static void setUniforms(const core::vector3df &direction, const core::matrix4 &InvProjMatrix, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex);
+    static void setUniforms(const core::vector3df &direction, float r, float g, float b, unsigned TU_ntex, unsigned TU_dtex);
 };
 
 class DiffuseEnvMapShader
@@ -693,23 +692,23 @@ class SSAOShader
 {
 public:
     static GLuint Program;
-    static GLuint uniform_ntex, uniform_dtex, uniform_noise_texture, uniform_invprojm, uniform_projm, uniform_samplePoints;
+    static GLuint uniform_ntex, uniform_dtex, uniform_noise_texture, uniform_samplePoints;
     static GLuint vao;
     static float SSAOSamples[64];
     
     static void init();
-    static void setUniforms(const core::matrix4& projm, const core::matrix4 &invprojm, unsigned TU_ntex, unsigned TU_dtex, unsigned TU_noise);
+    static void setUniforms(unsigned TU_ntex, unsigned TU_dtex, unsigned TU_noise);
 };
 
 class FogShader
 {
 public:
     static GLuint Program;
-    static GLuint uniform_tex, uniform_fogmax, uniform_startH, uniform_endH, uniform_start, uniform_end, uniform_col, uniform_ipvmat;
+    static GLuint uniform_tex, uniform_fogmax, uniform_startH, uniform_endH, uniform_start, uniform_end, uniform_col;
     static GLuint vao;
 
     static void init();
-    static void setUniforms(const core::matrix4 &ipvmat, float fogmax, float startH, float endH, float start, float end, const core::vector3df &col, unsigned TU_ntex);
+    static void setUniforms(float fogmax, float startH, float endH, float start, float end, const core::vector3df &col, unsigned TU_ntex);
 };
 
 class MotionBlurShader

src/graphics/stkanimatedmesh.cpp

@@ -253,7 +253,7 @@ void STKAnimatedMesh::render()
         for_in(mesh, TransparentMesh[TM_BUBBLE])
             drawBubble(*mesh, ModelViewProjectionMatrix);
 
-        if (World::getWorld()->getTrack()->isFogEnabled())
+        if (World::getWorld()->isFogEnabled())
         {
             if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
                 glUseProgram(MeshShader::TransparentFogShader::Program);

src/graphics/stkmesh.cpp

@@ -858,7 +858,7 @@ void initvaostate(GLMesh &mesh, TransparentMaterial TranspMat)
         break;
     case TM_DEFAULT:
     case TM_ADDITIVE:
-        if (World::getWorld()->getTrack()->isFogEnabled())
+        if (World::getWorld()->isFogEnabled())
             mesh.vao_first_pass = createVAO(mesh.vertex_buffer, mesh.index_buffer,
                 MeshShader::TransparentFogShader::attrib_position, MeshShader::TransparentFogShader::attrib_texcoord, -1, -1, -1, -1, MeshShader::TransparentFogShader::attrib_color, mesh.Stride);
         else

src/graphics/stkmeshscenenode.cpp

@@ -501,7 +501,7 @@ void STKMeshSceneNode::render()
         for_in(mesh, TransparentMesh[TM_BUBBLE])
             drawBubble(*mesh, ModelViewProjectionMatrix);
 
-        if (World::getWorld()->getTrack()->isFogEnabled())
+        if (World::getWorld() ->isFogEnabled())
         {
             if (!TransparentMesh[TM_DEFAULT].empty() || !TransparentMesh[TM_ADDITIVE].empty())
                 glUseProgram(MeshShader::TransparentFogShader::Program);

src/modes/cutscene_world.cpp

@@ -45,6 +45,8 @@
 
 #include <string>
 
+bool CutsceneWorld::s_use_duration = false;
+
 //-----------------------------------------------------------------------------
 /** Constructor. Sets up the clock mode etc.
  */
@@ -152,6 +154,9 @@ void CutsceneWorld::init()
         }
     }
 
+    if (!s_use_duration)
+        m_duration = 999999.0f;
+
     if (m_duration <= 0.0f)
     {
         Log::error("[CutsceneWorld]", "WARNING: cutscene has no duration");
@@ -367,6 +372,7 @@ void CutsceneWorld::enterRaceOverState()
 
     if (m_aborted || partId == -1 || partId == (int)m_parts.size() - 1)
     {
+        // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
         if (m_parts.size() == 1 && m_parts[0] == "endcutscene")
         {
             CreditsScreen* credits = CreditsScreen::getInstance();
@@ -377,6 +383,23 @@ void CutsceneWorld::enterRaceOverState()
             StateManager::get()->resetAndSetStack(newStack);
             StateManager::get()->pushScreen(credits);
         }
+        // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
+        else  if (m_parts.size() == 1 && m_parts[0] == "gpwin")
+        {
+            race_manager->exitRace();
+            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+            if (race_manager->raceWasStartedFromOverworld())
+                OverWorld::enterOverWorld();
+        }
+        // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
+        else  if (m_parts.size() == 1 && m_parts[0] == "gplose")
+        {
+            race_manager->exitRace();
+            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+            if (race_manager->raceWasStartedFromOverworld())
+                OverWorld::enterOverWorld();
+        }
+        // TODO: remove hardcoded knowledge of cutscenes, replace with scripting probably
         else if (race_manager->getTrackName() == "introcutscene" ||
                  race_manager->getTrackName() == "introcutscene2")
         {
@@ -417,6 +440,9 @@ void CutsceneWorld::enterRaceOverState()
  */
 bool CutsceneWorld::isRaceOver()
 {
+    if (!s_use_duration && !m_aborted)
+        return false;
+
     return m_time > m_duration;
 }   // isRaceOver
 

src/modes/cutscene_world.hpp

@@ -45,18 +45,15 @@ class CutsceneWorld : public World
     double m_duration;
     bool m_aborted;
 
+    // TODO find a better way than static
+    static bool s_use_duration;
+
     /** monkey tricks to get the animations in sync with irrlicht. we reset the time
      *  after all is loaded and it's running withotu delays
      */
     bool m_second_reset;
     double m_time_at_second_reset;
 
-    void abortCutscene()
-    {
-        if (m_time < m_duration - 2.0f) m_duration = m_time + 2.0f;
-        m_aborted = true;
-    }
-
     std::vector<std::string> m_parts;
 
 public:
@@ -107,6 +104,14 @@ public:
     };
     // ------------------------------------------------------------------------
     virtual void escapePressed() OVERRIDE { abortCutscene(); }
+    // ------------------------------------------------------------------------
+    static void setUseDuration(bool use_duration) { s_use_duration = use_duration; }
+    // ------------------------------------------------------------------------
+    void abortCutscene()
+    {
+        if (m_time < m_duration - 2.0f) m_duration = m_time + 2.0f;
+        m_aborted = true;
+    }
 
 };   // CutsceneWorld
 

src/modes/world.cpp

@@ -1180,4 +1180,11 @@ void World::escapePressed()
     new RacePausedDialog(0.8f, 0.6f);
 }
 
+//-----------------------------------------------------------------------------
+
+bool World::isFogEnabled() const
+{
+    return m_track != NULL && m_track->isFogEnabled();
+}
+
 /* EOF */

src/modes/world.hpp

@@ -302,6 +302,8 @@ public:
     /** Returns a pointer to the track. */
     Track          *getTrack() const { return m_track; }
     // ------------------------------------------------------------------------
+    bool            isFogEnabled() const;
+    // ------------------------------------------------------------------------
     /** The code that draws the timer should call this first to know
      *  whether the game mode wants a timer drawn. */
     virtual bool shouldDrawTimer() const

src/race/race_manager.cpp

@@ -685,23 +685,43 @@ void RaceManager::exitRace(bool delete_world)
 
         if (someHumanPlayerWon)
         {
-            StateManager::get()->pushScreen( GrandPrixWin::getInstance()  );
-            GrandPrixWin::getInstance()->setKarts(winners);
+            if (delete_world) World::deleteWorld();
+            delete_world = false;
+
+            StateManager::get()->enterGameState();
+            race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+            race_manager->setNumKarts(0);
+            race_manager->setNumPlayers(0);
+            race_manager->setNumLocalPlayers(0);
+            race_manager->startSingleRace("gpwin", 999, false);
+            GrandPrixWin* scene = GrandPrixWin::getInstance();
+            StateManager::get()->pushScreen(scene);
+            scene->setKarts(winners);
         }
         else
         {
-            StateManager::get()->pushScreen( GrandPrixLose::getInstance()  );
+            if (delete_world) World::deleteWorld();
+            delete_world = false;
+
+            StateManager::get()->enterGameState();
+            race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+            race_manager->setNumKarts(0);
+            race_manager->setNumPlayers(0);
+            race_manager->setNumLocalPlayers(0);
+            race_manager->startSingleRace("gplose", 999, false);
+            GrandPrixLose* scene = GrandPrixLose::getInstance();
+            StateManager::get()->pushScreen(scene);
 
             if (humanLosers.size() >= 1)
             {
-                GrandPrixLose::getInstance()->setKarts( humanLosers );
+                scene->setKarts(humanLosers);
             }
             else
             {
                 std::cerr << "RaceManager::exitRace() : what's going on?? no winners and no losers??\n";
                 std::vector<std::string> karts;
                 karts.push_back(UserConfigParams::m_default_kart);
-                GrandPrixLose::getInstance()->setKarts( karts );
+                scene->setKarts(karts);
             }
         }
     }

src/states_screens/dialogs/custom_video_settings.cpp

@@ -52,6 +52,7 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
     getWidget<CheckBoxWidget>("anim_gfx")->setState( UserConfigParams::m_graphical_effects );
     getWidget<CheckBoxWidget>("weather_gfx")->setState( UserConfigParams::m_weather_effects );
     getWidget<CheckBoxWidget>("ubo")->setState(!UserConfigParams::m_ubo_disabled);
+    getWidget<CheckBoxWidget>("dof")->setState(UserConfigParams::m_dof);
 
     SpinnerWidget* kart_anim = getWidget<SpinnerWidget>("steering_animations");
     kart_anim->addLabel( _("Disabled") ); // 0
@@ -102,12 +103,14 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
         bool dynamic_light = getWidget<CheckBoxWidget>("dynamiclight")->getState();
         UserConfigParams::m_dynamic_lights = dynamic_light;
 
-        UserConfigParams::m_graphical_effects        =
+        UserConfigParams::m_graphical_effects =
             getWidget<CheckBoxWidget>("anim_gfx")->getState();
-        UserConfigParams::m_weather_effects          =
+        UserConfigParams::m_weather_effects =
             getWidget<CheckBoxWidget>("weather_gfx")->getState();
         UserConfigParams::m_ubo_disabled =
             !getWidget<CheckBoxWidget>("ubo")->getState();
+        UserConfigParams::m_dof =
+            getWidget<CheckBoxWidget>("dof")->getState();
 
         UserConfigParams::m_motionblur      =
             getWidget<CheckBoxWidget>("motionblur")->getState();

src/states_screens/grand_prix_lose.cpp

@@ -31,10 +31,15 @@
 #include "items/item_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "modes/cutscene_world.hpp"
 #include "modes/overworld.hpp"
+#include "modes/world.hpp"
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/main_menu_screen.hpp"
 #include "states_screens/state_manager.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
+#include "tracks/track_object_manager.hpp"
 #include "utils/translation.hpp"
 
 #include <ISceneManager.h>
@@ -61,10 +66,11 @@ const float CAMERA_START_Z = 5.5f;
 
 const float DISTANCE_BETWEEN_KARTS = 2.0f;
 
+const float KART_SCALE = 0.75f;
 
 const float KART_START_X = -17.0f;
 const float KART_END_X = -5.0f;
-const float KART_Y = -3.0f;
+const float KART_Y = 0.0f;
 const float KART_Z = 0.0f;
 
 
@@ -76,22 +82,11 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
 
 // -------------------------------------------------------------------------------------
 
-GrandPrixLose::GrandPrixLose() : Screen("grand_prix_lose.stkgui")
+GrandPrixLose::GrandPrixLose() : Screen("grand_prix_lose.stkgui", false /* pause race */)
 {
     setNeeds3D(true);
 
     m_throttle_FPS = false;
-
-    try
-    {
-        std::string path = file_manager->getAsset(FileManager::MUSIC, "lose_theme.music");
-        m_music = music_manager->getMusicInformation(path);
-    }
-    catch (std::exception& e)
-    {
-        fprintf(stderr, "[GrandPrixLose] WARNING: exception caught when trying to load music: %s\n", e.what());
-        m_music = NULL;
-    }
 }   // GrandPrixLose
 
 // -------------------------------------------------------------------------------------
@@ -108,61 +103,17 @@ void GrandPrixLose::loadedFromFile()
 
 void GrandPrixLose::init()
 {
+    std::vector<std::string> parts;
+    parts.push_back("gplose");
+    ((CutsceneWorld*)World::getWorld())->setParts(parts);
+    CutsceneWorld::setUseDuration(false);
+
     Screen::init();
 
+    World::getWorld()->setPhase(WorldStatus::RACE_PHASE);
+
     m_phase = 1;
-    m_sky_angle = 0.0f;
     m_global_time = 0.0f;
-
-    video::ITexture *t = irr_driver->getTexture(FileManager::TEXTURE, "clouds.png");
-    m_sky = irr_driver->addSkyDome(t,
-                                   16 /* hori_res */, 16 /* vert_res */,
-                                   1.0f /* texture_percent */,  2.0f /* sphere_percent */);
-
-    m_camera = irr_driver->addCameraSceneNode();
-    m_camera_x = CAMERA_START_X;
-    m_camera_y = CAMERA_START_Y;
-    m_camera_z = CAMERA_START_Z;
-    m_camera->setPosition( core::vector3df(m_camera_x, m_camera_y, m_camera_z) );
-    m_camera->setUpVector( core::vector3df(0.0, 1.0, 0.0) );
-    irr_driver->getSceneManager()->setActiveCamera(m_camera);
-
-    m_camera_target_x = 0.0f;
-    m_camera_target_z = -2.0f;
-    m_camera->setTarget( core::vector3df(m_camera_target_x, -2.0f, m_camera_target_z) );
-    m_camera->setFOV( DEGREE_TO_RAD*50.0f );
-    m_camera->updateAbsolutePosition();
-
-    scene::IAnimatedMesh* model_garage_door = irr_driver->getAnimatedMesh( file_manager->getAsset(FileManager::MODEL,"gplose_door.b3d") );
-    assert(model_garage_door!= NULL);
-    m_garage_door = irr_driver->addAnimatedMesh(model_garage_door);
-#ifdef DEBUG
-    m_garage_door->setName("garage-door");
-#endif
-    m_garage_door->setPosition( core::vector3df(2, INITIAL_Y, 0) );
-    m_garage_door->setAnimationSpeed(0);
-
-    scene::IMesh* model_garage = irr_driver->getMesh( file_manager->getAsset(FileManager::MODEL,"gplose.b3d") );
-    assert(model_garage!= NULL);
-    m_garage = irr_driver->addMesh(model_garage);
-#ifdef DEBUG
-    m_garage->setName("garage");
-#endif
-
-    m_garage->setPosition( core::vector3df(2, INITIAL_Y, 0) );
-
-    scene::ISceneManager* sceneManager = irr_driver->getSceneManager();
-    sceneManager->setAmbientLight(video::SColor(255, 120, 120, 120));
-
-    const core::vector3df &sun_pos = core::vector3df( 0, 200, 100.0f );
-    m_light = irr_driver->addLight(sun_pos, 300.0f, 1, 1, 1);
-
-    if (!irr_driver->isGLSL())
-    {
-        scene::ILightSceneNode *lnode = (scene::ILightSceneNode *) m_light;
-        lnode->getLightData().DiffuseColor = irr::video::SColorf(1.0f, 1.0f, 1.0f, 1.0f);
-        lnode->getLightData().SpecularColor = irr::video::SColorf(1.0f, 0.0f, 0.0f, 0.0f);
-    }
 }   // init
 
 // -------------------------------------------------------------------------------------
@@ -170,32 +121,17 @@ void GrandPrixLose::init()
 void GrandPrixLose::tearDown()
 {
     Screen::tearDown();
-    irr_driver->removeNode(m_sky);
-    m_sky = NULL;
+    ((CutsceneWorld*)World::getWorld())->abortCutscene();
 
-    irr_driver->removeCameraSceneNode(m_camera);
-    m_camera = NULL;
-
-    irr_driver->removeNode(m_light);
-    m_light = NULL;
-
-    irr_driver->removeNode(m_garage);
-    irr_driver->removeNode(m_garage_door);
-    m_garage = NULL;
-
-    for(unsigned int i=0; i<m_all_kart_models.size(); i++)
+    for (unsigned int i=0; i<m_all_kart_models.size(); i++)
         delete m_all_kart_models[i];
 
     m_all_kart_models.clear();
     
-    for (int n=0; n<MAX_KART_COUNT; n++)
-    {
-        if (m_kart_node[n] != NULL)
-        {
-            irr_driver->removeNode(m_kart_node[n]);
-        }
-    }
-
+    m_kart_node[0] = NULL;
+    m_kart_node[1] = NULL;
+    m_kart_node[2] = NULL;
+    m_kart_node[3] = NULL;
 }   // tearDown
 
 // -------------------------------------------------------------------------------------
@@ -204,54 +140,25 @@ void GrandPrixLose::onUpdate(float dt)
 {
     m_global_time += dt;
 
-    m_sky_angle += dt*2;
-    if (m_sky_angle > 360) m_sky_angle -= 360;
-    m_sky->setRotation( core::vector3df(0, m_sky_angle, 0) );
-
-    const int lastFrame = m_garage_door->getEndFrame();
-    if (m_global_time < GARAGE_DOOR_OPEN_TIME)
-    {
-        m_garage_door->setCurrentFrame( (m_global_time/GARAGE_DOOR_OPEN_TIME)*lastFrame );
-    }
-    else if (m_global_time > DURATION - GARAGE_DOOR_OPEN_TIME)
-    {
-        m_garage_door->setCurrentFrame( (1.0f - ((m_global_time -
-                                                  (DURATION - GARAGE_DOOR_OPEN_TIME))/GARAGE_DOOR_OPEN_TIME))
-                                       *lastFrame );
-    }
-    //else if (m_global_time < DURATION)
-    //{
-    //    m_garage_door->setCurrentFrame( lastFrame );
-    //}
-
     const float kartProgression = m_global_time/(DURATION - 6.0f);
     if (kartProgression <= 1.0f)
     {
         m_kart_x = KART_START_X + (KART_END_X - KART_START_X)*kartProgression;
 
+        core::vector3df kart_rot(0.0f, 90.0f, 0.0f);
+        core::vector3df kart_scale(KART_SCALE, KART_SCALE, KART_SCALE);
         for (int n=0; n<MAX_KART_COUNT; n++)
         {
             if (m_kart_node[n] != NULL)
             {
-                m_kart_node[n]->setPosition( core::vector3df(m_kart_x + n*DISTANCE_BETWEEN_KARTS,
-                                                             m_kart_y,
-                                                             m_kart_z) );
+                core::vector3df kart_pos(m_kart_x + n*DISTANCE_BETWEEN_KARTS,
+                    m_kart_y,
+                    m_kart_z);
+                m_kart_node[n]->move(kart_pos, kart_rot, kart_scale, false);
             }
         }
     }
     
-    const float progression = m_global_time / DURATION;
-    if (progression <= 1.5f)
-    {
-        m_camera_x = CAMERA_START_X + (CAMERA_END_X - CAMERA_START_X)*progression;
-        m_camera_y = CAMERA_START_Y + (CAMERA_END_Y - CAMERA_START_Y)*progression;
-        m_camera_z = CAMERA_START_Z + (CAMERA_END_Z - CAMERA_START_Z)*progression;
-    }
-
-    m_camera->setPosition( core::vector3df(m_camera_x, m_camera_y, m_camera_z) );
-    m_camera->setUpVector( core::vector3df(0.0, 1.0, 0.0) );
-    m_camera->updateAbsolutePosition();
-
     // ---- title
     const int w = irr_driver->getFrameSize().Width;
     const int h = irr_driver->getFrameSize().Height;
@@ -311,7 +218,7 @@ void GrandPrixLose::eventCallback(GUIEngine::Widget* widget,
 
 void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
 {
-    scene::ISceneNode* kart_main_node = NULL;
+    TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
 
     assert(ident_arg.size() > 0);
     if ((int)ident_arg.size() > MAX_KART_COUNT)
@@ -324,6 +231,10 @@ void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
     m_kart_node[2] = NULL;
     m_kart_node[3] = NULL;
 
+    m_kart_x = KART_START_X;
+    m_kart_y = KART_Y;
+    m_kart_z = KART_Z;
+
     const int count = ident_arg.size();
     for (int n=0; n<count; n++)
     {
@@ -332,59 +243,29 @@ void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
         {
             KartModel* kart_model = kart->getKartModelCopy();
             m_all_kart_models.push_back(kart_model);
-            m_kart_x = KART_START_X;
-            m_kart_y = KART_Y;
-            m_kart_z = KART_Z;
+            scene::ISceneNode* kart_main_node = kart_model->attachModel(false);
 
-            kart_main_node = kart_model->attachModel(false);
-            kart_main_node->setPosition( core::vector3df(m_kart_x, m_kart_y, m_kart_z) );
-            //kart_main_node->setScale( core::vector3df(0.4f, 0.4f, 0.4f)  );
-            kart_main_node->updateAbsolutePosition();
-            kart_main_node->setRotation(vector3df(0, 90, 0));
-            float susp[4]={0,0,0,0};
-            kart_model->update(0.0f, 0.0f, 0.0f, susp, 0.0f);
+            core::vector3df kart_pos(m_kart_x + n*DISTANCE_BETWEEN_KARTS,
+                m_kart_y,
+                m_kart_z);
+            core::vector3df kart_rot(0, 90.0f, 0);
+            core::vector3df kart_scale(KART_SCALE, KART_SCALE, KART_SCALE);
+
+            //FIXME: it's not ideal that both the track object and the presentation know the initial coordinates of the object
+            TrackObjectPresentationSceneNode* presentation = new TrackObjectPresentationSceneNode(
+                kart_main_node, kart_pos, kart_rot, kart_scale);
+            TrackObject* tobj = new TrackObject(kart_pos, kart_rot, kart_scale,
+                "ghost", presentation, false /* isDynamic */, NULL /* physics settings */);
+            tobjman->insertObject(tobj);
+
+            m_kart_node[n] = tobj;
         }
         else
         {
             fprintf(stderr, "[GrandPrixLose] WARNING: could not find a kart named '%s'\n", ident_arg[n].c_str());
+            m_kart_node[n] = NULL;
         }// if kart !=NULL
-
-        m_kart_node[n] = kart_main_node;
     }
-
-    /*
-    const int w = UserConfigParams::m_width;
-    const int h = UserConfigParams::m_height;
-
-    switch (count)
-    {
-        case 1:
-            m_viewport[0] = core::recti(0, 0, w, h);
-            break;
-
-        case 2:
-            m_viewport[0] = core::recti(0, 0, w, h/2);
-            m_viewport[1] = core::recti(0, h/2, w, h);
-            break;
-
-        case 3:
-            m_viewport[0] = core::recti(0, 0, w/2, h/2);
-            m_viewport[1] = core::recti(w/2, 0, 2, h/2);
-            m_viewport[2] = core::recti(0, h/2, w, h);
-            break;
-
-        case 4:
-            m_viewport[0] = core::recti(0, 0, w/2, h/2);
-            m_viewport[1] = core::recti(w/2, 0, 2, h/2);
-            m_viewport[2] = core::recti(0, h/2, w/2, h);
-            m_viewport[3] = core::recti(w/2, h/2, w, h);
-            break;
-
-        default:
-            assert(false);
-    }
-     */
-
 }   // setKarts
 
 // -------------------------------------------------------------------------------------

src/states_screens/grand_prix_lose.hpp

@@ -27,6 +27,7 @@
 
 namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
 class KartProperties;
+class TrackObject;
 
 /**
   * \brief Screen shown at the end of a Grand Prix
@@ -38,22 +39,10 @@ class GrandPrixLose : public GUIEngine::Screen, public GUIEngine::ScreenSingleto
 
     GrandPrixLose();
 
-    /** sky angle, 0-360 */
-    float m_sky_angle;
-
     /** Global evolution of time */
     float m_global_time;
 
-    irr::scene::IMeshSceneNode* m_garage;
-
-    irr::scene::IAnimatedMeshSceneNode* m_garage_door;
-
-    irr::scene::ISceneNode* m_kart_node[4];
-
-    irr::scene::ISceneNode* m_sky;
-    irr::scene::ICameraSceneNode* m_camera;
-
-    irr::scene::ISceneNode* m_light;
+    TrackObject* m_kart_node[4];
 
     /** A copy of the kart model for each kart used. */
     std::vector<KartModel*> m_all_kart_models;
@@ -62,13 +51,6 @@ class GrandPrixLose : public GUIEngine::Screen, public GUIEngine::ScreenSingleto
 
     float m_kart_x, m_kart_y, m_kart_z;
 
-    float m_camera_x, m_camera_y, m_camera_z;
-    float m_camera_target_x, m_camera_target_z;
-
-    MusicInformation* m_music;
-
-    //irr::core::recti m_viewport[4];
-
 public:
 
     /** \brief implement callback from parent class GUIEngine::Screen */
@@ -89,9 +71,6 @@ public:
 
     /** \brief set which karts lost this GP */
     void setKarts(std::vector<std::string> ident);
-
-    virtual MusicInformation* getMusic() const OVERRIDE { return m_music; }
-
 };
 
 #endif

src/states_screens/grand_prix_win.cpp

@@ -33,8 +33,13 @@
 #include "items/item_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "modes/cutscene_world.hpp"
+#include "modes/world.hpp"
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/state_manager.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
+#include "tracks/track_object_manager.hpp"
 #include "utils/translation.hpp"
 
 #include <IGUIEnvironment.h>
@@ -48,56 +53,54 @@ using namespace irr::core;
 using namespace irr::gui;
 using namespace irr::video;
 
-const float KARTS_DELTA_Y = 0.03f;
-const float INITIAL_Y = -3.0f;
-const float INITIAL_PODIUM_Y = -3.6f;
+const float KARTS_X = -0.62f;
+const float KARTS_DELTA_X = 0.815f;
+const float KARTS_DELTA_Y = -0.55f;
+const float KARTS_DEST_Z = 1.2f;
+const float INITIAL_Y = 0.0f;
+const float INITIAL_PODIUM_Y = -0.89f;
 const float PODIUM_HEIGHT[3] = { 0.325f, 0.5f, 0.15f };
 
 DEFINE_SCREEN_SINGLETON( GrandPrixWin );
 
 // -------------------------------------------------------------------------------------
 
-GrandPrixWin::GrandPrixWin() : Screen("grand_prix_win.stkgui")
+GrandPrixWin::GrandPrixWin() : Screen("grand_prix_win.stkgui", false /* pause race */)
 {
     setNeeds3D(true);
 
     m_throttle_FPS = false;
 
-    try
-    {
-        std::string path = file_manager->getAsset(FileManager::MUSIC,"win_theme.music");
-        m_music = music_manager->getMusicInformation(path);
-    }
-    catch (std::exception& e)
-    {
-        fprintf(stderr, "[GrandPrixWin] WARNING: exception caught when trying to load music: %s\n", e.what());
-        m_music = NULL;
-    }
+    m_kart_node[0] = NULL;
+    m_kart_node[1] = NULL;
+    m_kart_node[2] = NULL;
+
+    m_podium_steps[0] = NULL;
+    m_podium_steps[1] = NULL;
+    m_podium_steps[2] = NULL;
+
 }   // GrandPrixWin
 
 // -------------------------------------------------------------------------------------
 
 void GrandPrixWin::loadedFromFile()
 {
-    m_kart_node[0] = NULL;
-    m_kart_node[1] = NULL;
-    m_kart_node[2] = NULL;
-
-    m_podium_x[0] = 1.4f;
-    m_podium_z[0] = 0.0f;
-
-    m_podium_x[1] = 2.2f;
-    m_podium_z[1] = 0.5f;
-
-    m_podium_x[2] = 3.0f;
-    m_podium_z[2] = 0.0f;
 }   // loadedFromFile
 
 // -------------------------------------------------------------------------------------
 
 void GrandPrixWin::init()
 {
+    std::vector<std::string> parts;
+    parts.push_back("gpwin");
+    ((CutsceneWorld*)World::getWorld())->setParts(parts);
+    CutsceneWorld::setUseDuration(false);
+
     Screen::init();
+
+    World::getWorld()->setPhase(WorldStatus::RACE_PHASE);
+
+
     if (PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges().size() > 0)
     {
         const core::dimension2d<u32>& frame_size = GUIEngine::getDriver()->getCurrentRenderTargetSize();
@@ -140,8 +143,6 @@ void GrandPrixWin::init()
         m_unlocked_label->m_w = message_width;
         m_unlocked_label->m_h = label_height;
         m_unlocked_label->setText(message, false);
-        //const irr::video::SColor orange(255, 255, 126, 21);
-        //unlocked_label->setColor(orange);
 
         m_unlocked_label->add();
         manualAddWidget(m_unlocked_label);
@@ -151,77 +152,8 @@ void GrandPrixWin::init()
         m_unlocked_label = NULL;
     }
 
-    m_phase = 1;
-    m_sky_angle = 0.0f;
     m_global_time = 0.0f;
-
-    video::ITexture *t = irr_driver->getTexture(FileManager::TEXTURE,
-                                                "clouds.png          ");
-    m_sky = irr_driver->addSkyDome(t,
-                                   16 /* hori_res */, 16 /* vert_res */,
-                                   1.0f /* texture_percent */,
-                                   2.0f /* sphere_percent */);
-
-    m_camera = irr_driver->addCameraSceneNode();
-    m_camera_x = 3.0f;
-    m_camera_y = 0.0f;
-    m_camera_z = -5.0f;
-    m_camera->setPosition( core::vector3df(m_camera_x, m_camera_y, m_camera_z) );
-    m_camera->setUpVector( core::vector3df(0.0, 1.0, 0.0) );
-    irr_driver->getSceneManager()->setActiveCamera(m_camera);
-
-    m_camera_target_x = 1.5f;
-    m_camera_target_z = 0.0f;
-    m_camera->setTarget( core::vector3df(m_camera_target_x, -2.0f, m_camera_target_z) );
-    m_camera->setFOV( DEGREE_TO_RAD*50.0f );
-    m_camera->updateAbsolutePosition();
-
-
-    scene::IMesh* model_village = irr_driver->getMesh( file_manager->getAsset(FileManager::MODEL,"village.b3d") );
-    assert(model_village != NULL);
-    m_village = irr_driver->addMesh(model_village);
-#ifdef DEBUG
-    m_village->setName("village");
-#endif
-    m_village->setPosition( core::vector3df(2, INITIAL_Y, 0) );
-
-
-    scene::IMesh* podium_model = irr_driver->getMesh( file_manager->getAsset(FileManager::MODEL,"wood_podium.b3d") );
-    assert(podium_model != NULL);
-
-
-    m_podium_step[0] = irr_driver->addMesh(podium_model);
-#ifdef DEBUG
-    m_podium_step[0]->setName("Podium 0");
-#endif
-    m_podium_step[0]->setPosition( core::vector3df(m_podium_x[0], INITIAL_PODIUM_Y, m_podium_z[0]) );
-
-    m_podium_step[1] = irr_driver->addMesh(podium_model);
-#ifdef DEBUG
-    m_podium_step[1]->setName("Podium 1");
-#endif
-    m_podium_step[1]->setPosition( core::vector3df(m_podium_x[1], INITIAL_PODIUM_Y, m_podium_z[1]) );
-
-    m_podium_step[2] = irr_driver->addMesh(podium_model);
-#ifdef DEBUG
-    m_podium_step[2]->setName("Podium 2");
-#endif
-    m_podium_step[2]->setPosition( core::vector3df(m_podium_x[2], INITIAL_PODIUM_Y, m_podium_z[2]) );
-
-    scene::ISceneManager* sceneManager = irr_driver->getSceneManager();
-    sceneManager->setAmbientLight(video::SColor(255, 95, 95, 95));
-
-    const core::vector3df &sun_pos = core::vector3df( 0, 200, 100.0f );
-    m_light = irr_driver->addLight(sun_pos, 300.0f, 0.25f, 0.25f, 0.25f);
-
-    m_finish_sound = sfx_manager->quickSound("gp_end");
-    if (!irr_driver->isGLSL())
-    {
-        scene::ILightSceneNode *lnode = (scene::ILightSceneNode *) m_light;
-        lnode->getLightData().DiffuseColor = irr::video::SColorf(0.25f, 0.25f, 0.25f, 1.0f);
-        lnode->getLightData().AmbientColor = irr::video::SColorf(0.25f, 0.25f, 0.25f, 1.0f);
-        lnode->getLightData().SpecularColor = irr::video::SColorf(0.0f, 0.0f, 0.0f, 1.0f);
-    }
+    m_phase = 1;
 
     sfx_manager->quickSound("gp_end");
 }   // init
@@ -231,26 +163,9 @@ void GrandPrixWin::init()
 void GrandPrixWin::tearDown()
 {
     Screen::tearDown();
-    irr_driver->removeNode(m_sky);
-    m_sky = NULL;
+    ((CutsceneWorld*)World::getWorld())->abortCutscene();
 
-    irr_driver->removeCameraSceneNode(m_camera);
-    m_camera = NULL;
-
-    irr_driver->removeNode(m_light);
-    m_light = NULL;
-
-    irr_driver->removeNode(m_village);
-    m_village = NULL;
-
-    for (int n=0; n<3; n++)
-    {
-        irr_driver->removeNode(m_podium_step[n]);
-        m_podium_step[n] = NULL;
-        if (m_kart_node[n] != NULL) irr_driver->removeNode(m_kart_node[n]);
-        m_kart_node[n] = NULL;
-    }
-    for(unsigned int i=0; i<m_all_kart_models.size(); i++)
+    for (unsigned int i = 0; i<m_all_kart_models.size(); i++)
         delete m_all_kart_models[i];
     m_all_kart_models.clear();
 
@@ -261,11 +176,13 @@ void GrandPrixWin::tearDown()
         m_unlocked_label = NULL;
     }
 
-    if (m_finish_sound != NULL &&
-        m_finish_sound->getStatus() == SFXManager::SFX_PLAYING)
-    {
-        m_finish_sound->stop();
-    }
+    m_kart_node[0] = NULL;
+    m_kart_node[1] = NULL;
+    m_kart_node[2] = NULL;
+
+    m_podium_steps[0] = NULL;
+    m_podium_steps[1] = NULL;
+    m_podium_steps[2] = NULL;
 }   // tearDown
 
 // -------------------------------------------------------------------------------------
@@ -274,11 +191,6 @@ void GrandPrixWin::onUpdate(float dt)
 {
     m_global_time += dt;
 
-    m_sky_angle += dt*2;
-    if (m_sky_angle > 360) m_sky_angle -= 360;
-    m_sky->setRotation( core::vector3df(0, m_sky_angle, 0) );
-
-
     // ---- karts move
     if (m_phase == 1)
     {
@@ -290,24 +202,27 @@ void GrandPrixWin::onUpdate(float dt)
             if (m_kart_node[k] != NULL)
             {
 
-                if (fabsf(m_kart_z[k] - m_podium_z[k]) > dt)
+                if (fabsf(m_kart_z[k] - KARTS_DEST_Z) > dt)
                 {
-                    if (m_kart_z[k] < m_podium_z[k] - dt)
+                    if (m_kart_z[k] < KARTS_DEST_Z - dt)
                     {
                         m_kart_z[k] += dt;
                     }
-                    else if (m_kart_z[k] > m_podium_z[k] + dt)
+                    else if (m_kart_z[k] > KARTS_DEST_Z + dt)
                     {
                         m_kart_z[k] -= dt;
                     }
                     else
                     {
-                        m_kart_z[k] = m_podium_z[k];
+                        m_kart_z[k] = KARTS_DEST_Z;
                     }
                     karts_not_yet_done++;
                 }
 
-                m_kart_node[k]->setPosition( core::vector3df(m_kart_x[k], m_kart_y[k], m_kart_z[k]) );
+                core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
+                core::vector3df kart_rot(0, m_kart_rotation[k], 0);
+                core::vector3df kart_scale(0.5f, 0.5f, 0.5f);
+                m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
             }
         } // end for
 
@@ -328,8 +243,16 @@ void GrandPrixWin::onUpdate(float dt)
                 if (m_kart_rotation[k] < 180.f)
                 {
                     m_kart_rotation[k] += 25.0f*dt;
-                    m_kart_node[k]->setRotation( core::vector3df(0, m_kart_rotation[k], 0) );
-                    m_podium_step[k]->setRotation( core::vector3df(0, m_kart_rotation[k], 0) );
+
+                    core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
+                    core::vector3df kart_rot(0, m_kart_rotation[k], 0);
+                    core::vector3df kart_scale(0.5f, 0.5f, 0.5f);
+                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
+
+                    core::vector3df podium_pos = m_podium_steps[k]->getInitXYZ();
+                    core::vector3df podium_rot(0, m_kart_rotation[k], 0);
+                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false);
+
                     karts_not_yet_done++;
                 }
             }
@@ -349,38 +272,22 @@ void GrandPrixWin::onUpdate(float dt)
                 if (m_kart_y[k] < y_target + KARTS_DELTA_Y)
                 {
                     m_kart_y[k] += dt*(PODIUM_HEIGHT[k]);
-                    m_kart_node[k]->setPosition( core::vector3df(m_kart_x[k], m_kart_y[k], m_kart_z[k]) );
-                    m_podium_step[k]->setPosition( core::vector3df(m_podium_x[k],
-                                                                   INITIAL_PODIUM_Y - (INITIAL_Y - m_kart_y[k]) - KARTS_DELTA_Y,
-                                                                   m_podium_z[k]) );
+                    core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
+                    core::vector3df kart_rot(0, m_kart_rotation[k], 0);
+                    core::vector3df kart_scale(0.5f, 0.5f, 0.5f);
+                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
 
+
+                    core::vector3df podium_pos = m_podium_steps[k]->getInitXYZ();
+                    core::vector3df podium_rot(0, m_kart_rotation[k], 0);
+                    podium_pos.Y = INITIAL_PODIUM_Y - (INITIAL_Y - m_kart_y[k]) - KARTS_DELTA_Y;
+                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false);
                 }
             }
         } // end for
 
     }
 
-    if (m_phase > 1)
-    {
-        //m_camera_x = 3.0f;
-        if (m_camera_z < -2.0f)                          m_camera_z        += dt*0.2f;
-
-        if      (m_camera_x < m_podium_x[1] - dt*0.1f)   m_camera_x        += dt*0.1f;
-        else if (m_camera_x > m_podium_x[1] + dt*0.1f)   m_camera_x        -= dt*0.1f;
-        else                                             m_camera_x         = m_podium_x[1];
-
-        if (m_camera_target_x < m_podium_x[1])           m_camera_target_x += dt*0.1f;
-
-        if (m_camera_y > -1.8f)                          m_camera_y        -= dt*0.1f;
-
-
-        m_camera->setTarget( core::vector3df(m_camera_target_x, -2.0f, m_camera_target_z) );
-
-        m_camera->setPosition( core::vector3df(m_camera_x, m_camera_y, m_camera_z) );
-        m_camera->setUpVector( core::vector3df(0.0, 1.0, 0.0) );
-        m_camera->updateAbsolutePosition();
-    }
-
 
     // ---- title
     static const int w = irr_driver->getFrameSize().Width;
@@ -413,8 +320,7 @@ void GrandPrixWin::eventCallback(GUIEngine::Widget* widget,
                 PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges();
             PlayerManager::getCurrentPlayer()->clearUnlocked();
 
-            FeatureUnlockedCutScene* scene =
-                FeatureUnlockedCutScene::getInstance();
+            FeatureUnlockedCutScene* scene = FeatureUnlockedCutScene::getInstance();
 
             assert(unlocked.size() > 0);
             scene->addTrophy(race_manager->getDifficulty());
@@ -434,47 +340,67 @@ void GrandPrixWin::eventCallback(GUIEngine::Widget* widget,
 
 void GrandPrixWin::setKarts(const std::string idents_arg[3])
 {
+    TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
+
     // reorder in "podium order" (i.e. second player to the left, first player in the middle, last at the right)
     std::string idents[3];
     idents[0] = idents_arg[1];
     idents[1] = idents_arg[0];
     idents[2] = idents_arg[2];
 
-    for (int n=0; n<3; n++)
+    for (int i = 0; i < 3; i++)
     {
-        if (idents[n].size() == 0) continue;
+        const KartProperties* kp = kart_properties_manager->getKart(idents[i]);
+        if (kp == NULL) continue;
 
-        scene::ISceneNode* kart_main_node = NULL;
+        KartModel* kart_model = kp->getKartModelCopy();
+        m_all_kart_models.push_back(kart_model);
+        scene::ISceneNode* kart_main_node = kart_model->attachModel(false);
 
-        const KartProperties* kp = kart_properties_manager->getKart(idents[n]);
-        if (kp != NULL)
+        m_kart_x[i] = KARTS_X + i*KARTS_DELTA_X;
+        m_kart_y[i] = INITIAL_Y + KARTS_DELTA_Y;
+        m_kart_z[i] = -4; // to 1.2
+        m_kart_rotation[i] = 0.0f;
+
+        core::vector3df kart_pos(m_kart_x[i], m_kart_y[i], m_kart_z[i]);
+        core::vector3df kart_rot(0, 0, 0);
+        core::vector3df kart_scale(0.5, 0.5, 0.5);
+
+        //FIXME: it's not ideal that both the track object and the presentation know the initial coordinates of the object
+        TrackObjectPresentationSceneNode* presentation = new TrackObjectPresentationSceneNode(
+            kart_main_node, kart_pos, kart_rot, kart_scale);
+        TrackObject* tobj = new TrackObject(kart_pos, kart_rot, kart_scale,
+            "ghost", presentation, false /* isDynamic */, NULL /* physics settings */);
+        tobjman->insertObject(tobj);
+
+        m_kart_node[i] = tobj;
+    }
+
+    TrackObject* currObj;
+    PtrVector<TrackObject>& objects = tobjman->getObjects();
+    for_in(currObj, objects)
+    {
+        TrackObjectPresentationMesh* meshPresentation = currObj->getPresentation<TrackObjectPresentationMesh>();
+        if (meshPresentation != NULL)
         {
-            KartModel *kart_model = kp->getKartModelCopy();
-            m_all_kart_models.push_back(kart_model);
-            kart_main_node = kart_model->attachModel(false);
-
-            m_kart_x[n] = m_podium_x[n];
-            m_kart_y[n] = INITIAL_Y + KARTS_DELTA_Y;
-            m_kart_z[n] = -4;
-            m_kart_rotation[n] = 0.0f;
-
-            assert(kart_main_node != NULL);
-            kart_main_node->setPosition( core::vector3df(m_kart_x[n],
-                                                         m_kart_y[n],
-                                                         m_kart_z[n]) );
-            kart_main_node->setScale( core::vector3df(0.4f, 0.4f, 0.4f)  );
-            float susp[4]={0,0,0,0};
-            kart_model->update(0.0f, 0.0f, 0.0f, susp, 0.0f);
-        }
-        else
-        {
-            std::cerr << "[GrandPrixWin] WARNING : kart '" << idents[n] << "' not found!\n";
+            if (meshPresentation->getModelFile() == "gpwin_podium1.b3d")
+            {
+                m_podium_steps[0] = currObj;
+            }
+            else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d")
+            {
+                m_podium_steps[1] = currObj;
+            }
+            else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d")
+            {
+                m_podium_steps[2] = currObj;
+            }
         }
+    }
 
-        m_kart_node[n] = kart_main_node;
-    } // end for
-
-    assert(m_kart_node[0] != NULL || m_kart_node[1] != NULL || m_kart_node[2] != NULL);
+    assert(m_podium_steps[0] != NULL);
+    assert(m_podium_steps[1] != NULL);
+    assert(m_podium_steps[2] != NULL);
 }   // setKarts
 
 // -------------------------------------------------------------------------------------

src/states_screens/grand_prix_win.hpp

@@ -26,6 +26,7 @@
 namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
 namespace GUIEngine { class LabelWidget; }
 class KartProperties;
+class TrackObject;
 
 /**
   * \brief Screen shown at the end of a Grand Prix
@@ -37,39 +38,27 @@ class GrandPrixWin : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
 
     GrandPrixWin();
 
-    /** sky angle, 0-360 */
-    float m_sky_angle;
-
     /** Global evolution of time */
     double m_global_time;
 
-    irr::scene::IMeshSceneNode* m_village;
+    TrackObject* m_podium_steps[3];
 
-    irr::scene::IMeshSceneNode* m_podium_step[3];
-    irr::scene::ISceneNode* m_kart_node[3];
+    TrackObject* m_kart_node[3];
+
+    //irr::scene::IMeshSceneNode* m_podium_step[3];
+    //irr::scene::ISceneNode* m_kart_node[3];
 
     /** A copy of the kart model for each kart used. */
     std::vector<KartModel*> m_all_kart_models;
 
-    irr::scene::ISceneNode* m_sky;
-    irr::scene::ICameraSceneNode* m_camera;
-
-    irr::scene::ISceneNode* m_light;
-
     GUIEngine::LabelWidget* m_unlocked_label;
 
     int m_phase;
     
     float m_kart_x[3], m_kart_y[3], m_kart_z[3];
-    float m_podium_x[3], m_podium_z[3];
+    //float m_podium_x[3], m_podium_z[3];
     float m_kart_rotation[3];
 
-    float m_camera_x, m_camera_y, m_camera_z;
-    float m_camera_target_x, m_camera_target_z;
-
-    MusicInformation* m_music;
-    SFXBase* m_finish_sound;
-
 public:
 
     /** \brief implement callback from parent class GUIEngine::Screen */
@@ -90,8 +79,6 @@ public:
 
     /** \pre must be called after pushing the screen, but before onUpdate had the chance to be invoked */
     void setKarts(const std::string idents[3]);
-
-    virtual MusicInformation* getMusic() const OVERRIDE { return m_music; }
 };
 
 #endif

src/states_screens/main_menu_screen.cpp

@@ -233,17 +233,50 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
     if (selection == "options")
     {
         // The DEBUG item
+
+        // GP WIN
+        /*
+        StateManager::get()->enterGameState();
+        race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+        race_manager->setNumKarts(0);
+        race_manager->setNumPlayers(0);
+        race_manager->setNumLocalPlayers(0);
+        race_manager->startSingleRace("gpwin", 999, false);
+        GrandPrixWin* scene = GrandPrixWin::getInstance();
+        StateManager::get()->pushScreen(scene);
+        const std::string winners[] = { "elephpant", "nolok", "pidgin" };
+        scene->setKarts(winners);
+        */
+
+        // GP Lose
+        StateManager::get()->enterGameState();
+        race_manager->setMinorMode(RaceManager::MINOR_MODE_CUTSCENE);
+        race_manager->setNumKarts(0);
+        race_manager->setNumPlayers(0);
+        race_manager->setNumLocalPlayers(0);
+        race_manager->startSingleRace("gplose", 999, false);
+        GrandPrixLose* scene = GrandPrixLose::getInstance();
+        StateManager::get()->pushScreen(scene);
+        std::vector<std::string> losers;
+        losers.push_back("nolok");
+        losers.push_back("elephpant");
+        //losers.push_back("wilber");
+        //losers.push_back("tux");
+        scene->setKarts(losers);
+
+
+        /*
+        // FEATURE UNLOCKED
         FeatureUnlockedCutScene* scene =
-            FeatureUnlockedCutScene::getInstance();
+        FeatureUnlockedCutScene::getInstance();
 
         scene->addTrophy(RaceManager::DIFFICULTY_EASY);
         StateManager::get()->pushScreen(scene);
 
-        /*
         static int i = 1;
         i++;
 
-        if (i % 4 == 0)
+        if (i % 2 == 0)
         {
             // the passed kart will not be modified, that's why I allow myself
             // to use const_cast
@@ -255,7 +288,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
                                    );
             StateManager::get()->pushScreen(scene);
         }
-        else if (i % 4 == 1)
+        else if (i % 2 == 1)
         {
             std::vector<video::ITexture*> textures;
             textures.push_back(irr_driver->getTexture(
@@ -274,23 +307,6 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
             scene->addUnlockedPictures(textures, 1.0, 0.75, L"You did it");
 
             StateManager::get()->pushScreen(scene);
-        }
-        else if (i % 4 == 2)
-        {
-            GrandPrixWin* scene = GrandPrixWin::getInstance();
-            const std::string winners[] = { "elephpant", "nolok", "pidgin" };
-            StateManager::get()->pushScreen(scene);
-            scene->setKarts( winners );
-        }
-        else
-        {
-            GrandPrixLose* scene = GrandPrixLose::getInstance();
-            StateManager::get()->pushScreen(scene);
-            std::vector<std::string> losers;
-            losers.push_back("nolok");
-            losers.push_back("elephpant");
-            losers.push_back("wilber");
-            scene->setKarts( losers );
         }
          */
     }

src/states_screens/options_screen_video.cpp

@@ -59,6 +59,8 @@ struct GFXPreset
     bool animatedScenery;
     int animatedCharacters;
     int anisotropy;
+    /** Depth of field */
+    bool dof;
 };
 
 static GFXPreset GFX_PRESETS[] =
@@ -66,31 +68,31 @@ static GFXPreset GFX_PRESETS[] =
     {
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
-        false /* animatedScenery */, 0 /* animatedCharacters */, 0 /* anisotropy */
+        false /* animatedScenery */, 0 /* animatedCharacters */, 0 /* anisotropy */, false /* depth of field */
     },
 
     {
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */
+        true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */, false /* depth of field */
     },
 
     {
         true /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, true /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */
+        true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */, false /* depth of field */
     },
 
     {
         true /* light */, 0 /* shadow */, false /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, false /* ssao */, true /* weather */,
-        true /* animatedScenery */, 1 /* animatedCharacters */, 8 /* anisotropy */
+        true /* animatedScenery */, 1 /* animatedCharacters */, 8 /* anisotropy */, false /* depth of field */
     },
 
     {
         true /* light */, 2 /* shadow */, true /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */, true /* weather */,
-        true /* animatedScenery */, 2 /* animatedCharacters */, 8 /* anisotropy */
+        true /* animatedScenery */, 2 /* animatedCharacters */, 8 /* anisotropy */, true /* depth of field */
     }
 };
 
@@ -359,7 +361,8 @@ void OptionsScreenVideo::updateGfxSlider()
             //GFX_PRESETS[l].shaders == UserConfigParams::m_pixel_shaders
             GFX_PRESETS[l].shadows == UserConfigParams::m_shadows &&
             GFX_PRESETS[l].ssao == UserConfigParams::m_ssao &&
-            GFX_PRESETS[l].weather == UserConfigParams::m_weather_effects)
+            GFX_PRESETS[l].weather == UserConfigParams::m_weather_effects &&
+            GFX_PRESETS[l].dof == UserConfigParams::m_dof)
         {
             gfx->setValue(l + 1);
             found = true;
@@ -523,6 +526,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
         UserConfigParams::m_shadows = GFX_PRESETS[level].shadows;
         UserConfigParams::m_ssao = GFX_PRESETS[level].ssao;
         UserConfigParams::m_weather_effects = GFX_PRESETS[level].weather;
+        UserConfigParams::m_dof = GFX_PRESETS[level].dof;
 
         updateGfxSlider();
     }

src/tracks/track.cpp

@@ -28,6 +28,7 @@
 #include "config/user_config.hpp"
 #include "graphics/camera.hpp"
 #include "graphics/CBatchingMesh.hpp"
+#include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/material_manager.hpp"
@@ -206,6 +207,8 @@ void Track::cleanup()
     ItemManager::destroy();
 
     ParticleKindManager::get()->cleanUpTrackSpecificGfx();
+    // Clear remainder of transformed textures
+    resetTextureTable();
 
     for(unsigned int i=0; i<m_animated_textures.size(); i++)
     {

src/tracks/track_object_presentation.cpp

@@ -202,6 +202,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(const XMLNode& xml_node
     std::string model_name;
     xml_node.get("model",   &model_name  );
 
+    m_model_file = model_name;
     m_is_in_skybox = false;
     std::string render_pass;
     xml_node.get("renderpass", &render_pass);
@@ -250,6 +251,22 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(const XMLNode& xml_node
     init(&xml_node, parent, enabled);
 }
 
+TrackObjectPresentationMesh::TrackObjectPresentationMesh(
+    scene::IAnimatedMesh* model, const core::vector3df& xyz,
+    const core::vector3df& hpr, const core::vector3df& scale) :
+    TrackObjectPresentationSceneNode(xyz, hpr, scale)
+{
+    m_is_looped = false;
+    m_mesh = NULL;
+    m_node = NULL;
+
+    bool animated = (UserConfigParams::m_graphical_effects ||
+        World::getWorld()->getIdent() == IDENT_CUTSCENE);
+
+    m_mesh = model;
+    init(NULL, NULL, true);
+}
+
 TrackObjectPresentationMesh::TrackObjectPresentationMesh(
         const std::string& model_file, const core::vector3df& xyz,
         const core::vector3df& hpr, const core::vector3df& scale) :
@@ -262,6 +279,8 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
     bool animated = (UserConfigParams::m_graphical_effects ||
              World::getWorld()->getIdent() == IDENT_CUTSCENE);
 
+    m_model_file = model_file;
+
     if (file_manager->fileExists(model_file))
     {
         if (animated)
@@ -374,10 +393,9 @@ void TrackObjectPresentationMesh::reset()
         a_node->OnAnimate(0);
         a_node->OnAnimate(0);
 
-        if(m_is_looped)
-        {
-            a_node->setFrameLoop(m_frame_start, m_frame_end);
-        }
+        // irrlicht's "setFrameLoop" is a misnomer, it just sets the first and
+        // last frame, even if looping is disabled
+        a_node->setFrameLoop(m_frame_start, m_frame_end);
     }
 }
 

src/tracks/track_object_presentation.hpp

@@ -116,6 +116,16 @@ public:
         m_node = NULL;
     }
 
+    TrackObjectPresentationSceneNode(
+        scene::ISceneNode* node,
+        const core::vector3df& xyz,
+        const core::vector3df& hpr,
+        const core::vector3df& scale) :
+        TrackObjectPresentation(xyz, hpr, scale)
+    {
+        m_node = node;
+    }
+
     virtual const core::vector3df& getPosition() const OVERRIDE;
     virtual const core::vector3df  getAbsolutePosition() const OVERRIDE;
     virtual const core::vector3df& getRotation() const OVERRIDE;
@@ -193,6 +203,8 @@ private:
     /** End frame of the animation to be played. */
     unsigned int            m_frame_end;
 
+    std::string             m_model_file;
+
     void init(const XMLNode* xml_node, scene::ISceneNode* parent, bool enabled);
 
 public:
@@ -201,10 +213,15 @@ public:
     TrackObjectPresentationMesh(
         const std::string& model_file, const core::vector3df& xyz,
         const core::vector3df& hpr, const core::vector3df& scale);
+    TrackObjectPresentationMesh(
+        scene::IAnimatedMesh* mesh, const core::vector3df& xyz,
+        const core::vector3df& hpr, const core::vector3df& scale);
 
     virtual ~TrackObjectPresentationMesh();
 
     virtual void reset() OVERRIDE;
+
+    const std::string& getModelFile() const { return m_model_file; }
 };
 
 /**