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

Change-Id: I9c80e53b3732233322dd1ce7febfe10e1ebc91e5

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index 5932777..7f262bc 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -527,7 +527,7 @@ void Indicator::SetVisible( Dali::Window::IndicatorVisibleMode visibleMode, bool
 
     mVisible = visibleMode;
 
-    if( mForegroundRenderer && mForegroundRenderer.GetTextures().GetImage( 0u ) )
+    if( mForegroundRenderer && mForegroundRenderer.GetTextures().GetTexture( 0u ) )
     {
       if( CheckVisibleState() && mVisible == Dali::Window::AUTO )
       {

diff --git a/adaptors/emscripten/wrappers/dali-wrapper.cpp b/adaptors/emscripten/wrappers/dali-wrapper.cpp
index 5facace..48f0327 100644 (file)
--- a/adaptors/emscripten/wrappers/dali-wrapper.cpp
+++ b/adaptors/emscripten/wrappers/dali-wrapper.cpp
@@ -18,9 +18,9 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
-
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/devel-api/events/hit-test-algorithm.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/geometry.h>
 #include <dali/devel-api/rendering/shader.h>
 #include <dali/devel-api/rendering/sampler.h>
@@ -354,7 +354,7 @@ Dali::Actor CreateSolidColorActor( const Dali::Vector4& color, bool border, cons
   Dali::Geometry geometry = Dali::Geometry::QUAD();
   Dali::Renderer renderer = Dali::Renderer::New( geometry, shader );
   Dali::TextureSet textureSet = Dali::TextureSet::New();
-  textureSet.SetImage( 0u, imageData );
+  TextureSetImage( textureSet, 0u, imageData );
   renderer.SetTextures( textureSet );
 
   image.AddRenderer( renderer );
@@ -1098,9 +1098,9 @@ EMSCRIPTEN_BINDINGS(dali_wrapper)
 
   class_<Dali::TextureSet>("TextureSet")
     .constructor<>(&Dali::TextureSet::New)
-    .function("setImage", &Dali::TextureSet::SetImage)
+    .function("setTexture", &Dali::TextureSet::SetTexture)
     .function("setSampler", &Dali::TextureSet::SetSampler)
-    .function("getImage", &Dali::TextureSet::GetImage)
+    .function("getTexture", &Dali::TextureSet::GetTexture)
     .function("getSampler", &Dali::TextureSet::GetSampler)
     .function("getTextureCount", &Dali::TextureSet::GetTextureCount)
 ;

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp
index 978dc74..d94e548 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -14,8 +14,13 @@
  * limitations under the License.
  *
  */
+
+// CLASS HEADER
 #include "mesh-builder.h"
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/images/texture-set-image.h>
+
 namespace Dali
 {
 
@@ -28,10 +33,11 @@ TextureSet CreateTextureSet()
 {
   return TextureSet::New();
 }
+
 TextureSet CreateTextureSet( Image image )
 {
   TextureSet textureSet = TextureSet::New();
-  textureSet.SetImage( 0u, image );
+  TextureSetImage( textureSet, 0u, image );
   return textureSet;
 }
 

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp
index 9be97bc..083e582 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.cpp
@@ -15,14 +15,17 @@
  *
  */
 
-// HEADER
+// CLASS HEADER
 #include "test-actor-utils.h"
-#include "mesh-builder.h"
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/renderer.h>
 
+// INTERNAL INCLUDES
+#include "mesh-builder.h"
+
 namespace Dali
 {
 
@@ -81,7 +84,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con
   if( texture )
   {
     TextureSet textureSet = TextureSet::New();
-    textureSet.SetImage( 0u, texture );
+    TextureSetImage( textureSet, 0u, texture );
     renderer.SetTextures( textureSet );
 
     // Set actor to the size of the texture if set
@@ -102,7 +105,7 @@ Image GetTexture( Actor actor )
       TextureSet textureSet = renderer.GetTextures();
       if( textureSet && textureSet.GetTextureCount() )
       {
-        image = textureSet.GetImage( 0u );
+        image = TextureGetImage( textureSet, 0u );
       }
     }
   }