projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index
19e8421
..
2fea479
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@
-47,9
+47,6
@@
const char * const CUSTOM_SHADER( "shader" );
const char * const CUSTOM_VERTEX_SHADER( "vertexShader" );
const char * const CUSTOM_FRAGMENT_SHADER( "fragmentShader" );
const char * const CUSTOM_VERTEX_SHADER( "vertexShader" );
const char * const CUSTOM_FRAGMENT_SHADER( "fragmentShader" );
-// name of the texture in material
-const char * const TEXTURE_NAME( "sTexture" );
-
// properties set on shader, these properties have the constant value in regardless of the page status
const char * const PROPERTY_SPINE_SHADOW ( "uSpineShadowParameter" ); // uniform for both spine and turn effect
// properties set on shader, these properties have the constant value in regardless of the page status
const char * const PROPERTY_SPINE_SHADOW ( "uSpineShadowParameter" ); // uniform for both spine and turn effect
@@
-292,35
+289,37
@@
PageTurnView::Page::Page()
void PageTurnView::Page::SetImage( Image image )
{
void PageTurnView::Page::SetImage( Image image )
{
- if( material.GetNumberOfTextures() > 0 )
- {
- material.SetTextureImage( 0u, image );
- }
- else
+ if( !textureSet )
{
{
-
material.AddTexture(image, TEXTURE_NAME
);
+
textureSet = TextureSet::New(
);
}
}
+
+ textureSet.SetImage( 0u, image );
}
}
-void PageTurnView::Page::UseEffect(Shader
s
hader)
+void PageTurnView::Page::UseEffect(Shader
newS
hader)
{
{
- if( material )
- {
- material.SetShader( shader );
- }
- else
+ shader = newShader;
+ if( renderer )
{
{
-
material = Material::New
( shader );
+
renderer.SetShader
( shader );
}
}
}
}
-void PageTurnView::Page::UseEffect(Shader
s
hader, Geometry geometry)
+void PageTurnView::Page::UseEffect(Shader
newS
hader, Geometry geometry)
{
{
- UseEffect(
s
hader );
+ UseEffect(
newS
hader );
if( !renderer )
{
if( !renderer )
{
- renderer = Renderer::New( geometry, material );
+ renderer = Renderer::New( geometry, shader );
+
+ if( !textureSet )
+ {
+ textureSet = TextureSet::New();
+ }
+
+ renderer.SetTextures( textureSet );
actor.AddRenderer( renderer );
}
}
actor.AddRenderer( renderer );
}
}