Add GetImage method to Sampler.

Change-Id: I8be72f20287b1d62e7e539ea64aeb76a69e77f96

diff --git a/dali/internal/event/effects/sampler-impl.cpp b/dali/internal/event/effects/sampler-impl.cpp
index 0a39c30..f4e60d9 100644 (file)
--- a/dali/internal/event/effects/sampler-impl.cpp
+++ b/dali/internal/event/effects/sampler-impl.cpp
@@ -76,6 +76,11 @@ void Sampler::SetImage( ImagePtr& image )
   }
 }
 
+ImagePtr Sampler::GetImage() const
+{
+  return mImageConnector.Get();
+}
+
 void Sampler::SetFilterMode( Dali::Sampler::FilterMode minFilter, Dali::Sampler::FilterMode magFilter )
 {
   if( NULL != mSceneObject )

diff --git a/dali/internal/event/effects/sampler-impl.h b/dali/internal/event/effects/sampler-impl.h
index 034bbf5..3002a97 100644 (file)
--- a/dali/internal/event/effects/sampler-impl.h
+++ b/dali/internal/event/effects/sampler-impl.h
@@ -64,6 +64,11 @@ public:
   void SetImage( ImagePtr& image );
 
   /**
+   * @copydoc Dali::Sampler::GetImage()
+   */
+  ImagePtr GetImage() const;
+
+  /**
    * @copydoc Dali::Sampler::SetFilterMode()
    */
   void SetFilterMode( Dali::Sampler::FilterMode minFilter, Dali::Sampler::FilterMode magFilter );

diff --git a/dali/public-api/shader-effects/sampler.cpp b/dali/public-api/shader-effects/sampler.cpp
index 07bdec5..82b694f 100644 (file)
--- a/dali/public-api/shader-effects/sampler.cpp
+++ b/dali/public-api/shader-effects/sampler.cpp
@@ -67,6 +67,12 @@ void Sampler::SetImage( Image& image )
   GetImplementation(*this).SetImage( imagePtr );
 }
 
+Image Sampler::GetImage() const
+{
+  Internal::ImagePtr imagePtr( GetImplementation(*this).GetImage() );
+  return Dali::Image( imagePtr.Get() );
+}
+
 void Sampler::SetFilterMode( FilterMode minFilter, FilterMode magFilter )
 {
   GetImplementation(*this).SetFilterMode( minFilter, magFilter );

diff --git a/dali/public-api/shader-effects/sampler.h b/dali/public-api/shader-effects/sampler.h
index d5879d3..b5d53d7 100644 (file)
--- a/dali/public-api/shader-effects/sampler.h
+++ b/dali/public-api/shader-effects/sampler.h
@@ -136,6 +136,14 @@ public:
   void SetImage( Image& image );
 
   /**
+   * @brief Retrieve the image used by this sampler
+   *
+   * If no image is assigned, an empty handle is returned
+   * @return The image.
+   */
+  Image GetImage() const;
+
+  /**
    * @brief Set the filter modes for this sampler
    *
    * Calling this function sets the properties MINIFICATION_FILTER