From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 28 Oct 2016 13:21:11 +0000 (-0700)
Subject: Merge "Fix PageFactory to take in Texture rather than Image" into devel/master
X-Git-Tag: dali_1.2.13~13
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8c0b17fb124c735b31c441873da4d7ffc4b15eb5;hp=-c

Merge "Fix PageFactory to take in Texture rather than Image" into devel/master
---

8c0b17fb124c735b31c441873da4d7ffc4b15eb5
diff --combined dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 112fa05,8c2cc41..3eb9ab0
--- 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
@@@ -22,14 -22,12 +22,12 @@@
  #include <cstring> // for strcmp
  #include <dali/public-api/animation/animation.h>
  #include <dali/public-api/animation/constraint.h>
- #include <dali/public-api/images/resource-image.h>
  #include <dali/public-api/object/type-registry.h>
  #include <dali/public-api/object/type-registry-helper.h>
- #include <dali/devel-api/images/texture-set-image.h>
  #include <dali/integration-api/debug.h>
  
  // INTERNAL INCLUDES
 -#include <dali-toolkit/public-api/visuals/visual-properties.h>
 +#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
  #include <dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h>
  #include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
  #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
@@@ -39,9 -37,6 +37,6 @@@ using namespace Dali
  
  namespace //Unnamed namespace
  {
- // broken image is loaded if there is no valid image provided for the page
- const char * const BROKEN_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
- 
  // 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
  
@@@ -282,14 -277,13 +277,13 @@@ PageTurnView::Page::Page(
    propertyTurnDirection = actor.RegisterProperty(PROPERTY_TURN_DIRECTION, -1.f);
  }
  
- void PageTurnView::Page::SetImage( Image image  )
+ void PageTurnView::Page::SetTexture( Texture texture )
  {
    if( !textureSet )
    {
      textureSet = TextureSet::New();
    }
- 
-   TextureSetImage( textureSet, 0u, image );
+   textureSet.SetTexture( 0u, texture );
  }
  
  void PageTurnView::Page::UseEffect(Shader newShader)
@@@ -398,7 -392,7 +392,7 @@@ void PageTurnView::OnInitialize(
      Self().Add( mPages[i].actor );
    }
  
-   // create the layer for turning images
+   // create the layer for turning pages
    mTurningPageLayer = Layer::New();
    mTurningPageLayer.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
    mTurningPageLayer.SetBehavior(Layer::LAYER_3D);
@@@ -425,7 -419,7 +419,7 @@@
  Shader PageTurnView::CreateShader( const Property::Map& shaderMap )
  {
    Shader shader;
 -  Property::Value* shaderValue = shaderMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER );
 +  Property::Value* shaderValue = shaderMap.Find( Toolkit::VisualProperty::SHADER, CUSTOM_SHADER );
    Property::Map shaderSource;
    if( shaderValue && shaderValue->Get( shaderSource ) )
    {
@@@ -584,13 -578,9 +578,9 @@@ void PageTurnView::AddPage( int pageInd
    {
      int index = pageIndex % NUMBER_OF_CACHED_PAGES;
  
-     Image newPageImage;
-     newPageImage = mPageFactory->NewPage( pageIndex );
- 
-     if( !newPageImage ) // load the broken image
-     {
-       newPageImage = ResourceImage::New( BROKEN_IMAGE_URL );
-     }
+     Texture newPage;
+     newPage = mPageFactory->NewPage( pageIndex );
+     DALI_ASSERT_ALWAYS( newPage && "must pass in valid texture" );
  
      bool isLeftSide = ( pageIndex < mCurrentPageIndex );
      if( mPages[index].isTurnBack != isLeftSide )
@@@ -602,11 -592,11 +592,11 @@@
      mPages[index].actor.SetOrientation( Degree( degree ), Vector3::YAXIS );
      mPages[index].actor.SetVisible( false );
      mPages[index].UseEffect( mSpineEffectShader, mGeometry );
-     mPages[index].SetImage( newPageImage );
+     mPages[index].SetTexture( newPage );
  
      // For Portrait, nothing to do
      // For Landscape, set the parent origin to CENTER
-      OnAddPage( mPages[index].actor, isLeftSide );
+     OnAddPage( mPages[index].actor, isLeftSide );
    }
  }