qt/qt3d.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	QSkyboxEntity: try to reload texture only once	Paul Lemire	2017-11-21	1	-0/+1
\| \| \| \| \| \| \| \| \|	By using a queued invocation and a flag. This prevent cases where the basename would be set by a first call, with an extension not yet being set which would result in warnings. Change-Id: I385cffaf9ee262535c759109335bb3c150cc7525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Merge branch '5.8' into 5.9	Sean Harmer	2017-04-02	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
\| *	Coding convention fix for Src/Extras	Robert Brock	2017-04-01	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I76f4eeb93b02b20f1d85d745f39253fd22327ef7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* \|	SkyboxEntity can gamma correct the fragments	Kevin Ottens	2017-01-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 <sean.harmer@kdab.com>
* \|	QSkyBoxEntity: use QTextureLoader for dds cubemaps	Kevin Ottens	2017-01-31	1	-0/+2
\|/ \| \| \| \| \| \|	This fixes a bug where dds cubemaps would simply display nothing. Change-Id: Ife3ad095effec0ede446ae124c7d2e024b25f550 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	QSkyboxEntity: remove camera translation property	Paul Lemire	2016-08-26	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we convert a mat4 matrix to a mat3 matrix, then back to a mat4, this removes the translation component from it. Making the skybox shaders use that property allows to remove references to the camera translation in QSkyboxEntity. This makes using a skybox neater as we don't need to care about the Camera position anymore. This also allows to render the same skybox with different cameras which required to have duplicate QSkyboxEntity previously. Change-Id: I1adddd17d151e4d26d0f19b048df88dbf738042b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
*	Move defaults and geometries out of Qt3DRender and into Qt3DExtras	Paul Lemire	2016-04-23	1	-0/+122
	QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>