Deprecation readme for qt/quick3d repository.qml2

Conflicts:

	.gitignore
	3rdparty/assimp/README
	3rdparty/assimp/code/3DSConverter.cpp
	3rdparty/assimp/code/3DSHelper.h
	3rdparty/assimp/code/3DSLoader.cpp
	3rdparty/assimp/code/3DSLoader.h
	3rdparty/assimp/code/ACLoader.cpp
	3rdparty/assimp/code/ACLoader.h
	3rdparty/assimp/code/ASELoader.cpp
	3rdparty/assimp/code/ASELoader.h
	3rdparty/assimp/code/ASEParser.cpp
	3rdparty/assimp/code/ASEParser.h
	3rdparty/assimp/code/Assimp.cpp
	3rdparty/assimp/code/AssimpPCH.cpp
	3rdparty/assimp/code/AssimpPCH.h
	3rdparty/assimp/code/B3DImporter.cpp
	3rdparty/assimp/code/B3DImporter.h
	3rdparty/assimp/code/BVHLoader.cpp
	3rdparty/assimp/code/BVHLoader.h
	3rdparty/assimp/code/BaseImporter.cpp
	3rdparty/assimp/code/BaseImporter.h
	3rdparty/assimp/code/BaseProcess.cpp
	3rdparty/assimp/code/BaseProcess.h
	3rdparty/assimp/code/BlenderDNA.cpp
	3rdparty/assimp/code/BlenderDNA.h
	3rdparty/assimp/code/BlenderDNA.inl
	3rdparty/assimp/code/BlenderIntermediate.h
	3rdparty/assimp/code/BlenderLoader.cpp
	3rdparty/assimp/code/BlenderLoader.h
	3rdparty/assimp/code/BlenderModifier.cpp
	3rdparty/assimp/code/BlenderModifier.h
	3rdparty/assimp/code/BlenderScene.cpp
	3rdparty/assimp/code/BlenderScene.h
	3rdparty/assimp/code/BlenderSceneGen.h
	3rdparty/assimp/code/BoostWorkaround/boost/LICENSE_1_0.txt
	3rdparty/assimp/code/BoostWorkaround/boost/foreach.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/format.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/math/common_factor_rt.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/scoped_array.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/scoped_ptr.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/shared_array.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/shared_ptr.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/static_assert.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/timer.hpp
	3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
	3rdparty/assimp/code/ByteSwap.h
	3rdparty/assimp/code/COBLoader.cpp
	3rdparty/assimp/code/COBLoader.h
	3rdparty/assimp/code/COBScene.h
	3rdparty/assimp/code/CSMLoader.cpp
	3rdparty/assimp/code/CSMLoader.h
	3rdparty/assimp/code/ColladaHelper.h
	3rdparty/assimp/code/ColladaLoader.cpp
	3rdparty/assimp/code/ColladaLoader.h
	3rdparty/assimp/code/ColladaParser.cpp
	3rdparty/assimp/code/ComputeUVMappingProcess.cpp
	3rdparty/assimp/code/ComputeUVMappingProcess.h
	3rdparty/assimp/code/ConvertToLHProcess.cpp
	3rdparty/assimp/code/ConvertToLHProcess.h
	3rdparty/assimp/code/DXFLoader.cpp
	3rdparty/assimp/code/DXFLoader.h
	3rdparty/assimp/code/DefaultIOStream.h
	3rdparty/assimp/code/DefaultIOSystem.cpp
	3rdparty/assimp/code/DefaultIOSystem.h
	3rdparty/assimp/code/DefaultLogger.cpp
	3rdparty/assimp/code/DefaultProgressHandler.h
	3rdparty/assimp/code/Exceptional.h
	3rdparty/assimp/code/FileLogStream.h
	3rdparty/assimp/code/FileSystemFilter.h
	3rdparty/assimp/code/FindDegenerates.h
	3rdparty/assimp/code/FindInstancesProcess.cpp
	3rdparty/assimp/code/FindInstancesProcess.h
	3rdparty/assimp/code/FindInvalidDataProcess.cpp
	3rdparty/assimp/code/FindInvalidDataProcess.h
	3rdparty/assimp/code/GenFaceNormalsProcess.cpp
	3rdparty/assimp/code/GenVertexNormalsProcess.cpp
	3rdparty/assimp/code/GenericProperty.h
	3rdparty/assimp/code/HMPFileData.h
	3rdparty/assimp/code/HMPLoader.cpp
	3rdparty/assimp/code/HalfLifeFileData.h
	3rdparty/assimp/code/IFF.h
	3rdparty/assimp/code/IRRLoader.cpp
	3rdparty/assimp/code/IRRLoader.h
	3rdparty/assimp/code/IRRMeshLoader.cpp
	3rdparty/assimp/code/IRRMeshLoader.h
	3rdparty/assimp/code/IRRShared.cpp
	3rdparty/assimp/code/IRRShared.h
	3rdparty/assimp/code/Importer.cpp
	3rdparty/assimp/code/ImproveCacheLocality.cpp
	3rdparty/assimp/code/JoinVerticesProcess.cpp
	3rdparty/assimp/code/LWOAnimation.cpp
	3rdparty/assimp/code/LWOAnimation.h
	3rdparty/assimp/code/LWOBLoader.cpp
	3rdparty/assimp/code/LWOFileData.h
	3rdparty/assimp/code/LWOLoader.cpp
	3rdparty/assimp/code/LWOLoader.h
	3rdparty/assimp/code/LWOMaterial.cpp
	3rdparty/assimp/code/LWSLoader.cpp
	3rdparty/assimp/code/LWSLoader.h
	3rdparty/assimp/code/LimitBoneWeightsProcess.cpp
	3rdparty/assimp/code/LimitBoneWeightsProcess.h
	3rdparty/assimp/code/LineSplitter.h
	3rdparty/assimp/code/MD2FileData.h
	3rdparty/assimp/code/MD2Loader.cpp
	3rdparty/assimp/code/MD2Loader.h
	3rdparty/assimp/code/MD2NormalTable.h
	3rdparty/assimp/code/MD3FileData.h
	3rdparty/assimp/code/MD3Loader.cpp
	3rdparty/assimp/code/MD3Loader.h
	3rdparty/assimp/code/MD4FileData.h
	3rdparty/assimp/code/MD5Loader.cpp
	3rdparty/assimp/code/MD5Loader.h
	3rdparty/assimp/code/MD5Parser.cpp
	3rdparty/assimp/code/MD5Parser.h
	3rdparty/assimp/code/MDCFileData.h
	3rdparty/assimp/code/MDCLoader.cpp
	3rdparty/assimp/code/MDCLoader.h
	3rdparty/assimp/code/MDLFileData.h
	3rdparty/assimp/code/MDLLoader.cpp
	3rdparty/assimp/code/MDLLoader.h
	3rdparty/assimp/code/MS3DLoader.cpp
	3rdparty/assimp/code/MS3DLoader.h
	3rdparty/assimp/code/MakeVerboseFormat.cpp
	3rdparty/assimp/code/MakeVerboseFormat.h
	3rdparty/assimp/code/MaterialSystem.cpp
	3rdparty/assimp/code/MaterialSystem.h
	3rdparty/assimp/code/MemoryIOWrapper.h
	3rdparty/assimp/code/NDOLoader.cpp
	3rdparty/assimp/code/NDOLoader.h
	3rdparty/assimp/code/NFFLoader.cpp
	3rdparty/assimp/code/NFFLoader.h
	3rdparty/assimp/code/OFFLoader.h
	3rdparty/assimp/code/ObjFileData.h
	3rdparty/assimp/code/ObjFileImporter.cpp
	3rdparty/assimp/code/ObjFileImporter.h
	3rdparty/assimp/code/ObjFileMtlImporter.cpp
	3rdparty/assimp/code/ObjFileMtlImporter.h
	3rdparty/assimp/code/ObjFileParser.cpp
	3rdparty/assimp/code/ObjFileParser.h
	3rdparty/assimp/code/ObjTools.h
	3rdparty/assimp/code/OgreImporter.cpp
	3rdparty/assimp/code/OgreImporter.h
	3rdparty/assimp/code/OgreImporterMaterial.cpp
	3rdparty/assimp/code/OptimizeGraph.cpp
	3rdparty/assimp/code/OptimizeGraph.h
	3rdparty/assimp/code/OptimizeMeshes.h
	3rdparty/assimp/code/PlyLoader.cpp
	3rdparty/assimp/code/PlyLoader.h
	3rdparty/assimp/code/PlyParser.h
	3rdparty/assimp/code/PretransformVertices.cpp
	3rdparty/assimp/code/PretransformVertices.h
	3rdparty/assimp/code/ProcessHelper.h
	3rdparty/assimp/code/Q3BSPFileData.h
	3rdparty/assimp/code/Q3BSPFileImporter.cpp
	3rdparty/assimp/code/Q3BSPFileImporter.h
	3rdparty/assimp/code/Q3BSPZipArchive.cpp
	3rdparty/assimp/code/Q3BSPZipArchive.h
	3rdparty/assimp/code/Q3DLoader.cpp
	3rdparty/assimp/code/Q3DLoader.h
	3rdparty/assimp/code/RawLoader.cpp
	3rdparty/assimp/code/RawLoader.h
	3rdparty/assimp/code/RemoveComments.cpp
	3rdparty/assimp/code/RemoveComments.h
	3rdparty/assimp/code/RemoveRedundantMaterials.cpp
	3rdparty/assimp/code/RemoveRedundantMaterials.h
	3rdparty/assimp/code/RemoveVCProcess.cpp
	3rdparty/assimp/code/RemoveVCProcess.h
	3rdparty/assimp/code/SGSpatialSort.h
	3rdparty/assimp/code/SMDLoader.cpp
	3rdparty/assimp/code/SMDLoader.h
	3rdparty/assimp/code/STLLoader.cpp
	3rdparty/assimp/code/STLLoader.h
	3rdparty/assimp/code/SceneCombiner.cpp
	3rdparty/assimp/code/SceneCombiner.h
	3rdparty/assimp/code/ScenePreprocessor.cpp
	3rdparty/assimp/code/ScenePreprocessor.h
	3rdparty/assimp/code/SkeletonMeshBuilder.h
	3rdparty/assimp/code/SortByPTypeProcess.cpp
	3rdparty/assimp/code/SortByPTypeProcess.h
	3rdparty/assimp/code/SpatialSort.cpp
	3rdparty/assimp/code/SpatialSort.h
	3rdparty/assimp/code/SplitLargeMeshes.cpp
	3rdparty/assimp/code/SplitLargeMeshes.h
	3rdparty/assimp/code/StandardShapes.cpp
	3rdparty/assimp/code/StandardShapes.h
	3rdparty/assimp/code/StdOStreamLogStream.h
	3rdparty/assimp/code/StreamReader.h
	3rdparty/assimp/code/StringComparison.h
	3rdparty/assimp/code/Subdivision.cpp
	3rdparty/assimp/code/Subdivision.h
	3rdparty/assimp/code/TargetAnimation.cpp
	3rdparty/assimp/code/TargetAnimation.h
	3rdparty/assimp/code/TerragenLoader.cpp
	3rdparty/assimp/code/TerragenLoader.h
	3rdparty/assimp/code/TextureTransform.cpp
	3rdparty/assimp/code/TextureTransform.h
	3rdparty/assimp/code/TinyFormatter.h
	3rdparty/assimp/code/TriangulateProcess.cpp
	3rdparty/assimp/code/UnrealLoader.cpp
	3rdparty/assimp/code/UnrealLoader.h
	3rdparty/assimp/code/ValidateDataStructure.cpp
	3rdparty/assimp/code/ValidateDataStructure.h
	3rdparty/assimp/code/Vertex.h
	3rdparty/assimp/code/VertexTriangleAdjacency.cpp
	3rdparty/assimp/code/VertexTriangleAdjacency.h
	3rdparty/assimp/code/Win32DebugLogStream.h
	3rdparty/assimp/code/XFileImporter.h
	3rdparty/assimp/code/XFileParser.cpp
	3rdparty/assimp/code/aiAssert.cpp
	3rdparty/assimp/code/assbin_chunks.h
	3rdparty/assimp/code/fast_atof.h
	3rdparty/assimp/code/irrXMLWrapper.h
	3rdparty/assimp/code/res/resource.h
	3rdparty/assimp/contrib/ConvertUTF/ConvertUTF.c
	3rdparty/assimp/contrib/ConvertUTF/ConvertUTF.h
	3rdparty/assimp/contrib/irrXML/heapsort.h
	3rdparty/assimp/contrib/irrXML/irrArray.h
	3rdparty/assimp/contrib/irrXML/irrString.h
	3rdparty/assimp/contrib/irrXML/irrTypes.h
	3rdparty/assimp/contrib/unzip/crypt.h
	3rdparty/assimp/contrib/unzip/ioapi.c
	3rdparty/assimp/contrib/unzip/unzip.h
	3rdparty/assimp/include/Compiler/poppack1.h
	3rdparty/assimp/include/Compiler/pushpack1.h
	3rdparty/assimp/include/DefaultLogger.h
	3rdparty/assimp/include/IOStream.h
	3rdparty/assimp/include/IOSystem.h
	3rdparty/assimp/include/LogStream.h
	3rdparty/assimp/include/Logger.h
	3rdparty/assimp/include/NullLogger.h
	3rdparty/assimp/include/ProgressHandler.h
	3rdparty/assimp/include/aiAnim.h
	3rdparty/assimp/include/aiAssert.h
	3rdparty/assimp/include/aiCamera.h
	3rdparty/assimp/include/aiColor4D.inl
	3rdparty/assimp/include/aiConfig.h
	3rdparty/assimp/include/aiLight.h
	3rdparty/assimp/include/aiMaterial.h
	3rdparty/assimp/include/aiMaterial.inl
	3rdparty/assimp/include/aiMatrix3x3.h
	3rdparty/assimp/include/aiMatrix3x3.inl
	3rdparty/assimp/include/aiMatrix4x4.h
	3rdparty/assimp/include/aiMatrix4x4.inl
	3rdparty/assimp/include/aiMesh.h
	3rdparty/assimp/include/aiPostProcess.h
	3rdparty/assimp/include/aiScene.h
	3rdparty/assimp/include/aiTexture.h
	3rdparty/assimp/include/aiTypes.h
	3rdparty/assimp/include/aiVector2D.h
	3rdparty/assimp/include/aiVector3D.inl
	3rdparty/assimp/include/assimp.hpp
	3rdparty/assimp/revision.h
	README
	debian/changelog
	debian/control
	debian/libqt4-3d-examples.install
	debian/rules
	demos/qt3d/cubehouse/cubehouse.desktop
	demos/qt3d/cubehouse/cubehouse.pro
	demos/qt3d/cubehouse/cubeview.cpp
	demos/qt3d/cubehouse/cubeview.h
	demos/qt3d/cubehouse/main.cpp
	demos/qt3d/cubehouse/qt3d.ico
	demos/qt3d/cubehouse/shaders/depth.frag
	demos/qt3d/cubehouse/shaders/depth.vert
	demos/qt3d/cubehouse/shaders/depthTestShader.frag
	demos/qt3d/cubehouse/shaders/depthTestShader.vert
	demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
	demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
	demos/qt3d/pageflip/pageflip.cpp
	demos/qt3d/pageflip/pageflip.desktop
	demos/qt3d/pageflip/pageflip.pro
	demos/qt3d/pageflip/qt3d.ico
	demos/qt3d/photobrowser3d/bytereader.cpp
	demos/qt3d/photobrowser3d/filescanner.cpp
	demos/qt3d/photobrowser3d/imageloader.cpp
	demos/qt3d/photobrowser3d/main.cpp
	demos/qt3d/photobrowser3d/photobrowser3d.desktop
	demos/qt3d/photobrowser3d/photobrowser3d.pro
	demos/qt3d/photobrowser3d/qatlas.cpp
	demos/qt3d/photobrowser3d/qatlas.h
	demos/qt3d/photobrowser3d/qfocusadaptor.cpp
	demos/qt3d/photobrowser3d/qt3d.ico
	demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
	demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
	demos/qt3d/photobrowser3d/threadpool.cpp
	demos/qt3d/photobrowser3d/thumbnailableimage.cpp
	demos/qt3d/photobrowser3d/thumbnailnode.cpp
	demos/qt3d/qt3d.svg
	demos/qt3d/shapes/qt3d.ico
	demos/qt3d/shapes/shapes.cpp
	demos/qt3d/shapes/shapes.desktop
	demos/qt3d/shapes/shapes.pro
	demos/qt3d/teaservice/qt3d.ico
	demos/qt3d/teaservice/teaservice.cpp
	demos/qt3d/teaservice/teaservice.desktop
	demos/qt3d/teaservice/teaservice.pro
	demos/quick3d/flickr3d/flickr3d.pro
	demos/quick3d/flickr3d/flickr3d.rc
	demos/quick3d/flickr3d/main.cpp
	demos/quick3d/icon.png
	demos/quick3d/model_viewer/main.cpp
	demos/quick3d/model_viewer/model_viewer.desktop
	demos/quick3d/model_viewer/model_viewer.pro
	demos/quick3d/model_viewer/qml/FourButtons.qml
	demos/quick3d/model_viewer/qml/LongButton.qml
	demos/quick3d/model_viewer/qml/MainButton.qml
	demos/quick3d/model_viewer/qml/ModelViewer.qml
	demos/quick3d/model_viewer/qml/ShortButton.qml
	demos/quick3d/model_viewer/qtquick3d.ico
	demos/quick3d/qmlres.h
	demos/quick3d/qtquick3d.svg
	demos/quick3d/robo_bounce/main.cpp
	demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
	demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
	demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
	demos/quick3d/robo_bounce/qml/RoboBounce.qml
	demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
	demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
	demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
	demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
	demos/quick3d/robo_bounce/qtquick3d.ico
	demos/quick3d/robo_bounce/robo_bounce.desktop
	demos/quick3d/robo_bounce/robo_bounce.pro
	demos/quick3d/robo_bounce/robo_bounce.qrc
	demos/quick3d/tea_service/main.cpp
	demos/quick3d/tea_service/qml/TeaService.qml
	demos/quick3d/tea_service/qml/Teacup.qml
	demos/quick3d/tea_service/qml/Teaspoon.qml
	demos/quick3d/tea_service/qtquick3d.ico
	demos/quick3d/tea_service/tea_service.desktop
	demos/quick3d/tea_service/tea_service.pro
	doc/config/qt-cpp-ignore.qdocconf
	doc/src/index.qdoc
	doc/src/qt3d-building.qdoc
	doc/src/qt3d-contrib.qdoc
	examples/qt3d/basket/basket.desktop
	examples/qt3d/basket/basket.pro
	examples/qt3d/basket/basketview.cpp
	examples/qt3d/basket/basketview.h
	examples/qt3d/basket/main.cpp
	examples/qt3d/basket/qt3d.ico
	examples/qt3d/builder/builder.cpp
	examples/qt3d/builder/builder.desktop
	examples/qt3d/builder/builder.h
	examples/qt3d/builder/builder.pro
	examples/qt3d/builder/main.cpp
	examples/qt3d/builder/qt3d.ico
	examples/qt3d/cube/cube.desktop
	examples/qt3d/cube/cube.pro
	examples/qt3d/cube/cubeview.cpp
	examples/qt3d/cube/cubeview.h
	examples/qt3d/cube/main.cpp
	examples/qt3d/cube/qt3d.ico
	examples/qt3d/cylinder/cylinder.desktop
	examples/qt3d/cylinder/cylinder.pro
	examples/qt3d/cylinder/cylinderview.cpp
	examples/qt3d/cylinder/cylinderview.h
	examples/qt3d/cylinder/main.cpp
	examples/qt3d/cylinder/qt3d.ico
	examples/qt3d/geometry/geometry.cpp
	examples/qt3d/geometry/geometry.desktop
	examples/qt3d/geometry/geometry.pro
	examples/qt3d/geometry/geometryview.cpp
	examples/qt3d/geometry/geometryview.h
	examples/qt3d/geometry/main.cpp
	examples/qt3d/geometry/qt3d.ico
	examples/qt3d/nesting/cubeview.cpp
	examples/qt3d/nesting/cubeview.h
	examples/qt3d/nesting/main.cpp
	examples/qt3d/nesting/nesting.desktop
	examples/qt3d/nesting/nesting.pro
	examples/qt3d/nesting/qt3d.ico
	examples/qt3d/qt3d.pro
	examples/qt3d/qt3d.svg
	examples/qt3d/solarsystem/main.cpp
	examples/qt3d/solarsystem/qt3d.ico
	examples/qt3d/solarsystem/solarsystem.cpp
	examples/qt3d/solarsystem/solarsystem.desktop
	examples/qt3d/solarsystem/solarsystem.h
	examples/qt3d/solarsystem/solarsystem.pro
	examples/qt3d/tank/main.cpp
	examples/qt3d/tank/qt3d.ico
	examples/qt3d/tank/tank.desktop
	examples/qt3d/tank/tank.pro
	examples/qt3d/tank/tankview.cpp
	examples/qt3d/tank/tankview.h
	examples/qt3d/teapot/main.cpp
	examples/qt3d/teapot/qt3d.ico
	examples/qt3d/teapot/teapot.desktop
	examples/qt3d/teapot/teapot.pro
	examples/qt3d/teapot/teapotview.h
	examples/quick3d/basket/basket.pro
	examples/quick3d/basket/basket.qrc
	examples/quick3d/basket/basket_qml.desktop
	examples/quick3d/basket/main.cpp
	examples/quick3d/basket/qml/Basket.qml
	examples/quick3d/basket/qtquick3d.ico
	examples/quick3d/cube/cube.pro
	examples/quick3d/cube/main.cpp
	examples/quick3d/cube/qml/Cube.qml
	examples/quick3d/cube/qtquick3d.ico
	examples/quick3d/forest/forest.pro
	examples/quick3d/forest/forest.qrc
	examples/quick3d/forest/main.cpp
	examples/quick3d/forest/qml/Forest.qml
	examples/quick3d/forest/qml/Tree.qml
	examples/quick3d/forest/qtquick3d.ico
	examples/quick3d/lander/lander.desktop
	examples/quick3d/lander/lander.pro
	examples/quick3d/lander/main.cpp
	examples/quick3d/lander/qml/Lander.qml
	examples/quick3d/lander/qtquick3d.ico
	examples/quick3d/matrix_animation/main.cpp
	examples/quick3d/matrix_animation/matrix_animation.desktop
	examples/quick3d/matrix_animation/matrix_animation.pro
	examples/quick3d/matrix_animation/qml/MatrixAnimation.qml
	examples/quick3d/matrix_animation/qtquick3d.ico
	examples/quick3d/monkeygod/main.cpp
	examples/quick3d/monkeygod/monkeygod.desktop
	examples/quick3d/monkeygod/monkeygod.pro
	examples/quick3d/monkeygod/qml/Monkeygod.qml
	examples/quick3d/monkeygod/qml/Penguin.qml
	examples/quick3d/monkeygod/qml/desktop.qml
	examples/quick3d/monkeygod/qtquick3d.ico
	examples/quick3d/moon/main.cpp
	examples/quick3d/moon/moon.desktop
	examples/quick3d/moon/moon.pro
	examples/quick3d/moon/qml/Moon.qml
	examples/quick3d/moon/qml/desktop.qml
	examples/quick3d/moon/qtquick3d.ico
	examples/quick3d/photoroom/main.cpp
	examples/quick3d/photoroom/mt.qml
	examples/quick3d/photoroom/photoroom.desktop
	examples/quick3d/photoroom/photoroom.pro
	examples/quick3d/photoroom/qml/PhotoPane.qml
	examples/quick3d/photoroom/qml/PhotoRoom.qml
	examples/quick3d/photoroom/qml/textures/background.jpg
	examples/quick3d/photoroom/qml/textures/basket.jpg
	examples/quick3d/photoroom/qml/textures/niagara_falls.jpg
	examples/quick3d/photoroom/qtquick3d.ico
	examples/quick3d/qmlres.h
	examples/quick3d/qtquick3d.svg
	examples/quick3d/quick3d.pro
	examples/quick3d/shaders/main.cpp
	examples/quick3d/shaders/qml/Bouncing.qml
	examples/quick3d/shaders/qml/Collapsing.qml
	examples/quick3d/shaders/qml/Images.qml
	examples/quick3d/shaders/qml/Interpolate.qml
	examples/quick3d/shaders/qml/Shaders.qml
	examples/quick3d/shaders/qtquick3d.ico
	examples/quick3d/shaders/shaders.desktop
	examples/quick3d/shaders/shaders.pro
	examples/quick3d/sphere/main.cpp
	examples/quick3d/sphere/qml/Sphere.qml
	examples/quick3d/sphere/qtquick3d.ico
	examples/quick3d/sphere/sphere.desktop
	examples/quick3d/sphere/sphere.pro
	features/qt3d.prf
	features/qt3dquick.prf
	pkg.pri
	qtc_packaging/debian_harmattan/README
	qtc_packaging/debian_harmattan/changelog
	qtc_packaging/debian_harmattan/control
	qtc_packaging/debian_harmattan/libqt4-3d-examples.install
	qtc_packaging/debian_harmattan/rules
	qtquick3d.pro
	src/imports/shapes/cube.obj
	src/imports/shapes/cube.qdoc
	src/imports/shapes/line.cpp
	src/imports/shapes/point.cpp
	src/imports/shapes/quad.obj
	src/imports/shapes/quad.qdoc
	src/imports/shapes/shapes.pro
	src/imports/shapes/spheremesh.h
	src/imports/shapes/teapot.qdoc
	src/imports/threed/qgraphicslookattransform.cpp
	src/imports/threed/shaderprogram.cpp
	src/imports/threed/shaderprogram.h
	src/imports/threed/skybox.cpp
	src/imports/threed/skybox.h
	src/imports/threed/threed.cpp
	src/imports/threed/threed.pro
	src/imports/threed/viewport.cpp
	src/imports/threed/viewport.h
	src/plugins/imageformats/tga/main.cpp
	src/plugins/imageformats/tga/qtgahandler.cpp
	src/plugins/imageformats/tga/qtgahandler.h
	src/plugins/plugins.pro
	src/plugins/qpluginbase.pri
	src/plugins/sceneformats/3ds/3ds.pro
	src/plugins/sceneformats/3ds/qgl3dsscenehandler.cpp
	src/plugins/sceneformats/3ds/qgl3dsscenehandler.h
	src/plugins/sceneformats/assimp/ailoaderiosystem.cpp
	src/plugins/sceneformats/assimp/assimp.pro
	src/plugins/sceneformats/assimp/qailoader.cpp
	src/plugins/sceneformats/assimp/qailoader.h
	src/plugins/sceneformats/assimp/qaimesh.h
	src/plugins/sceneformats/assimp/qaiscene.cpp
	src/plugins/sceneformats/assimp/qaiscene.h
	src/plugins/sceneformats/assimp/qaiscenehandler.cpp
	src/plugins/sceneformats/assimp/qaiscenehandler.h
	src/plugins/sceneformats/bezier/bezier.pro
	src/plugins/sceneformats/bezier/main.cpp
	src/plugins/sceneformats/bezier/qglbezierscenehandler.cpp
	src/plugins/sceneformats/bezier/qglbezierscenehandler.h
	src/plugins/sceneformats/obj/obj.pro
	src/plugins/sceneformats/obj/qglobjscenehandler.cpp
	src/plugins/sceneformats/obj/qglobjscenehandler.h
	src/private/private.pri
	src/private/qfactoryloader_p.h
	src/quick3d/qdeclarativeeffect.cpp
	src/quick3d/qdeclarativeitem3d.cpp
	src/quick3d/qdeclarativeitem3d.h
	src/quick3d/qdeclarativemesh.cpp
	src/quick3d/qt3dquickglobal.h
	src/quick3d/quick3d.pri
	src/quick3d/quick3d.pro
	src/scripts/build_src_package.sh
	src/scripts/build_win_package.bat
	src/scripts/build_win_package.nsi
	src/scripts/filter-qmldump.pl
	src/threed/api/api.pri
	src/threed/api/gl-gen-funcs.pl
	src/threed/arrays/qarray.h
	src/threed/arrays/qglindexbuffer.cpp
	src/threed/arrays/qglvertexbundle_p.h
	src/threed/effects/qglcolladafxeffectfactory.cpp
	src/threed/effects/qglshaderprogrameffect.cpp
	src/threed/geometry/qgeometrydata.cpp
	src/threed/geometry/qglbezierpatches.cpp
	src/threed/geometry/qglcube.cpp
	src/threed/geometry/qglcylinder.cpp
	src/threed/geometry/qgldome.cpp
	src/threed/global/qt3dglobal.h
	src/threed/graphicsview/qglgraphicsviewportitem.cpp
	src/threed/graphicsview/qglgraphicsviewportitem.h
	src/threed/graphicsview/qgraphicsembedscene.cpp
	src/threed/graphicsview/qgraphicsembedscene.h
	src/threed/graphicsview/qgraphicsrotation3d.cpp
	src/threed/materials/qglmaterial.cpp
	src/threed/painting/qglext.cpp
	src/threed/painting/qglext_p.h
	src/threed/painting/qglpainter.cpp
	src/threed/painting/qglpainter.h
	src/threed/painting/qglpainter_p.h
	src/threed/scene/qglabstractscene.cpp
	src/threed/scene/qglabstractscene.h
	src/threed/scene/qglrenderstate.cpp
	src/threed/scene/qglsceneformatplugin.cpp
	src/threed/scene/qglsceneformatplugin.h
	src/threed/scene/qglscenenode.cpp
	src/threed/scene/qglscenenode.h
	src/threed/surfaces/qglabstractsurface.cpp
	src/threed/surfaces/qglabstractsurface.h
	src/threed/surfaces/qglcontextsurface.cpp
	src/threed/surfaces/qglcontextsurface_p.h
	src/threed/surfaces/qgldrawbuffersurface.cpp
	src/threed/surfaces/qgldrawbuffersurface_p.h
	src/threed/surfaces/qglframebufferobjectsurface.cpp
	src/threed/surfaces/qglframebufferobjectsurface.h
	src/threed/surfaces/qglmaskedsurface.cpp
	src/threed/surfaces/qglmaskedsurface_p.h
	src/threed/surfaces/qglpaintersurface.cpp
	src/threed/surfaces/qglpaintersurface_p.h
	src/threed/surfaces/qglpixelbuffersurface.cpp
	src/threed/surfaces/qglpixelbuffersurface.h
	src/threed/surfaces/qglsubsurface.cpp
	src/threed/surfaces/qglsubsurface.h
	src/threed/surfaces/qglwindowsurface.h
	src/threed/surfaces/surfaces.pri
	src/threed/textures/qglsharedresource.cpp
	src/threed/textures/qgltexture2d.cpp
	src/threed/textures/qgltexture2d.h
	src/threed/textures/qgltexture2d_p.h
	src/threed/textures/qgltextureutils.cpp
	src/threed/textures/qgltextureutils_p.h
	src/threed/threed.pri
	src/threed/threed.pro
	src/threed/viewing/qglcamera.cpp
	src/threed/viewing/qglcamera.h
	src/threed/viewing/qglview.cpp
	src/threed/viewing/qglview.h
	tests/auto/auto.pro
	tests/auto/qml3d/QtQuickTest/TestCase.qml
	tests/auto/qml3d/effect/tst_effect.qml
	tests/auto/qml3d/item3d/tst_item3d.qml
	tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml
	tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
	tests/auto/qml3d/lookat/tst_lookat.qml
	tests/auto/qml3d/mesh/tst_mesh.qml
	tests/auto/qml3d/modelview/tst_modelview.qml
	tests/auto/qml3d/picking/tst_picking.qml
	tests/auto/qml3d/qml3d.pro
	tests/auto/qml3d/scale3d/tst_scale3d.qml
	tests/auto/qml3d/sphere/tst_sphere.qml
	tests/auto/qml3d/tst_qml3d.cpp
	tests/auto/qml3d/viewport/tst_viewport.qml
	tests/auto/threed/load_model/load_model.pro
	tests/auto/threed/load_model/tst_load_model.cpp
	tests/auto/threed/qareaallocator/qareaallocator.pro
	tests/auto/threed/qarray/qarray.pro
	tests/auto/threed/qbox3d/qbox3d.pro
	tests/auto/threed/qcolor4ub/qcolor4ub.pro
	tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
	tests/auto/threed/qgeometrydata/qgeometrydata.pro
	tests/auto/threed/qgeometrydata/tst_qgeometrydata.cpp
	tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
	tests/auto/threed/qglabstractsurface/tst_qglabstractsurface.cpp
	tests/auto/threed/qglattributedescription/qglattributedescription.pro
	tests/auto/threed/qglattributeset/qglattributeset.pro
	tests/auto/threed/qglattributeset/tst_qglattributeset.cpp
	tests/auto/threed/qglattributevalue/qglattributevalue.pro
	tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
	tests/auto/threed/qglbuilder/qglbuilder.pro
	tests/auto/threed/qglcamera/qglcamera.pro
	tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
	tests/auto/threed/qglcameraanimation/tst_qglcameraanimation.cpp
	tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
	tests/auto/threed/qglcube/qglcube.pro
	tests/auto/threed/qglcube/tst_qglcube.cpp
	tests/auto/threed/qglcylinder/qglcylinder.pro
	tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
	tests/auto/threed/qglindexbuffer/tst_qglindexbuffer.cpp
	tests/auto/threed/qgllightmodel/qgllightmodel.pro
	tests/auto/threed/qgllightparameters/qgllightparameters.pro
	tests/auto/threed/qglmaterial/qglmaterial.pro
	tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
	tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
	tests/auto/threed/qglpainter/qglpainter.pro
	tests/auto/threed/qglpainter/qgltestwidget.cpp
	tests/auto/threed/qglpainter/qgltestwidget.h
	tests/auto/threed/qglpainter/tst_qglpainter.cpp
	tests/auto/threed/qglpickcolors/qglpickcolors.pro
	tests/auto/threed/qglrender/qglrender.pro
	tests/auto/threed/qglrender/tst_qglrender.cpp
	tests/auto/threed/qglscenenode/qglscenenode.pro
	tests/auto/threed/qglscenenode/tst_qglscenenode.cpp
	tests/auto/threed/qglsection/qglsection.pro
	tests/auto/threed/qglsharedresource/qglsharedresource.pro
	tests/auto/threed/qglsharedresource/tst_qglsharedresource.cpp
	tests/auto/threed/qglsphere/qglsphere.pro
	tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
	tests/auto/threed/qglvertexbundle/tst_qglvertexbundle.cpp
	tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
	tests/auto/threed/qplane3d/qplane3d.pro
	tests/auto/threed/qray3d/qray3d.pro
	tests/auto/threed/qsphere3d/qsphere3d.pro
	tests/auto/threed/qstereoimage/qstereoimage.pro
	tests/auto/threed/qtriangle3d/qtriangle3d.pro
	tests/auto/threed/qvectorarray/qvectorarray.pro
	tests/auto/threed/threed.pro
	tests/benchmarks/matrix_properties/matrix_properties.pro
	tests/benchmarks/matrix_properties/tst_matrix_properties.cpp
	tests/benchmarks/qarray/qarray.pro
	tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro
	tests/manual/animations/animations.pro
	tests/manual/animations/main.cpp
	tests/manual/animations/qml/TestCase.qml
	tests/manual/animations/qml/tst_animations.qml
	tests/manual/animations/tst_animations_qml.desktop
	tests/manual/background/main.cpp
	tests/manual/basic/basic.pro
	tests/manual/basic/main.cpp
	tests/manual/displaymodel/displaymodel.pro
	tests/manual/displaymodel/main.cpp
	tests/manual/displaymodel/qml/tst_displaymodel.qml
	tests/manual/fullreferencing/main.cpp
	tests/manual/manual.pro
	tests/manual/model3ds/main.cpp
	tests/manual/model3ds/model3ds.pro
	tests/manual/model3ds/qml/tst_model3ds.qml
	tests/manual/model3ds/tst_submesh_qml.desktop
	tests/manual/navigation1/main.cpp
	tests/manual/navigation1/navigation1.pro
	tests/manual/navigation1/qml/tst_navigation1.qml
	tests/manual/qrc/main.cpp
	tests/manual/qrc/qrc.pro
	tests/manual/qrc/tst_qrc_qml.desktop
	tests/manual/rotation/main.cpp
	tests/manual/rotation/qml/TestCase.qml
	tests/manual/rotation/qml/tst_rotation.qml
	tests/manual/rotation/rotation.pro
	tests/manual/rotation/tst_rotation_qml.desktop
	tests/manual/scaling/main.cpp
	tests/manual/scaling/qml/ScalingTestCase.qml
	tests/manual/scaling/qml/tst_scaling.qml
	tests/manual/scaling/scaling.pro
	tests/manual/scaling/tst_scaling_qml.desktop
	tests/manual/shapes/main.cpp
	tests/manual/shapes/shapes.pro
	tests/manual/submesh/main.cpp
	tests/manual/submesh/qml/tst_submesh.qml
	tests/manual/submesh/submesh.pro
	tests/manual/submesh/tst_submesh_qml.desktop
	tests/manual/transformations/main.cpp
	tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml
	tests/manual/transformations/qml/TransformationListTestCase.qml
	tests/manual/transformations/qml/tst_transformations.qml
	tests/manual/transformations/transformations.pro
	tests/manual/transformations/tst_transformations_qml.desktop
	tests/manual/translation/main.cpp
	tests/manual/translation/qml/AxesVsVectorTestCase.qml
	tests/manual/translation/qml/TranslationTestCase.qml
	tests/manual/translation/qml/TranslationVectorTestCase.qml
	tests/manual/translation/qml/tst_translation.qml
	tests/manual/translation/translation.pro
	tests/manual/translation/tst_translation_qml.desktop
	tests/shared/qmlres.h
	tests/shared/qtest_helpers.h
	tests/tests.pro
	tutorials/qt3d/cube1/cube1.pro
	tutorials/qt3d/cube1/cubeview.cpp
	tutorials/qt3d/cube1/cubeview.h
	tutorials/qt3d/cube1/main.cpp
	tutorials/qt3d/cube2/cube2.pro
	tutorials/qt3d/cube2/cubeview.cpp
	tutorials/qt3d/cube2/cubeview.h
	tutorials/qt3d/cube2/main.cpp
	tutorials/qt3d/cube3/cube3.pro
	tutorials/qt3d/cube3/cubeview.cpp
	tutorials/qt3d/cube3/cubeview.h
	tutorials/qt3d/cube3/main.cpp
	tutorials/qt3d/cube4/cube4.pro
	tutorials/qt3d/cube4/cubeview.cpp
	tutorials/qt3d/cube4/cubeview.h
	tutorials/qt3d/cube4/main.cpp
	tutorials/qt3d/penguin/main.cpp
	tutorials/qt3d/penguin/modelview.h
	tutorials/qt3d/penguin/penguin.pro
	tutorials/qt3d/penguin_advanced/main.cpp
	tutorials/qt3d/penguin_advanced/modelview.cpp
	tutorials/qt3d/penguin_advanced/modelview.h
	tutorials/qt3d/penguin_advanced/penguin_advanced.pro
	tutorials/quick3d/qmlres.h
	tutorials/quick3d/teapot_bounce_qml/main.cpp
	tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
	tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
	tutorials/quick3d/teapot_qml/main.cpp
	tutorials/quick3d/teapot_qml/teapot_qml.desktop
	tutorials/quick3d/teapot_qml/teapot_qml.pro
	util/meshcvt/meshcvt.pro
	util/qt3d/qglinfo/qglinfo.pro
	util/qt3d/qglinfo/qglinfowindow.cpp
	util/qt3d/qt3d.pro

Change-Id: I0983a5d634c16d9243210275091eff2227a4c2ec
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

1 files changed, 0 insertions, 601 deletions

diff --git a/3rdparty/assimp/code/ColladaHelper.h b/3rdparty/assimp/code/ColladaHelper.h
deleted file mode 100644
index ddf14990..00000000
--- a/3rdparty/assimp/code/ColladaHelper.h
+++ /dev/null
@@ -1,601 +0,0 @@
-/** Helper structures for the Collada loader */
-
-/*
-Open Asset Import Library (ASSIMP)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2010, ASSIMP Development Team
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the ASSIMP team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the ASSIMP Development Team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-
-#ifndef AI_COLLADAHELPER_H_INC
-#define AI_COLLADAHELPER_H_INC
-
-namespace Assimp {
-namespace Collada  {
-
-/** Collada file versions which evolved during the years ... */
-enum FormatVersion
-{
-    FV_1_5_n,
-    FV_1_4_n,
-    FV_1_3_n
-};
-
-
-/** Transformation types that can be applied to a node */
-enum TransformType
-{
-    TF_LOOKAT,
-    TF_ROTATE,
-    TF_TRANSLATE,
-    TF_SCALE,
-    TF_SKEW,
-    TF_MATRIX
-};
-
-/** Different types of input data to a vertex or face */
-enum InputType
-{
-    IT_Invalid,
-    IT_Vertex,  // special type for per-index data referring to the <vertices> element carrying the per-vertex data.
-    IT_Position,
-    IT_Normal,
-    IT_Texcoord,
-    IT_Color,
-    IT_Tangent,
-    IT_Bitangent
-};
-
-/** Contains all data for one of the different transformation types */
-struct Transform
-{
-    std::string mID;  ///< SID of the transform step, by which anim channels address their target node
-    TransformType mType;
-    float f[16]; ///< Interpretation of data depends on the type of the transformation
-};
-
-/** A collada camera. */
-struct Camera
-{
-    Camera()
-        : mOrtho  (false)
-        , mHorFov (10e10f)
-        , mVerFov (10e10f)
-        , mAspect (10e10f)
-        , mZNear  (0.1f)
-        , mZFar   (1000.f)
-    {}
-
-    // Name of camera
-    std::string mName;
-
-    // True if it is an orthografic camera
-    bool mOrtho;
-
-    //! Horizontal field of view in degrees
-    float mHorFov;
-
-    //! Vertical field of view in degrees
-    float mVerFov;
-
-    //! Screen aspect
-    float mAspect;
-
-    //! Near& far z
-    float mZNear, mZFar;
-};
-
-#define aiLightSource_AMBIENT 0xdeaddead
-
-/** A collada light source. */
-struct Light
-{
-    Light()
-        : mAttConstant     (1.f)
-        , mAttLinear       (0.f)
-        , mAttQuadratic    (0.f)
-        , mFalloffAngle    (180.f)
-        , mFalloffExponent (0.f)
-        , mPenumbraAngle  (10e10f)
-        , mOuterAngle   (10e10f)
-        , mIntensity   (1.f)
-    {}
-
-    //! Type of the light source aiLightSourceType + ambient
-    unsigned int mType;
-
-    //! Color of the light
-    aiColor3D mColor;
-
-    //! Light attenuation
-    float mAttConstant,mAttLinear,mAttQuadratic;
-
-    //! Spot light falloff
-    float mFalloffAngle;
-    float mFalloffExponent;
-
-    // -----------------------------------------------------
-    // FCOLLADA extension from here
-
-    //! ... related stuff from maja and max extensions
-    float mPenumbraAngle;
-    float mOuterAngle;
-
-    //! Common light intensity
-    float mIntensity;
-};
-
-/** Short vertex index description */
-struct InputSemanticMapEntry
-{
-    InputSemanticMapEntry()
-        : mSet (0)
-    {}
-
-    //! Index of set, optional
-    unsigned int mSet;
-
-    //! Name of referenced vertex input
-    InputType mType;
-};
-
-/** Table to map from effect to vertex input semantics */
-struct SemanticMappingTable
-{
-    //! Name of material
-    std::string mMatName;
-
-    //! List of semantic map commands, grouped by effect semantic name
-    std::map<std::string, InputSemanticMapEntry> mMap;
-
-    //! For std::find
-    bool operator == (const std::string& s) const {
-        return s == mMatName;
-    }
-};
-
-/** A reference to a mesh inside a node, including materials assigned to the various subgroups.
- * The ID refers to either a mesh or a controller which specifies the mesh
- */
-struct MeshInstance
-{
-    ///< ID of the mesh or controller to be instanced
-    std::string mMeshOrController;
-
-    ///< Map of materials by the subgroup ID they're applied to
-    std::map<std::string, SemanticMappingTable> mMaterials;
-};
-
-/** A reference to a camera inside a node*/
-struct CameraInstance
-{
-     ///< ID of the camera
-    std::string mCamera;
-};
-
-/** A reference to a light inside a node*/
-struct LightInstance
-{
-     ///< ID of the camera
-    std::string mLight;
-};
-
-/** A reference to a node inside a node*/
-struct NodeInstance
-{
-     ///< ID of the node
-    std::string mNode;
-};
-
-/** A node in a scene hierarchy */
-struct Node
-{
-    std::string mName;
-    std::string mID;
-  std::string mSID;
-    Node* mParent;
-    std::vector<Node*> mChildren;
-
-    /** Operations in order to calculate the resulting transformation to parent. */
-    std::vector<Transform> mTransforms;
-
-    /** Meshes at this node */
-    std::vector<MeshInstance> mMeshes;
-
-    /** Lights at this node */
-    std::vector<LightInstance> mLights;
-
-    /** Cameras at this node */
-    std::vector<CameraInstance> mCameras;
-
-    /** Node instances at this node */
-    std::vector<NodeInstance> mNodeInstances;
-
-    /** Rootnodes: Name of primary camera, if any */
-    std::string mPrimaryCamera;
-
-    //! Constructor. Begin with a zero parent
-    Node() {
-        mParent = NULL;
-    }
-
-    //! Destructor: delete all children subsequently
-    ~Node() {
-        for ( std::vector<Node*>::iterator it = mChildren.begin(); it != mChildren.end(); ++it)
-            delete *it;
-    }
-};
-
-/** Data source array: either floats or strings */
-struct Data
-{
-    bool mIsStringArray;
-    std::vector<float> mValues;
-    std::vector<std::string> mStrings;
-};
-
-/** Accessor to a data array */
-struct Accessor
-{
-    size_t mCount;   // in number of objects
-    size_t mSize;    // size of an object, in elements (floats or strings, mostly 1)
-    size_t mOffset;  // in number of values
-    size_t mStride;  // Stride in number of values
-    std::vector<std::string> mParams; // names of the data streams in the accessors. Empty string tells to ignore.
-    size_t mSubOffset[4]; // Suboffset inside the object for the common 4 elements. For a vector, thats XYZ, for a color RGBA and so on.
-                          // For example, SubOffset[0] denotes which of the values inside the object is the vector X component.
-    std::string mSource;   // URL of the source array
-    mutable const Data* mData; // Pointer to the source array, if resolved. NULL else
-
-    Accessor()
-    {
-        mCount = 0; mSize = 0; mOffset = 0; mStride = 0; mData = NULL;
-        mSubOffset[0] = mSubOffset[1] = mSubOffset[2] = mSubOffset[3] = 0;
-    }
-};
-
-/** A single face in a mesh */
-struct Face
-{
-    std::vector<size_t> mIndices;
-};
-
-/** An input channel for mesh data, referring to a single accessor */
-struct InputChannel
-{
-    InputType mType;      // Type of the data
-    size_t mIndex;    // Optional index, if multiple sets of the same data type are given
-    size_t mOffset;       // Index offset in the indices array of per-face indices. Don't ask, can't explain that any better.
-    std::string mAccessor; // ID of the accessor where to read the actual values from.
-    mutable const Accessor* mResolved; // Pointer to the accessor, if resolved. NULL else
-
-    InputChannel() { mType = IT_Invalid; mIndex = 0; mOffset = 0; mResolved = NULL; }
-};
-
-/** Subset of a mesh with a certain material */
-struct SubMesh
-{
-    std::string mMaterial; ///< subgroup identifier
-    size_t mNumFaces; ///< number of faces in this submesh
-};
-
-/** Contains data for a single mesh */
-struct Mesh
-{
-    Mesh()
-    {
-        for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS;++i)
-            mNumUVComponents[i] = 2;
-    }
-
-    // just to check if there's some sophisticated addressing involved...
-    // which we don't support, and therefore should warn about.
-    std::string mVertexID;
-
-    // Vertex data addressed by vertex indices
-    std::vector<InputChannel> mPerVertexData;
-
-    // actual mesh data, assembled on encounter of a <p> element. Verbose format, not indexed
-    std::vector<aiVector3D> mPositions;
-    std::vector<aiVector3D> mNormals;
-    std::vector<aiVector3D> mTangents;
-    std::vector<aiVector3D> mBitangents;
-    std::vector<aiVector3D> mTexCoords[AI_MAX_NUMBER_OF_TEXTURECOORDS];
-    std::vector<aiColor4D>  mColors[AI_MAX_NUMBER_OF_COLOR_SETS];
-
-    unsigned int mNumUVComponents[AI_MAX_NUMBER_OF_TEXTURECOORDS];
-
-    // Faces. Stored are only the number of vertices for each face.
-    // 1 == point, 2 == line, 3 == triangle, 4+ == poly
-    std::vector<size_t> mFaceSize;
-
-    // Position indices for all faces in the sequence given in mFaceSize -
-    // necessary for bone weight assignment
-    std::vector<size_t> mFacePosIndices;
-
-    // Submeshes in this mesh, each with a given material
-    std::vector<SubMesh> mSubMeshes;
-};
-
-/** Which type of primitives the ReadPrimitives() function is going to read */
-enum PrimitiveType
-{
-    Prim_Invalid,
-    Prim_Lines,
-    Prim_LineStrip,
-    Prim_Triangles,
-    Prim_TriStrips,
-    Prim_TriFans,
-    Prim_Polylist,
-    Prim_Polygon
-};
-
-/** A skeleton controller to deform a mesh with the use of joints */
-struct Controller
-{
-    // the URL of the mesh deformed by the controller.
-    std::string mMeshId;
-
-    // accessor URL of the joint names
-    std::string mJointNameSource;
-
-  ///< The bind shape matrix, as array of floats. I'm not sure what this matrix actually describes, but it can't be ignored in all cases
-  float mBindShapeMatrix[16];
-
-    // accessor URL of the joint inverse bind matrices
-    std::string mJointOffsetMatrixSource;
-
-    // input channel: joint names.
-    InputChannel mWeightInputJoints;
-    // input channel: joint weights
-    InputChannel mWeightInputWeights;
-
-    // Number of weights per vertex.
-    std::vector<size_t> mWeightCounts;
-
-    // JointIndex-WeightIndex pairs for all vertices
-    std::vector< std::pair<size_t, size_t> > mWeights;
-};
-
-/** A collada material. Pretty much the only member is a reference to an effect. */
-struct Material
-{
-    std::string mEffect;
-};
-
-/** Type of the effect param */
-enum ParamType
-{
-    Param_Sampler,
-    Param_Surface
-};
-
-/** A param for an effect. Might be of several types, but they all just refer to each other, so I summarize them */
-struct EffectParam
-{
-    ParamType mType;
-    std::string mReference; // to which other thing the param is referring to.
-};
-
-/** Shading type supported by the standard effect spec of Collada */
-enum ShadeType
-{
-    Shade_Invalid,
-    Shade_Constant,
-    Shade_Lambert,
-    Shade_Phong,
-    Shade_Blinn
-};
-
-/** Represents a texture sampler in collada */
-struct Sampler
-{
-    Sampler()
-        : mWrapU  (true)
-        , mWrapV  (true)
-        , mMirrorU ()
-        , mMirrorV ()
-        , mOp   (aiTextureOp_Multiply)
-        , mUVId  (0xffffffff)
-        , mWeighting  (1.f)
-        , mMixWithPrevious (1.f)
-    {}
-
-    /** Name of image reference
-     */
-    std::string mName;
-
-    /** Wrap U?
-     */
-    bool mWrapU;
-
-    /** Wrap V?
-     */
-    bool mWrapV;
-
-    /** Mirror U?
-     */
-    bool mMirrorU;
-
-    /** Mirror V?
-     */
-    bool mMirrorV;
-
-    /** Blend mode
-     */
-    aiTextureOp mOp;
-
-    /** UV transformation
-     */
-    aiUVTransform mTransform;
-
-    /** Name of source UV channel
-     */
-    std::string mUVChannel;
-
-    /** Resolved UV channel index or 0xffffffff if not known
-     */
-    unsigned int mUVId;
-
-    // OKINO/MAX3D extensions from here
-    // -------------------------------------------------------
-
-    /** Weighting factor
-     */
-    float mWeighting;
-
-    /** Mixing factor from OKINO
-     */
-    float mMixWithPrevious;
-};
-
-/** A collada effect. Can contain about anything according to the Collada spec,
-    but we limit our version to a reasonable subset. */
-struct Effect
-{
-    // Shading mode
-    ShadeType mShadeType;
-
-    // Colors
-    aiColor4D mEmissive, mAmbient, mDiffuse, mSpecular,
-        mTransparent, mReflective;
-
-    // Textures
-    Sampler mTexEmissive, mTexAmbient, mTexDiffuse, mTexSpecular,
-        mTexTransparent, mTexBump, mTexReflective;
-
-    // Scalar factory
-    float mShininess, mRefractIndex, mReflectivity;
-    float mTransparency;
-
-    // local params referring to each other by their SID
-    typedef std::map<std::string, Collada::EffectParam> ParamLibrary;
-    ParamLibrary mParams;
-
-    // MAX3D extensions
-    // ---------------------------------------------------------
-    // Double-sided?
-    bool mDoubleSided, mWireframe, mFaceted;
-
-    Effect()
-        : mShadeType    (Shade_Phong)
-        , mEmissive  ( 0, 0, 0, 1)
-        , mAmbient  ( 0.1f, 0.1f, 0.1f, 1)
-        , mDiffuse  ( 0.6f, 0.6f, 0.6f, 1)
-        , mSpecular  ( 0.4f, 0.4f, 0.4f, 1)
-        , mTransparent ( 0, 0, 0, 1)
-        , mShininess    (10.0f)
-        , mRefractIndex (1.f)
-        , mReflectivity (1.f)
-        , mTransparency (0.f)
-        , mDoubleSided (false)
-        , mWireframe    (false)
-        , mFaceted      (false)
-    {
-    }
-};
-
-/** An image, meaning texture */
-struct Image
-{
-    std::string mFileName;
-
-    /** If image file name is zero, embedded image data
-     */
-    std::vector<uint8_t> mImageData;
-
-    /** If image file name is zero, file format of
-     *  embedded image data.
-     */
-    std::string mEmbeddedFormat;
-
-};
-
-/** An animation channel. */
-struct AnimationChannel
-{
-    /** URL of the data to animate. Could be about anything, but we support only the
-     * "NodeID/TransformID.SubElement" notation
-     */
-    std::string mTarget;
-
-    /** Source URL of the time values. Collada calls them "input". Meh. */
-    std::string mSourceTimes;
-    /** Source URL of the value values. Collada calls them "output". */
-    std::string mSourceValues;
-};
-
-/** An animation. Container for 0-x animation channels or 0-x animations */
-struct Animation
-{
-    /** Anim name */
-    std::string mName;
-
-    /** the animation channels, if any */
-    std::vector<AnimationChannel> mChannels;
-
-    /** the sub-animations, if any */
-    std::vector<Animation*> mSubAnims;
-
-    /** Destructor */
-    ~Animation()
-    {
-        for ( std::vector<Animation*>::iterator it = mSubAnims.begin(); it != mSubAnims.end(); ++it)
-            delete *it;
-    }
-};
-
-/** Description of a collada animation channel which has been determined to affect the current node */
-struct ChannelEntry
-{
-    const Collada::AnimationChannel* mChannel; ///> the source channel
-    std::string mTransformId;   // the ID of the transformation step of the node which is influenced
-    size_t mTransformIndex; // Index into the node's transform chain to apply the channel to
-    size_t mSubElement; // starting index inside the transform data
-
-    // resolved data references
-    const Collada::Accessor* mTimeAccessor; ///> Collada accessor to the time values
-    const Collada::Data* mTimeData; ///> Source data array for the time values
-    const Collada::Accessor* mValueAccessor; ///> Collada accessor to the key value values
-    const Collada::Data* mValueData; ///> Source datat array for the key value values
-
-    ChannelEntry() { mChannel = NULL; mSubElement = 0; }
-};
-
-} // end of namespace Collada
-} // end of namespace Assimp
-
-#endif // AI_COLLADAHELPER_H_INC