kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected compile error in fbx pipeline

Browse Source 
--HG--
extra : source : 6e6f5784434d28e7c73d67efa21047a4ab325f66
This commit is contained in:
Kearwood Gilbert
2013-12-14 18:03:51 -08:00
parent e466e38501
commit b704ae5523
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
KREngine/kraken/KRResource+fbx.cpp
View File

@@ -130,7 +130,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
int animation_count = pFbxScene->GetSrcObjectCount<FbxAnimStack>(); int animation_count = pFbxScene->GetSrcObjectCount<FbxAnimStack>();
for(int i = 0; i < animation_count; i++) { for(int i = 0; i < animation_count; i++) {
FbxAnimStack *animation = pFbxScene->GetSrcObject<FbxAnimStack>(i); FbxAnimStack *animation = pFbxScene->GetSrcObject<FbxAnimStack>(i);
KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation %i of %i: %s", i+1, animation_count, animation->GetName().c_str()); KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation %i of %i: %s", i+1, animation_count, animation->GetName());
KRAnimation *new_animation = LoadAnimation(context, animation); KRAnimation *new_animation = LoadAnimation(context, animation);
if(new_animation) { if(new_animation) {
context.getAnimationManager()->addAnimation(new_animation); context.getAnimationManager()->addAnimation(new_animation);
@@ -142,7 +142,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
int curve_count = pFbxScene->GetSrcObjectCount<FbxAnimCurve>(); int curve_count = pFbxScene->GetSrcObjectCount<FbxAnimCurve>();
for(int i=0; i < curve_count; i++) { for(int i=0; i < curve_count; i++) {
FbxAnimCurve *curve = pFbxScene->GetSrcObject<FbxAnimCurve>(i); FbxAnimCurve *curve = pFbxScene->GetSrcObject<FbxAnimCurve>(i);
KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation Curve %i of %i: %s", i+1, curve_count, curve->GetName().c_str()); KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Animation Curve %i of %i: %s", i+1, curve_count, curve->GetName());
KRAnimationCurve *new_curve = LoadAnimationCurve(context, curve); KRAnimationCurve *new_curve = LoadAnimationCurve(context, curve);
if(new_curve) { if(new_curve) {
@@ -156,7 +156,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading materials..."); KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, "\nLoading materials...");
for(int i=0; i < material_count; i++) { for(int i=0; i < material_count; i++) {
FbxSurfaceMaterial *material = pFbxScene->GetSrcObject<FbxSurfaceMaterial>(i); FbxSurfaceMaterial *material = pFbxScene->GetSrcObject<FbxSurfaceMaterial>(i);
KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Material %i of %i: %s", i+1, material_count, material->GetName().c_str()); KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Material %i of %i: %s", i+1, material_count, material->GetName());
LoadMaterial(context, material); LoadMaterial(context, material);
} }
@@ -166,7 +166,7 @@ void KRResource::LoadFbx(KRContext &context, const std::string& path)
for(int i=0; i < mesh_count; i++) { for(int i=0; i < mesh_count; i++) {
FbxMesh *mesh = pFbxScene->GetSrcObject<FbxMesh>(i); FbxMesh *mesh = pFbxScene->GetSrcObject<FbxMesh>(i);
KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Mesh %i of %i: %s", i+1, mesh_count, mesh->GetNode()->GetName().c_str()); KRContext::Log(KRContext::LOG_LEVEL_INFORMATION, " Mesh %i of %i: %s", i+1, mesh_count, mesh->GetNode()->GetName());
LoadMesh(context, pFbxScene, pGeometryConverter, mesh); LoadMesh(context, pFbxScene, pGeometryConverter, mesh);
} }