From: Tom Robinson <tom.robinson@samsung.com>
Date: Mon, 11 Jul 2016 14:51:41 +0000 (+0100)
Subject: Moved TextureSet::SetImage() to separate devel-api module
X-Git-Tag: dali_1.1.43~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F79525%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Moved TextureSet::SetImage() to separate devel-api module

Change-Id: I801d127df7805fb8df6bbaa28fbfeeee46c898a6
---

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 <dali/dali.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
@@ -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 <dali/dali.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
@@ -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 <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
@@ -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 )