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

Merge

Browse Source 
--HG--
branch : nfb
This commit is contained in:
Kearwood Gilbert
2013-11-30 02:03:30 -08:00
parent a1d93d24b9 c1551a8a23
commit 70f70bc1e6
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
KREngine/kraken/KRAnimationCurveManager.cpp
View File

@@ -50,12 +50,19 @@ void KRAnimationCurveManager::deleteAnimationCurve(KRAnimationCurve *curve) {
KRAnimationCurve *KRAnimationCurveManager::loadAnimationCurve(const std::string &name, KRDataBlock *data) { KRAnimationCurve *KRAnimationCurveManager::loadAnimationCurve(const std::string &name, KRDataBlock *data) {
KRAnimationCurve *pAnimationCurve = KRAnimationCurve::Load(*m_pContext, name, data); KRAnimationCurve *pAnimationCurve = KRAnimationCurve::Load(*m_pContext, name, data);
if(pAnimationCurve) {
m_animationCurves[name] = pAnimationCurve; m_animationCurves[name] = pAnimationCurve;
}
return pAnimationCurve; return pAnimationCurve;
} }
KRAnimationCurve *KRAnimationCurveManager::getAnimationCurve(const std::string &name) { KRAnimationCurve *KRAnimationCurveManager::getAnimationCurve(const std::string &name) {
return m_animationCurves[name]; unordered_map<std::string, KRAnimationCurve *>::iterator itr = m_animationCurves.find(name);
if(itr == m_animationCurves.end()) {
return NULL; // Not found
} else {
return (*itr).second;
}
} }
unordered_map<std::string, KRAnimationCurve *> &KRAnimationCurveManager::getAnimationCurves() { unordered_map<std::string, KRAnimationCurve *> &KRAnimationCurveManager::getAnimationCurves() {
@@ -64,6 +71,7 @@ unordered_map<std::string, KRAnimationCurve *> &KRAnimationCurveManager::getAnim
void KRAnimationCurveManager::addAnimationCurve(KRAnimationCurve *new_animation_curve) void KRAnimationCurveManager::addAnimationCurve(KRAnimationCurve *new_animation_curve)
{ {
assert(new_animation_curve != NULL);
m_animationCurves[new_animation_curve->getName()] = new_animation_curve; m_animationCurves[new_animation_curve->getName()] = new_animation_curve;
} }

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

@@ -1420,9 +1420,10 @@ void LoadMesh(KRContext &context, FbxScene* pFbxScene, FbxGeometryConverter *pGe
FbxVector2 uv; FbxVector2 uv;
bool unmapped = false; bool unmapped = false;
if(pMesh->GetPolygonVertexUV(iPolygon, iVertex, setName, uv, unmapped)) { if(pMesh->GetPolygonVertexUV(iPolygon, iVertex, setName, uv, unmapped)) {
assert(!unmapped); if(!unmapped) {
new_uva = KRVector2(uv[0], uv[1]); new_uva = KRVector2(uv[0], uv[1]);
} }
}
mi.uva.push_back(new_uva); mi.uva.push_back(new_uva);
} }
@@ -1431,9 +1432,10 @@ void LoadMesh(KRContext &context, FbxScene* pFbxScene, FbxGeometryConverter *pGe
FbxVector2 uv; FbxVector2 uv;
bool unmapped = false; bool unmapped = false;
if(pMesh->GetPolygonVertexUV(iPolygon, iVertex, setName, uv, unmapped)) { if(pMesh->GetPolygonVertexUV(iPolygon, iVertex, setName, uv, unmapped)) {
assert(!unmapped); if(!unmapped) {
new_uvb = KRVector2(uv[0], uv[1]); new_uvb = KRVector2(uv[0], uv[1]);
} }
}
mi.uvb.push_back(new_uvb); mi.uvb.push_back(new_uvb);
} }