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

Merge pull request #1861 from assimp/issue_1836 

closes https://github.com/assimp/assimp/issues/1836: make documentati…
pull/1859/head^2
Kim Kulling 2018-03-30 18:19:22 +02:00 committed by GitHub
parent 5ad2582317 4919d3da2f
commit 557466a9ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/CMakeLists.txt
View File

@ -177,8 +177,6 @@ SET( Common_SRCS
SkeletonMeshBuilder.cpp SkeletonMeshBuilder.cpp
SplitByBoneCountProcess.cpp SplitByBoneCountProcess.cpp
SplitByBoneCountProcess.h SplitByBoneCountProcess.h
ScaleProcess.cpp
ScaleProcess.h
StandardShapes.cpp StandardShapes.cpp
TargetAnimation.cpp TargetAnimation.cpp
TargetAnimation.h TargetAnimation.h
@ -586,6 +584,8 @@ SET( PostProcessing_SRCS
PolyTools.h PolyTools.h
MakeVerboseFormat.cpp MakeVerboseFormat.cpp
MakeVerboseFormat.h MakeVerboseFormat.h
ScaleProcess.cpp
ScaleProcess.h
) )
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS}) SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})

2
code/FBXConverter.h
View File

@ -443,6 +443,8 @@ private:
aiScene* const out; aiScene* const out;
const FBX::Document& doc; const FBX::Document& doc;
std::vector<std::string> mLightNames;
}; };
} }

7
code/ScaleProcess.cpp
View File

@ -88,13 +88,6 @@ void ScaleProcess::Execute( aiScene* pScene ) {
void ScaleProcess::traverseNodes( aiNode *node ) { void ScaleProcess::traverseNodes( aiNode *node ) {
applyScaling( node ); applyScaling( node );
/*for ( unsigned int i = 0; i < node->mNumChildren; ++i ) {
aiNode *currentNode = currentNode->mChildren[ i ];
if ( nullptr != currentNode ) {
traverseNodes( currentNode );
}
}*/
} }
void ScaleProcess::applyScaling( aiNode *currentNode ) { void ScaleProcess::applyScaling( aiNode *currentNode ) {

6
include/assimp/postprocess.h
View File

@ -537,9 +537,11 @@ enum aiPostProcessSteps
/** <hr>This step will perform a global scale of the model. /** <hr>This step will perform a global scale of the model.
* *
* Some importers are providing a mechanism to define a scaling unit for the * Some importers are providing a mechanism to define a scaling unit for the
* model. This post processing step can be used to do so. * model. This post processing step can be used to do so. You need to get the
* global scaling from your importer settings like in FBX. Use the flag
* AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY from the global property table to configure this.
* *
* Use <tt>#AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY</tt> to control this. * Use <tt>#AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY</tt> to setup the global scaing factor.
*/ */
aiProcess_GlobalScale = 0x8000000, aiProcess_GlobalScale = 0x8000000,