Merge "use modern construct '= default' for special functions." into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / render / data-providers / render-data-provider.cpp

diff --git a/dali/internal/render/data-providers/render-data-provider.cpp b/dali/internal/render/data-providers/render-data-provider.cpp
index 96d1d0c..eb75345 100644 (file)
--- a/dali/internal/render/data-providers/render-data-provider.cpp
+++ b/dali/internal/render/data-providers/render-data-provider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -24,15 +24,14 @@ namespace Internal
 namespace SceneGraph
 {
 
-RenderDataProvider::RenderDataProvider()
-: mUniformMapDataProvider( NULL ),
-  mShader( NULL )
+RenderDataProvider::RenderDataProvider( AnimatableProperty< float >& opacity )
+: mUniformMapDataProvider( nullptr ),
+  mShader( nullptr ),
+  mOpacity( opacity )
 {
 }
 
-RenderDataProvider::~RenderDataProvider()
-{
-}
+RenderDataProvider::~RenderDataProvider() = default;
 
 void RenderDataProvider::SetUniformMap(const UniformMapDataProvider& uniformMapDataProvider)
 {
@@ -59,9 +58,14 @@ RenderDataProvider::Samplers& RenderDataProvider::GetSamplers()
   return mSamplers;
 }
 
-std::vector<Render::NewTexture*>& RenderDataProvider::GetNewTextures()
+std::vector<Render::Texture*>& RenderDataProvider::GetTextures()
+{
+  return mTextures;
+}
+
+float RenderDataProvider::GetOpacity( BufferIndex bufferIndex )
 {
-  return mNewTextures;
+  return mOpacity[bufferIndex];
 }
 
 } // SceneGraph