From fa30188e44331eec9f268c530597943c15cee465 Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Tue, 4 Oct 2022 12:06:08 -0400 Subject: [PATCH] Fix bug with rendering video layer --- modules/globebrowsing/shaders/texturetilemapping.glsl | 2 ++ modules/globebrowsing/src/tileprovider/tileprovider.h | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl index 7995291c79..f6c23bf9eb 100644 --- a/modules/globebrowsing/shaders/texturetilemapping.glsl +++ b/modules/globebrowsing/shaders/texturetilemapping.glsl @@ -165,6 +165,8 @@ vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights, c.rgb = #{layerGroup}[#{i}].color; #elif (#{#{layerGroup}#{i}LayerType} == 9) // SpoutImageTileLayer c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding); +#elif (#{#{layerGroup}#{i}LayerType} == 10) // FfmpegTileProvider + c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding); #endif return c; diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h index b328104ebd..a772e302bf 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.h +++ b/modules/globebrowsing/src/tileprovider/tileprovider.h @@ -57,6 +57,7 @@ namespace openspace::globebrowsing { namespace openspace::globebrowsing { +// If you add a new type, also add it to shaders/texturetilemapping.glsl enum class Type { DefaultTileProvider = 0, SingleImageTileProvider,