X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene-loader%2Fpublic-api%2Fdli-loader.cpp;h=2c8bd97a88491d3122a38795cfe969eb9b5ff2b9;hp=48a82c342768adf33d1a66af5066f1aec665eafa;hb=9a96ba99c22d8b726369fc0da8dbf62c9d51258b;hpb=e54ea0676d3bbe53d40309a41b1b415f8f6a64d4 diff --git a/dali-scene-loader/public-api/dli-loader.cpp b/dali-scene-loader/public-api/dli-loader.cpp index 48a82c3..2c8bd97 100644 --- a/dali-scene-loader/public-api/dli-loader.cpp +++ b/dali-scene-loader/public-api/dli-loader.cpp @@ -1014,6 +1014,14 @@ void DliLoader::Impl::ParseMaterials(const TreeNode* materials, ConvertColorCode materialDef.mFlags |= semantic; } + if(ReadString(node.GetChild("occlusionMap"), texturePath)) + { + ToUnixFileSeparators(texturePath); + const auto semantic = MaterialDefinition::OCCLUSION; + materialDef.mTextureStages.push_back({semantic, TextureDefinition{std::move(texturePath)}}); + materialDef.mFlags |= semantic; + } + if(ReadColorCodeOrColor(&node, materialDef.mColor, convertColorCode) && materialDef.mColor.a < 1.0f) { @@ -1255,9 +1263,10 @@ void DliLoader::Impl::ParseNodesInternal(const TreeNode* const nodes, Index inde auto& extras = nodeDef.mExtras; extras.reserve(eExtras->Size()); - NodeDefinition::Extra e; for(auto i0 = eExtras->CBegin(), i1 = eExtras->CEnd(); i0 != i1; ++i0) { + NodeDefinition::Extra e; + auto eExtra = *i0; e.mKey = eExtra.first; if(e.mKey.empty())