[dali_1.1.39] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / devel-api / rendering / renderer.cpp

diff --git a/dali/devel-api/rendering/renderer.cpp b/dali/devel-api/rendering/renderer.cpp
index a3080e9..b2078a2 100644 (file)
--- a/dali/devel-api/rendering/renderer.cpp
+++ b/dali/devel-api/rendering/renderer.cpp
@@ -24,11 +24,11 @@
 namespace Dali
 {
 
-Renderer Renderer::New( Geometry& geometry, Material& material )
+Renderer Renderer::New( Geometry& geometry, Shader& shader )
 {
   Internal::RendererPtr renderer = Internal::Renderer::New(  );
   renderer->SetGeometry( GetImplementation(geometry) );
-  renderer->SetMaterial( GetImplementation(material) );
+  renderer->SetShader( GetImplementation(shader) );
   return Renderer( renderer.Get() );
 }
 
@@ -68,26 +68,28 @@ Geometry Renderer::GetGeometry() const
   return Dali::Geometry( geometryPtr );
 }
 
-void Renderer::SetMaterial( Material& material )
+void Renderer::SetTextures( TextureSet& textureSet )
 {
-  DALI_ASSERT_ALWAYS( material && "Material handle not initialized" );
-  GetImplementation(*this).SetMaterial( GetImplementation(material) );
+  DALI_ASSERT_ALWAYS( textureSet && "TextureSet handle not initialized" );
+  GetImplementation(*this).SetTextures( GetImplementation(textureSet) );
 }
 
-Material Renderer::GetMaterial() const
+TextureSet Renderer::GetTextures() const
 {
-  Internal::Material* materialPtr( GetImplementation(*this).GetMaterial() );
-  return Dali::Material( materialPtr );
+  Internal::TextureSet* textureSet( GetImplementation(*this).GetTextures() );
+  return Dali::TextureSet( textureSet );
 }
 
-void Renderer::SetDepthIndex( int depthIndex )
+void Renderer::SetShader( Shader& shader )
 {
-  GetImplementation(*this).SetDepthIndex( depthIndex );
+  DALI_ASSERT_ALWAYS( shader && "Shader handle not initialized" );
+  GetImplementation(*this).SetShader( GetImplementation(shader) );
 }
 
-int Renderer::GetDepthIndex()
+Shader Renderer::GetShader() const
 {
-  return GetImplementation(*this).GetDepthIndex();
+  Internal::Shader* shaderPtr( GetImplementation(*this).GetShader() );
+  return Dali::Shader( shaderPtr );
 }
 
 Renderer::Renderer( Internal::Renderer* pointer )