From 4f61b1f96bd61e383bdc02c58978b6e0ade9b315 Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Sat, 14 Dec 2013 16:37:14 -0800 Subject: [PATCH] FBX Importer messages are now sent through the logging callbacks --HG-- extra : source : 5be63aaf609e05f9be60a36a95213f41e6d5f228 --- KREngine/kraken/KRResource+fbx.cpp | 76 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/KREngine/kraken/KRResource+fbx.cpp b/KREngine/kraken/KRResource+fbx.cpp index 31a5f97..4b1a7fd 100644 --- a/KREngine/kraken/KRResource+fbx.cpp +++ b/KREngine/kraken/KRResource+fbx.cpp @@ -35,7 +35,7 @@ #define IOS_REF (*(pSdkManager->GetIOSettings())) #endif -#define warning(e,s) if(!(e))printf("WARNING: %s\n",s) +#define warning(e,s) if(!(e))KRContext::Log(KRContext::LOG_LEVEL_WARNING, "%s\n",s) void InitializeSdkObjects(FbxManager*& pSdkManager, FbxScene*& pScene); void DestroySdkObjects(FbxManager* pSdkManager); @@ -126,11 +126,11 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path) */ // ----====---- Import Animation Layers ----====---- - printf("\nLoading animations...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading animations..."); int animation_count = pFbxScene->GetSrcObjectCount(); for(int i = 0; i < animation_count; i++) { FbxAnimStack *animation = pFbxScene->GetSrcObject(i); - printf(" Animation %i of %i: %s\n", i+1, animation_count, animation->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation %i of %i: %s", i+1, animation_count, animation->GetName()); KRAnimation *new_animation = LoadAnimation(context, animation); if(new_animation) { context.getAnimationManager()->addAnimation(new_animation); @@ -138,51 +138,51 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path) } // ----====---- Import Animation Curves ----====---- - printf("\nLoading animation curves...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading animation curves..."); int curve_count = pFbxScene->GetSrcObjectCount(); for(int i=0; i < curve_count; i++) { FbxAnimCurve *curve = pFbxScene->GetSrcObject(i); - printf(" Animation Curve %i of %i: %s\n", i+1, curve_count, curve->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation Curve %i of %i: %s", i+1, curve_count, curve->GetName()); KRAnimationCurve *new_curve = LoadAnimationCurve(context, curve); if(new_curve) { - printf("Adding a curve\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Adding a curve"); context.getAnimationCurveManager()->addAnimationCurve(new_curve); } } // ----====---- Import Materials ----====---- int material_count = pFbxScene->GetSrcObjectCount(); - printf("\nLoading materials...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading materials..."); for(int i=0; i < material_count; i++) { FbxSurfaceMaterial *material = pFbxScene->GetSrcObject(i); - printf(" Material %i of %i: %s\n", i+1, material_count, material->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Material %i of %i: %s", i+1, material_count, material->GetName()); LoadMaterial(context, material); } // ----====---- Import Meshes ----====---- int mesh_count = pFbxScene->GetSrcObjectCount(); - printf("\nLoading meshes...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Loading meshes..."); for(int i=0; i < mesh_count; i++) { FbxMesh *mesh = pFbxScene->GetSrcObject(i); - printf(" Mesh %i of %i: %s\n", i+1, mesh_count, mesh->GetNode()->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Mesh %i of %i: %s", i+1, mesh_count, mesh->GetNode()->GetName()); LoadMesh(context, pFbxScene, pGeometryConverter, mesh); } // ----====---- Import Textures ----====---- int texture_count = pFbxScene->GetSrcObjectCount(); - printf("\nLoading textures...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Loading textures..."); for(int i=0; i < texture_count; i++) { FbxFileTexture *texture = pFbxScene->GetSrcObject(i); const char *file_name = texture->GetFileName(); - printf(" Texture %i of %i: %s\n", i+1, texture_count, (KRResource::GetFileBase(file_name) + "." + KRResource::GetFileExtension(file_name)).c_str()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Texture %i of %i: %s", i+1, texture_count, (KRResource::GetFileBase(file_name) + "." + KRResource::GetFileExtension(file_name)).c_str()); context.loadResource(file_name); } // ----====---- Import Scene Graph Nodes ----====---- - printf("\nLoading scene graph...\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Loading scene graph..."); if(pNode) { for(int i = 0; i < pNode->GetChildCount(); i++) @@ -205,7 +205,7 @@ void InitializeSdkObjects(FbxManager*& pSdkManager, FbxScene*& pScene) if (!pSdkManager) { - printf("Unable to create the FBX SDK manager\n"); + KRContext::Log(KRContext::LOG_LEVEL_ERROR, "Unable to create the FBX SDK manager"); exit(0); } @@ -263,40 +263,38 @@ bool LoadScene(FbxManager* pSdkManager, FbxDocument* pScene, const char* pFilena { FbxStatus &status = lImporter->GetStatus(); - printf("Call to KFbxImporter::Initialize() failed.\n"); - printf("Error returned: %s\n\n", status.GetErrorString()); + KRContext::Log(KRContext::LOG_LEVEL_ERROR, "Call to KFbxImporter::Initialize() failed.\nError returned: %s", status.GetErrorString()); if (status.GetCode() == FbxStatus::EStatusCode::eInvalidFileVersion) { - printf("FBX version number for this FBX SDK is %d.%d.%d\n", lSDKMajor, lSDKMinor, lSDKRevision); - printf("FBX version number for file %s is %d.%d.%d\n\n", pFilename, lFileMajor, lFileMinor, lFileRevision); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "FBX version number for this FBX SDK is %d.%d.%d", lSDKMajor, lSDKMinor, lSDKRevision); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "FBX version number for file %s is %d.%d.%d", pFilename, lFileMajor, lFileMinor, lFileRevision); } return false; } - printf("FBX version number for this FBX SDK is %d.%d.%d\n", lSDKMajor, lSDKMinor, lSDKRevision); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "FBX version number for this FBX SDK is %d.%d.%d", lSDKMajor, lSDKMinor, lSDKRevision); if(!lImporter->IsFBX()) { - printf("ERROR Unrecognized FBX File\n"); + KRContext::Log(KRContext::LOG_LEVEL_ERROR, "ERROR Unrecognized FBX File"); return false; } - printf("FBX version number for file %s is %d.%d.%d\n\n", pFilename, lFileMajor, lFileMinor, lFileRevision); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "FBX version number for file %s is %d.%d.%d\n", pFilename, lFileMajor, lFileMinor, lFileRevision); // From this point, it is possible to access animation stack information without // the expense of loading the entire file. - printf("Animation Stack Information\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Animation Stack Information"); lAnimStackCount = lImporter->GetAnimStackCount(); - printf(" Number of Animation Stacks: %d\n", lAnimStackCount); - printf(" Current Animation Stack: \"%s\"\n", lImporter->GetActiveAnimStackName().Buffer()); - printf("\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Number of Animation Stacks: %d", lAnimStackCount); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Current Animation Stack: \"%s\"", lImporter->GetActiveAnimStackName().Buffer()); // Set the import states. By default, the import states are always set to @@ -369,7 +367,7 @@ bool LoadScene(FbxManager* pSdkManager, FbxDocument* pScene, const char* pFilena KRAnimation *LoadAnimation(KRContext &context, FbxAnimStack* pAnimStack) { - printf("Loading animation: \"%s\"\n", pAnimStack->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Loading animation: \"%s\"", pAnimStack->GetName()); KRAnimation *new_animation = new KRAnimation(context, pAnimStack->GetName()); int cLayers = pAnimStack->GetMemberCount(); @@ -383,10 +381,10 @@ KRAnimation *LoadAnimation(KRContext &context, FbxAnimStack* pAnimStack) KRAnimationCurve *LoadAnimationCurve(KRContext &context, FbxAnimCurve* pAnimCurve) { std::string name = GetFbxObjectName(pAnimCurve); - printf("Loading animation curve: \"%s\"\n", name.c_str()); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Loading animation curve: \"%s\"", name.c_str()); FbxTimeSpan time_span; if(!pAnimCurve->GetTimeInterval(time_span)) { - printf(" ERROR: Failed to get time interval.\n"); + KRContext::Log(KRContext::LOG_LEVEL_ERROR, "Failed to get time interval."); return NULL; } @@ -1142,7 +1140,7 @@ void LoadMaterial(KRContext &context, FbxSurfaceMaterial *pMaterial) { new_material->setTransparency(1.0f - (lKFbxDouble3.Get()[0] + lKFbxDouble3.Get()[1] + lKFbxDouble3.Get()[2]) / 3.0f); } else { - printf("Error! Unable to convert material: %s", pMaterial->GetName()); + KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Unable to convert material: %s", pMaterial->GetName()); } @@ -1152,12 +1150,12 @@ void LoadMaterial(KRContext &context, FbxSurfaceMaterial *pMaterial) { // Diffuse Map Texture pProperty = pMaterial->FindProperty(FbxSurfaceMaterial::sDiffuse); if(pProperty.GetSrcObjectCount(FbxLayeredTexture::ClassId) > 0) { - printf("Warning! Layered textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Layered textures not supported."); } int texture_count = pProperty.GetSrcObjectCount(FbxTexture::ClassId); if(texture_count > 1) { - printf("Error! Multiple diffuse textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Multiple diffuse textures not supported."); } else if(texture_count == 1) { FbxTexture* pTexture = FbxCast (pProperty.GetSrcObject(FbxTexture::ClassId,0)); assert(!pTexture->GetSwapUV()); @@ -1181,11 +1179,11 @@ void LoadMaterial(KRContext &context, FbxSurfaceMaterial *pMaterial) { // Specular Map Texture pProperty = pMaterial->FindProperty(FbxSurfaceMaterial::sSpecular); if(pProperty.GetSrcObjectCount(FbxLayeredTexture::ClassId) > 0) { - printf("Warning! Layered textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Layered textures not supported."); } texture_count = pProperty.GetSrcObjectCount(FbxTexture::ClassId); if(texture_count > 1) { - printf("Error! Multiple specular textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Multiple specular textures not supported."); } else if(texture_count == 1) { FbxTexture* pTexture = FbxCast (pProperty.GetSrcObject(FbxTexture::ClassId,0)); FbxFileTexture *pFileTexture = FbxCast(pTexture); @@ -1197,13 +1195,13 @@ void LoadMaterial(KRContext &context, FbxSurfaceMaterial *pMaterial) { // Normal Map Texture pProperty = pMaterial->FindProperty(FbxSurfaceMaterial::sNormalMap); if(pProperty.GetSrcObjectCount(FbxLayeredTexture::ClassId) > 0) { - printf("Warning! Layered textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Layered textures not supported."); } texture_count = pProperty.GetSrcObjectCount(); if(texture_count > 1) { - printf("Error! Multiple normal map textures not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Multiple normal map textures not supported."); } else if(texture_count == 1) { FbxTexture* pTexture = pProperty.GetSrcObject(0); FbxFileTexture *pFileTexture = FbxCast(pTexture); @@ -1254,11 +1252,11 @@ void LoadMesh(KRContext &context, FbxScene* pFbxScene, FbxGeometryConverter *pGe for(int skin_index=0; skin_indexGetDeformer(skin_index, FbxDeformer::eSkin); int cluster_count = skin->GetClusterCount(); - printf(" Found skin with %i clusters.\n", cluster_count); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Found skin with %i clusters.\n", cluster_count); for(int cluster_index=0; cluster_index < cluster_count; cluster_index++) { FbxCluster *cluster = skin->GetCluster(cluster_index); if(cluster->GetLinkMode() != FbxCluster::eNormalize) { - printf(" Warning! link mode not supported.\n"); + KRContext::Log(KRContext::LOG_LEVEL_WARNING, " Warning! link mode not supported."); } std::string bone_name = GetFbxObjectName(cluster->GetLink()); mi.bone_names.push_back(bone_name); @@ -1317,7 +1315,7 @@ void LoadMesh(KRContext &context, FbxScene* pFbxScene, FbxGeometryConverter *pGe } if(too_many_bone_weights) { - printf(" WARNING! - Clipped bone weights to limit of %i per vertex (selecting largest weights and re-normalizing).\n", KRENGINE_MAX_BONE_WEIGHTS_PER_VERTEX); + KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Clipped bone weights to limit of %i per vertex (selecting largest weights and re-normalizing).", KRENGINE_MAX_BONE_WEIGHTS_PER_VERTEX); } // Normalize bone weights if(mi.bone_names.size() > 0) { @@ -1374,7 +1372,7 @@ void LoadMesh(KRContext &context, FbxScene* pFbxScene, FbxGeometryConverter *pGe int lPolygonSize = pMesh->GetPolygonSize(iPolygon); if(lPolygonSize != 3) { source_vertex_id += lPolygonSize; - printf(" Warning - Poly with %i vertices found. Expecting only triangles.", lPolygonSize); + KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "Poly with %i vertices found. Expecting only triangles.", lPolygonSize); } else { // ----====---- Read SubMesh / Material Mapping ----====---- int iNewMaterial = -1;