X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-emitter-impl.cpp;h=2904ece0222295ee57d18719335e5c97788ba778;hp=b13765b6db9e23ac5b6b19dbcae87849be7b7ffe;hb=05d9f7a25bd9f4320a0e1fece8ec0ede819afe7d;hpb=49f9e8d43442bd3539a6a358b9147b95748f8140;ds=sidebyside diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index b13765b..2904ece 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,6 +22,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -143,8 +144,8 @@ void BubbleEmitter::OnInitialize() Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor ); mTextureSet = TextureSet::New(); - mTextureSet.SetImage( 0u, mEffectImage ); - mTextureSet.SetImage( 1u, mShapeImage ); + TextureSetImage( mTextureSet, 0u, mEffectImage ); + TextureSetImage( mTextureSet, 1u, mShapeImage ); mBubbleActors.resize( mNumActor ); @@ -200,7 +201,7 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta ) void BubbleEmitter::SetShapeImage( Image shapeImage ) { - mTextureSet.SetImage( 1, shapeImage ); + TextureSetImage( mTextureSet, 1, shapeImage ); } void BubbleEmitter::SetBubbleScale( float scale )