summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2020-10-15 15:41:49 +0300
committerAntti Määttä <antti.maatta@qt.io>2020-10-16 07:15:57 +0300
commitc3e33e9b4d5e7170c787a76d0a168ad18272704d (patch)
tree225629c88c066e2761760f90ec93eff82bb735c0
parentba49988a2bdb60513f322199543f3b37b7e7e4e9 (diff)
Fix ghost images in presentations
Set default minification filter to not use mipmaps. Task-number: QT3DS-4188 Change-Id: I2263c8b17879e4ff1a69097ae0b04c3309003a67 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--res/DataModelMetadata/en-us/MetaData.xml2
-rw-r--r--src/runtimerender/graphobjects/Qt3DSRenderImage.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/DataModelMetadata/en-us/MetaData.xml b/res/DataModelMetadata/en-us/MetaData.xml
index 4e3268a..acb6e68 100644
--- a/res/DataModelMetadata/en-us/MetaData.xml
+++ b/res/DataModelMetadata/en-us/MetaData.xml
@@ -128,7 +128,7 @@
<Property name="positionv" formalName="V Position" description="Offset of the image along the V\ndirection of the material" />
<Property name="pivotu" formalName="U Pivot" description="Offset the image in the U direction\nwithout affecting rotation center" />
<Property name="pivotv" formalName="V Pivot" description="Offset the image in the V direction\nwithout affecting rotation center" />
- <Property name="minfilter" formalName="Minification Filter" default="LinearMipmapLinear" description="The minification filter of the image" list="Nearest:Linear:NearestMipmapNearest:NearestMipmapLinear:LinearMipmapNearest:LinearMipmapLinear" />
+ <Property name="minfilter" formalName="Minification Filter" default="Linear" description="The minification filter of the image" list="Nearest:Linear:NearestMipmapNearest:NearestMipmapLinear:LinearMipmapNearest:LinearMipmapLinear" />
<Property name="magfilter" formalName="Magnification Filter" default="Linear" description="The magnification filter of the image" list="Nearest:Linear" />
<!-- Texture subpresentation is not set to controllable as it does not currently work in runtime -->
<Property name="subpresentation" formalName="Sub-Presentation" description="Presentation or QML stream\nto use instead of the image" type="Renderable" />
diff --git a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp
index 5382818..d4930ca 100644
--- a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp
+++ b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp
@@ -48,7 +48,7 @@ SImage::SImage()
, m_MappingMode(ImageMappingModes::Normal)
, m_HorizontalTilingMode(NVRenderTextureCoordOp::ClampToEdge)
, m_VerticalTilingMode(NVRenderTextureCoordOp::ClampToEdge)
- , m_MinFilter(NVRenderTextureMinifyingOp::LinearMipmapLinear)
+ , m_MinFilter(NVRenderTextureMinifyingOp::Linear)
, m_MagFilter(NVRenderTextureMagnifyingOp::Linear)
{
m_Flags.SetActive(true);