Merge "Clean up the code to build successfully on macOS" 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 16555cc..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,26 +24,14 @@ namespace Internal
 namespace SceneGraph
 {
 
-RenderDataProvider::RenderDataProvider()
-: mMaterialDataProvider( NULL ),
-  mUniformMapDataProvider( NULL ),
-  mShader( NULL )
+RenderDataProvider::RenderDataProvider( AnimatableProperty< float >& opacity )
+: mUniformMapDataProvider( nullptr ),
+  mShader( nullptr ),
+  mOpacity( opacity )
 {
 }
 
-RenderDataProvider::~RenderDataProvider()
-{
-}
-
-void RenderDataProvider::SetMaterial( const MaterialDataProvider& materialDataProvider )
-{
-  mMaterialDataProvider = &materialDataProvider;
-}
-
-const MaterialDataProvider& RenderDataProvider::GetMaterial() const
-{
-  return *mMaterialDataProvider;
-}
+RenderDataProvider::~RenderDataProvider() = default;
 
 void RenderDataProvider::SetUniformMap(const UniformMapDataProvider& uniformMapDataProvider)
 {
@@ -65,14 +53,19 @@ Shader& RenderDataProvider::GetShader() const
   return *mShader;
 }
 
-void RenderDataProvider::SetSamplers( const RenderDataProvider::Samplers& samplers )
+RenderDataProvider::Samplers& RenderDataProvider::GetSamplers()
 {
-  mSamplers = samplers;
+  return mSamplers;
 }
 
-const RenderDataProvider::Samplers& RenderDataProvider::GetSamplers() const
+std::vector<Render::Texture*>& RenderDataProvider::GetTextures()
 {
-  return mSamplers;
+  return mTextures;
+}
+
+float RenderDataProvider::GetOpacity( BufferIndex bufferIndex )
+{
+  return mOpacity[bufferIndex];
 }
 
 } // SceneGraph