From 1c6004383a2f26cc5ca8cacab49a3152414e110d Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 31 Jan 2017 17:56:27 +0100 Subject: QSkyBoxEntity: use QTextureLoader for dds cubemaps This fixes a bug where dds cubemaps would simply display nothing. Change-Id: Ife3ad095effec0ede446ae124c7d2e024b25f550 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/extras/defaults/qskyboxentity_p.h') diff --git a/src/extras/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h index effe97fce..795d59ab2 100644 --- a/src/extras/defaults/qskyboxentity_p.h +++ b/src/extras/defaults/qskyboxentity_p.h @@ -60,6 +60,7 @@ namespace Qt3DRender { class QFilterKey; class QTextureCubeMap; +class QTextureLoader; class QShaderProgram; class QSkyboxEntity; class QTextureImage; @@ -87,6 +88,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate Qt3DRender::QEffect *m_effect; Qt3DRender::QMaterial *m_material; Qt3DRender::QTextureCubeMap *m_skyboxTexture; + Qt3DRender::QTextureLoader *m_loadedTexture; Qt3DRender::QShaderProgram *m_gl3Shader; Qt3DRender::QShaderProgram *m_gl2es2Shader; Qt3DRender::QTechnique *m_gl2Technique; -- cgit v1.2.3 From 861e4d71e34c73e3bd5f550b02448df6fa6279ec Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 31 Jan 2017 18:13:32 +0100 Subject: SkyboxEntity can gamma correct the fragments This is an opt-in feature, required because dds file tend to need gamma correction while png probably not. Change-Id: I9f32d8f23110fb2fd6b11f33a20018907355e986 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity_p.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/extras/defaults/qskyboxentity_p.h') diff --git a/src/extras/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h index 795d59ab2..ebf89bdbc 100644 --- a/src/extras/defaults/qskyboxentity_p.h +++ b/src/extras/defaults/qskyboxentity_p.h @@ -99,6 +99,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate Qt3DRender::QRenderPass *m_es2RenderPass; Qt3DRender::QRenderPass *m_gl3RenderPass; QCuboidMesh *m_mesh; + Qt3DRender::QParameter *m_gammaStrengthParameter; Qt3DRender::QParameter *m_textureParameter; Qt3DRender::QTextureImage *m_posXImage; Qt3DRender:: QTextureImage *m_posYImage; -- cgit v1.2.3 From fd7561f6983fb0f8aa46fe32cc902ab3f8b24d0d Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Mon, 16 Jan 2017 18:56:07 +0000 Subject: Coding convention fix for Src/Extras Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I76f4eeb93b02b20f1d85d745f39253fd22327ef7 Reviewed-by: Sean Harmer --- src/extras/defaults/qskyboxentity_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/extras/defaults/qskyboxentity_p.h') diff --git a/src/extras/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h index effe97fce..bf7024f95 100644 --- a/src/extras/defaults/qskyboxentity_p.h +++ b/src/extras/defaults/qskyboxentity_p.h @@ -51,8 +51,9 @@ // We mean it. // +#include + #include -#include QT_BEGIN_NAMESPACE -- cgit v1.2.3