use modern construct '= default' for special functions.

[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 6d3a8a3..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,16 +24,14 @@ namespace Internal
 namespace SceneGraph
 {
 
-RenderDataProvider::RenderDataProvider()
-: mUniformMapDataProvider( NULL ),
-  mShader( NULL )
-{
-}
-
-RenderDataProvider::~RenderDataProvider()
+RenderDataProvider::RenderDataProvider( AnimatableProperty< float >& opacity )
+: mUniformMapDataProvider( nullptr ),
+  mShader( nullptr ),
+  mOpacity( opacity )
 {
 }
 
+RenderDataProvider::~RenderDataProvider() = default;
 
 void RenderDataProvider::SetUniformMap(const UniformMapDataProvider& uniformMapDataProvider)
 {
@@ -55,19 +53,19 @@ Shader& RenderDataProvider::GetShader() const
   return *mShader;
 }
 
-RenderDataProvider::Textures& RenderDataProvider::GetTextures()
+RenderDataProvider::Samplers& RenderDataProvider::GetSamplers()
 {
-  return mTextures;
+  return mSamplers;
 }
 
-RenderDataProvider::Samplers& RenderDataProvider::GetSamplers()
+std::vector<Render::Texture*>& RenderDataProvider::GetTextures()
 {
-  return mSamplers;
+  return mTextures;
 }
 
-std::vector<Render::NewTexture*>& RenderDataProvider::GetNewTextures()
+float RenderDataProvider::GetOpacity( BufferIndex bufferIndex )
 {
-  return mNewTextures;
+  return mOpacity[bufferIndex];
 }
 
 } // SceneGraph