diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 5296b96..acc83d8 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.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. @@ -21,6 +21,7 @@ //Internal includes #include +#include #include #include @@ -551,8 +552,8 @@ void MetaballExplosionController::AddRefractionImage() //Create new texture set TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, mBackImage ); - textureSet.SetImage( 1u, fbo ); + TextureSetImage( textureSet, 0u, mBackImage ); + TextureSetImage( textureSet, 1u, fbo ); //Create geometry Geometry metaballGeom = CreateGeometryComposition(); diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index ce43545..4dde399 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.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. @@ -16,6 +16,7 @@ */ #include +#include #include #include @@ -532,15 +533,15 @@ void MetaballRefracController::AddRefractionImage() //Create new texture set mTextureSetRefraction = TextureSet::New(); - mTextureSetRefraction.SetImage( 0u, mBackImage ); - mTextureSetRefraction.SetImage( 1u, mMetaballFBO ); + TextureSetImage( mTextureSetRefraction, 0u, mBackImage ); + TextureSetImage( mTextureSetRefraction, 1u, mMetaballFBO ); //Create normal shader mShaderNormal = Shader::New( METABALL_VERTEX_SHADER, FRAG_SHADER ); //Create new texture set mTextureSetNormal = TextureSet::New(); - mTextureSetNormal.SetImage( 0u, mBackImage ); + TextureSetImage( mTextureSetNormal, 0u, mBackImage ); //Create actor mCompositionActor = Actor::New( ); diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index a72e1de..9712638 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.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. @@ -15,6 +15,7 @@ */ // EXTERNAL INCLUDES +#include #include #include #include @@ -329,7 +330,8 @@ void NewWindowController::AddBlendingImageActor( Actor& parentActor ) blendActor.SetSize(140, 140); parentActor.Add(blendActor); - blendActor.GetRendererAt(0u).GetTextures().SetImage( 1u, fb2 ); + TextureSet textureSet = blendActor.GetRendererAt(0u).GetTextures(); + TextureSetImage( textureSet, 1u, fb2 ); } void NewWindowController::AddTextLabel( Actor& parentActor )