X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene-loader%2Fpublic-api%2Fdli-loader.cpp;h=3031c5edcb470be3f2a251f98acc9c997cfb3172;hb=83d145f1006f5e5309f660b3ec4e211eecaecf31;hp=18214dd406460c2b1c9cba0bd2bea81089bf30d8;hpb=c052b6678e2c6d8a65545dbbe4531ea7057c1999;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene-loader/public-api/dli-loader.cpp b/dali-scene-loader/public-api/dli-loader.cpp index 18214dd..3031c5e 100644 --- a/dali-scene-loader/public-api/dli-loader.cpp +++ b/dali-scene-loader/public-api/dli-loader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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) { @@ -1626,14 +1634,13 @@ void DliLoader::Impl::ParseAnimations(const TreeNode* tnAnimations, LoadParams& if(tnValue) { animProp.mValue.reset(new AnimatedProperty::Value{ReadPropertyValue(*tnValue)}); + ReadBool(tnProperty.GetChild("relative"), animProp.mValue->mIsRelative); } else { mOnError(FormatString("Property '%s' fails to define target value.", animProp.mPropertyName.c_str())); } - - ReadBool(tnProperty.GetChild("relative"), animProp.mValue->mIsRelative); } animDef.mProperties.push_back(std::move(animProp));