v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes https://github.com/assimp/assimp/issues/1952: check for postprocessing parameter before try to parse -f

pull/1956/head
Kim Kulling 2018-05-10 14:21:43 +02:00
parent 890ce3e44f
commit f7d0e05018
2 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/assimp_cmd/Export.cpp
View File

@ -106,7 +106,8 @@ int Assimp_Export(const char* const* params, unsigned int num)
continue; continue;
} }
if (!strncmp( params[i], "-f",2)) { if (!strncmp( params[i], "-f",2)) {
outf = std::string(params[i]+2); if ( strncmp( params[ i ], "-fi",3 ))
outf = std::string(params[i]+2);
} }
else if ( !strncmp( params[i], "--format=",9)) { else if ( !strncmp( params[i], "--format=",9)) {
outf = std::string(params[i]+9); outf = std::string(params[i]+9);

75
tools/assimp_cmd/Main.cpp
View File

@ -261,7 +261,6 @@ void PrintHorBar()
printf("-----------------------------------------------------------------\n"); printf("-----------------------------------------------------------------\n");
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Import a specific file // Import a specific file
const aiScene* ImportModel( const aiScene* ImportModel(
@ -390,105 +389,101 @@ int ProcessStandardArguments(
for (unsigned int i = 0; i < num;++i) for (unsigned int i = 0; i < num;++i)
{ {
if (! strcmp(params[i], "-ptv") || ! strcmp(params[i], "--pretransform-vertices")) { const char *param = params[ i ];
printf( "param = %s\n", param );
if (! strcmp( param, "-ptv") || ! strcmp( param, "--pretransform-vertices")) {
fill.ppFlags |= aiProcess_PreTransformVertices; fill.ppFlags |= aiProcess_PreTransformVertices;
} }
else if (! strcmp(params[i], "-gsn") || ! strcmp(params[i], "--gen-smooth-normals")) { else if (! strcmp( param, "-gsn") || ! strcmp( param, "--gen-smooth-normals")) {
fill.ppFlags |= aiProcess_GenSmoothNormals; fill.ppFlags |= aiProcess_GenSmoothNormals;
} }
else if (! strcmp(params[i], "-gn") || ! strcmp(params[i], "--gen-normals")) { else if (! strcmp( param, "-gn") || ! strcmp( param, "--gen-normals")) {
fill.ppFlags |= aiProcess_GenNormals; fill.ppFlags |= aiProcess_GenNormals;
} }
else if (! strcmp(params[i], "-jiv") || ! strcmp(params[i], "--join-identical-vertices")) { else if (! strcmp( param, "-jiv") || ! strcmp( param, "--join-identical-vertices")) {
fill.ppFlags |= aiProcess_JoinIdenticalVertices; fill.ppFlags |= aiProcess_JoinIdenticalVertices;
} }
else if (! strcmp(params[i], "-rrm") || ! strcmp(params[i], "--remove-redundant-materials")) { else if (! strcmp( param, "-rrm") || ! strcmp( param, "--remove-redundant-materials")) {
fill.ppFlags |= aiProcess_RemoveRedundantMaterials; fill.ppFlags |= aiProcess_RemoveRedundantMaterials;
} }
else if (! strcmp(params[i], "-fd") || ! strcmp(params[i], "--find-degenerates")) { else if (! strcmp( param, "-fd") || ! strcmp( param, "--find-degenerates")) {
fill.ppFlags |= aiProcess_FindDegenerates; fill.ppFlags |= aiProcess_FindDegenerates;
} }
else if (! strcmp(params[i], "-slm") || ! strcmp(params[i], "--split-large-meshes")) { else if (! strcmp( param, "-slm") || ! strcmp( param, "--split-large-meshes")) {
fill.ppFlags |= aiProcess_SplitLargeMeshes; fill.ppFlags |= aiProcess_SplitLargeMeshes;
} }
else if (! strcmp(params[i], "-lbw") || ! strcmp(params[i], "--limit-bone-weights")) { else if (! strcmp( param, "-lbw") || ! strcmp( param, "--limit-bone-weights")) {
fill.ppFlags |= aiProcess_LimitBoneWeights; fill.ppFlags |= aiProcess_LimitBoneWeights;
} }
else if (! strcmp(params[i], "-vds") || ! strcmp(params[i], "--validate-data-structure")) { else if (! strcmp( param, "-vds") || ! strcmp( param, "--validate-data-structure")) {
fill.ppFlags |= aiProcess_ValidateDataStructure; fill.ppFlags |= aiProcess_ValidateDataStructure;
} }
else if (! strcmp(params[i], "-icl") || ! strcmp(params[i], "--improve-cache-locality")) { else if (! strcmp( param, "-icl") || ! strcmp( param, "--improve-cache-locality")) {
fill.ppFlags |= aiProcess_ImproveCacheLocality; fill.ppFlags |= aiProcess_ImproveCacheLocality;
} }
else if (! strcmp(params[i], "-sbpt") || ! strcmp(params[i], "--sort-by-ptype")) { else if (! strcmp( param, "-sbpt") || ! strcmp( param, "--sort-by-ptype")) {
fill.ppFlags |= aiProcess_SortByPType; fill.ppFlags |= aiProcess_SortByPType;
} }
else if (! strcmp(params[i], "-lh") || ! strcmp(params[i], "--left-handed")) { else if (! strcmp( param, "-lh") || ! strcmp( param, "--left-handed")) {
fill.ppFlags |= aiProcess_ConvertToLeftHanded; fill.ppFlags |= aiProcess_ConvertToLeftHanded;
} }
else if (! strcmp(params[i], "-fuv") || ! strcmp(params[i], "--flip-uv")) { else if (! strcmp( param, "-fuv") || ! strcmp( param, "--flip-uv")) {
fill.ppFlags |= aiProcess_FlipUVs; fill.ppFlags |= aiProcess_FlipUVs;
} }
else if (! strcmp(params[i], "-fwo") || ! strcmp(params[i], "--flip-winding-order")) { else if (! strcmp( param, "-fwo") || ! strcmp( param, "--flip-winding-order")) {
fill.ppFlags |= aiProcess_FlipWindingOrder; fill.ppFlags |= aiProcess_FlipWindingOrder;
} }
else if (! strcmp(params[i], "-tuv") || ! strcmp(params[i], "--transform-uv-coords")) { else if (! strcmp( param, "-tuv") || ! strcmp( param, "--transform-uv-coords")) {
fill.ppFlags |= aiProcess_TransformUVCoords; fill.ppFlags |= aiProcess_TransformUVCoords;
} }
else if (! strcmp(params[i], "-guv") || ! strcmp(params[i], "--gen-uvcoords")) { else if (! strcmp( param, "-guv") || ! strcmp( param, "--gen-uvcoords")) {
fill.ppFlags |= aiProcess_GenUVCoords; fill.ppFlags |= aiProcess_GenUVCoords;
} }
else if (! strcmp(params[i], "-fid") || ! strcmp(params[i], "--find-invalid-data")) { else if (! strcmp( param, "-fid") || ! strcmp( param, "--find-invalid-data")) {
fill.ppFlags |= aiProcess_FindInvalidData; fill.ppFlags |= aiProcess_FindInvalidData;
} }
else if (! strcmp(params[i], "-fixn") || ! strcmp(params[i], "--fix-normals")) { else if (! strcmp( param, "-fixn") || ! strcmp( param, "--fix-normals")) {
fill.ppFlags |= aiProcess_FixInfacingNormals; fill.ppFlags |= aiProcess_FixInfacingNormals;
} }
else if (! strcmp(params[i], "-tri") || ! strcmp(params[i], "--triangulate")) { else if (! strcmp( param, "-tri") || ! strcmp( param, "--triangulate")) {
fill.ppFlags |= aiProcess_Triangulate; fill.ppFlags |= aiProcess_Triangulate;
} }
else if (! strcmp(params[i], "-cts") || ! strcmp(params[i], "--calc-tangent-space")) { else if (! strcmp( param, "-cts") || ! strcmp( param, "--calc-tangent-space")) {
fill.ppFlags |= aiProcess_CalcTangentSpace; fill.ppFlags |= aiProcess_CalcTangentSpace;
} }
else if (! strcmp(params[i], "-fi") || ! strcmp(params[i], "--find-instances")) { else if (! strcmp( param, "-fi") || ! strcmp( param, "--find-instances")) {
fill.ppFlags |= aiProcess_FindInstances; fill.ppFlags |= aiProcess_FindInstances;
} }
else if (! strcmp(params[i], "-og") || ! strcmp(params[i], "--optimize-graph")) { else if (! strcmp( param, "-og") || ! strcmp( param, "--optimize-graph")) {
fill.ppFlags |= aiProcess_OptimizeGraph; fill.ppFlags |= aiProcess_OptimizeGraph;
} }
else if (! strcmp(params[i], "-om") || ! strcmp(params[i], "--optimize-meshes")) { else if (! strcmp( param, "-om") || ! strcmp( param, "--optimize-meshes")) {
fill.ppFlags |= aiProcess_OptimizeMeshes; fill.ppFlags |= aiProcess_OptimizeMeshes;
} }
else if (! strcmp(params[i], "-db") || ! strcmp(params[i], "--debone")) { else if (! strcmp( param, "-db") || ! strcmp( param, "--debone")) {
fill.ppFlags |= aiProcess_Debone; fill.ppFlags |= aiProcess_Debone;
} }
else if (! strcmp(params[i], "-sbc") || ! strcmp(params[i], "--split-by-bone-count")) { else if (! strcmp( param, "-sbc") || ! strcmp( param, "--split-by-bone-count")) {
fill.ppFlags |= aiProcess_SplitByBoneCount; fill.ppFlags |= aiProcess_SplitByBoneCount;
} }
else if (! strncmp( param, "-c",2) || ! strncmp( param, "--config=",9)) {
else if (! strncmp(params[i], "-c",2) || ! strncmp(params[i], "--config=",9)) {
const unsigned int ofs = (params[i][1] == '-' ? 9 : 2); const unsigned int ofs = (params[i][1] == '-' ? 9 : 2);
// use default configurations // use default configurations
if (! strncmp(params[i]+ofs,"full",4)) { if (!strncmp( param + ofs, "full", 4 )) {
fill.ppFlags |= aiProcessPreset_TargetRealtime_MaxQuality; fill.ppFlags |= aiProcessPreset_TargetRealtime_MaxQuality;
} } else if (!strncmp( param + ofs, "default", 7 )) {
else if (! strncmp(params[i]+ofs,"default",7)) {
fill.ppFlags |= aiProcessPreset_TargetRealtime_Quality; fill.ppFlags |= aiProcessPreset_TargetRealtime_Quality;
} } else if (! strncmp( param +ofs,"fast",4)) {
else if (! strncmp(params[i]+ofs,"fast",4)) {
fill.ppFlags |= aiProcessPreset_TargetRealtime_Fast; fill.ppFlags |= aiProcessPreset_TargetRealtime_Fast;
} }
} } else if (! strcmp( param, "-l") || ! strcmp( param, "--show-log")) {
else if (! strcmp(params[i], "-l") || ! strcmp(params[i], "--show-log")) {
fill.showLog = true; fill.showLog = true;
} }
else if (! strcmp(params[i], "-v") || ! strcmp(params[i], "--verbose")) { else if (! strcmp( param, "-v") || ! strcmp( param, "--verbose")) {
fill.verbose = true; fill.verbose = true;
} }
else if (! strncmp(params[i], "--log-out=",10) || ! strncmp(params[i], "-lo",3)) { else if (! strncmp( param, "--log-out=",10) || ! strncmp( param, "-lo",3)) {
fill.logFile = std::string(params[i]+(params[i][1] == '-' ? 10 : 3)); fill.logFile = std::string(params[i]+(params[i][1] == '-' ? 10 : 3));
if (!fill.logFile.length()) { if (!fill.logFile.length()) {
fill.logFile = "assimp-log.txt"; fill.logFile = "assimp-log.txt";