qt/qt3d.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Unbreak qgltf example.	Volker Krause	2016-05-28	1	-5/+6
\| \| \| \| \|	Change-Id: I4ded0d2497175648b16dd95337826138c362ec26 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Some fixes for examples.	Wieland Hagen	2016-03-09	1	-5/+7
\| \| \| \| \| \| \| \|	Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Unify license header usage.	Antti Kokko	2016-01-26	1	-19/+33
\| \| \| \| \| \| \| \|	Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: I300c5840db3fd4708d5d85e84f7c6729cba326e5 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
*	Merge branch '5.6' into dev	Sean Harmer	2016-01-15	1	-15/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/qt3d/qgltf/main.qml Change-Id: I03d4cc679a7812fb114461609e481d43a0bc5390
\| *	Make the qgltf example use other assets	Laszlo Agocs	2016-01-13	1	-18/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wine is complex and not ideal for a getting started example. Instead, use three of the simpler scenes. Change-Id: I6859714e14c47c4907e85a48cde27d0ea5748ffa Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* \|	Camera and model moved - qgltf	Robert Brock	2016-01-05	1	-4/+3
\|/ \| \| \| \| \| \| \| \| \| \|	From y: -100 to y: 80, z: -120 to z: 120 upVector Y changed to positive Wine: z: -50 to z: 50 and removed angleX rotation which was initially needed due to negative upVector Change-Id: I054d1c18c5a3e6f68c9a3ddf4ea7d2a7f28c90a5 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Add a qgltf example.	Laszlo Agocs	2015-11-25	1	-0/+81
	This is like gltf but uses the original Collada asset and generates a glTF model at build time. Now that the qgltf rule is in qtbase we can freely use it in any examples. This does not have the limitations the gltf example has: this will function both with core profiles and ES. Change-Id: I9f04cf8b77337d397e1aecd1ffb22b7ce7e15ef7 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>