X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fnpatch%2Fnpatch-visual.cpp;h=8b44d996bfc1c8a681db86759cb283ff20b054a3;hp=f95a7965f782c90605dba5d15f12d5ac5ec685ce;hb=5b4a2b122d0c633084864a099de5ba5b8d919373;hpb=887acc93b8ad0c9ef2f5039ae79efd672cfe315a diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index f95a796..8b44d99 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -102,7 +102,14 @@ void NPatchVisual::LoadImages() bool loadingStatus = false; // Load the auxiliary image - mAuxiliaryTextureSet = textureManager.LoadTexture(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, maskingDataPtr, synchronousLoading, mAuxiliaryTextureId, atlasRect, atlasRectSize, atlasing, loadingStatus, WrapMode::DEFAULT, WrapMode::DEFAULT, this, nullptr, imageAtlasManagerPtr, true, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoad); + mAuxiliaryTextureSet = textureManager.LoadTexture(mAuxiliaryUrl, Dali::ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, maskingDataPtr, synchronousLoading, mAuxiliaryTextureId, atlasRect, atlasRectSize, atlasing, loadingStatus, this, nullptr, imageAtlasManagerPtr, true, TextureManager::ReloadPolicy::CACHED, preMultiplyOnLoad); + + if(mAuxiliaryTextureSet) + { + Sampler sampler = Sampler::New(); + sampler.SetWrapMode(WrapMode::DEFAULT, WrapMode::DEFAULT); + mAuxiliaryTextureSet.SetSampler(0u, sampler); + } // If synchronousLoading is true, we can check the auxiliaryResource's status now. if(synchronousLoading) @@ -599,7 +606,14 @@ void NPatchVisual::LoadComplete(bool loadSuccess, TextureInformation textureInfo } if(loadSuccess) { - mAuxiliaryTextureSet = textureInformation.textureSet; + mAuxiliaryTextureSet = textureInformation.textureSet; + if(mAuxiliaryTextureSet) + { + Sampler sampler = Sampler::New(); + sampler.SetWrapMode(WrapMode::DEFAULT, WrapMode::DEFAULT); + mAuxiliaryTextureSet.SetSampler(0u, sampler); + } + mAuxiliaryResourceStatus = Toolkit::Visual::ResourceStatus::READY; } else