qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new version check to config.tests for assimp 

Qt3D expects new version of assimp. Use new animation stuff to check new
version.

Task-number: QTBUG-59121
Change-Id: I3988beaab5b7dac825c67a225f785130be99aad6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Määttä Antti 2017-04-10 09:58:15 +03:00 committed by Antti Määttä
parent 8eee273390
commit c8dc1b687b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.tests/assimp/main.cpp
View File

@ -31,6 +31,7 @@
#include <assimp/postprocess.h> #include <assimp/postprocess.h>
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <assimp/DefaultLogger.hpp> #include <assimp/DefaultLogger.hpp>
#include <assimp/anim.h>
int main(int , char **) int main(int , char **)
{ {
@ -40,5 +41,9 @@ int main(int , char **)
// SET THIS TO REMOVE POINTS AND LINES -> HAVE ONLY TRIANGLES // SET THIS TO REMOVE POINTS AND LINES -> HAVE ONLY TRIANGLES
importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_LINE|aiPrimitiveType_POINT); importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_LINE|aiPrimitiveType_POINT);
// Check for new version by setting animation morph channels.
aiAnimation anim;
anim.mNumMorphMeshChannels = 0;
return 0; return 0;
} }