From: Xiangyin Ma Date: Fri, 13 Feb 2015 16:16:24 +0000 (+0000) Subject: Update toolkit with ResourceImage/Image split X-Git-Tag: dali_1.0.31~12 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f441aaa6d92cdb2d2a11d026aae1e98b3f6d7c76;ds=sidebyside Update toolkit with ResourceImage/Image split Change-Id: Ia56f0e6f012264807bb575c5dff08b1d87b6cc8b --- diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp index 500b653..8636839 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp @@ -675,7 +675,7 @@ int UtcDaliPushButtonProperties(void) // Button::PROPERTY_NORMAL_STATE_ACTOR { - button.SetButtonImage( Image::New( "IMAGE_PATH_1") ); + button.SetButtonImage( ResourceImage::New( "IMAGE_PATH_1") ); DALI_TEST_EQUALS( "IMAGE_PATH_1", button.GetProperty( Button::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; @@ -687,7 +687,7 @@ int UtcDaliPushButtonProperties(void) // Button::PROPERTY_SELECTED_STATE_ACTOR { - button.SetSelectedImage( Image::New( "IMAGE_PATH_2") ); + button.SetSelectedImage( ResourceImage::New( "IMAGE_PATH_2") ); DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( Button::PROPERTY_SELECTED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; @@ -700,7 +700,7 @@ int UtcDaliPushButtonProperties(void) // Button::PROPERTY_DISABLED_STATE_ACTOR { - button.SetDisabledImage( Image::New( "IMAGE_PATH_3") ); + button.SetDisabledImage( ResourceImage::New( "IMAGE_PATH_3") ); DALI_TEST_EQUALS( "IMAGE_PATH_3", button.GetProperty( Button::PROPERTY_DISABLED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION ); Property::Map map; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index 95136ce..cdce7d1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -380,7 +380,7 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); - Image image = Image::New("TestImage"); + Image image = ResourceImage::New("TestImage"); control.SetBackground( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::WHITE, TEST_LOCATION ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp index 671e19d..9811d1e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp @@ -326,9 +326,8 @@ int UtcDaliCubeTransitionEffectSetCurrentImage(void) //check the size of the off screen rendered image Wait( application, OFFSCREEN_RENDER_DURATION ); - ImageAttributes attributes( tile.GetImage().GetAttributes() ); - DALI_TEST_EQUALS( static_cast(attributes.GetWidth()), VIEW_AREA_SIZE.x, TEST_LOCATION ); - DALI_TEST_EQUALS( static_cast(attributes.GetHeight()), VIEW_AREA_SIZE.y, TEST_LOCATION ); + DALI_TEST_EQUALS( tile.GetImage().GetWidth(), VIEW_AREA_SIZE.x, TEST_LOCATION ); + DALI_TEST_EQUALS( tile.GetImage().GetHeight(), VIEW_AREA_SIZE.y, TEST_LOCATION ); END_TEST; } @@ -358,9 +357,8 @@ int UtcDaliCubeTransitionEffectSetTargetImage(void) //check the size of the off screen rendered image Wait( application, OFFSCREEN_RENDER_DURATION ); - ImageAttributes attributes( tile.GetImage().GetAttributes() ); - DALI_TEST_EQUALS( static_cast(attributes.GetWidth()), VIEW_AREA_SIZE.x, TEST_LOCATION ); - DALI_TEST_EQUALS( static_cast(attributes.GetHeight()), VIEW_AREA_SIZE.y, TEST_LOCATION ); + DALI_TEST_EQUALS( tile.GetImage().GetWidth(), VIEW_AREA_SIZE.x, TEST_LOCATION ); + DALI_TEST_EQUALS( tile.GetImage().GetHeight(), VIEW_AREA_SIZE.y, TEST_LOCATION ); END_TEST; } @@ -370,7 +368,7 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void) tet_infoline(" UtcDaliCubeTransitionWaveEffectStartTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - ImageActor imageActor = CreateSolidColorImageActor(application, Color::BLUE,30,30); + ImageActor imageActor = ImageActor::New(ResourceImage::New("Image.jpg")); CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS, VIEW_AREA_SIZE ); waveEffect.SetTransitionDuration( TRANSITION_DURATION ); @@ -421,7 +419,7 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) tet_infoline(" UtcDaliCubeTransitionCrossEffectStartTransition "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - ImageActor imageActor = CreateSolidColorImageActor(application, Color::BLUE,30,30); + ImageActor imageActor = ImageActor::New(ResourceImage::New("Image.jpg")); CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS, VIEW_AREA_SIZE ); crossEffect.SetTransitionDuration( TRANSITION_DURATION ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp index 32aa471..522a6fe 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp @@ -106,7 +106,7 @@ int UtcDaliDisplacementEffectTestSetProperty(void) Toolkit::DisplacementEffect effect = Toolkit::DisplacementEffect::New(Toolkit::DisplacementEffect::DISPLACED); DALI_TEST_CHECK( effect ); - ImageActor actor = ImageActor::New( Image::New(TEST_IMAGE_FILE_NAME) ); + ImageActor actor = ImageActor::New( ResourceImage::New(TEST_IMAGE_FILE_NAME) ); actor.SetSize( 100.0f, 100.0f ); actor.SetShaderEffect( effect ); Stage::GetCurrent().Add( actor ); @@ -114,7 +114,7 @@ int UtcDaliDisplacementEffectTestSetProperty(void) Toolkit::DisplacementEffect effect2 = Toolkit::DisplacementEffect::New(Toolkit::DisplacementEffect::FIXED); DALI_TEST_CHECK( effect ); - ImageActor actor2 = ImageActor::New( Image::New(TEST_IMAGE_FILE_NAME) ); + ImageActor actor2 = ImageActor::New( ResourceImage::New(TEST_IMAGE_FILE_NAME) ); actor2.SetSize( 100.0f, 100.0f ); actor2.SetShaderEffect( effect2 ); Stage::GetCurrent().Add( actor2 ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index d4b6e4a..2028c6c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -195,7 +195,7 @@ int UtcDaliGaussianBlurViewSetGetRenderTarget(void) view.Activate(); FrameBufferImage renderTarget = FrameBufferImage::New( 480.0f, 800.0f, Pixel::RGB888 ); - view.SetUserImageAndOutputRenderTarget(Image::New(TEST_IMAGE_FILE_NAME), renderTarget); + view.SetUserImageAndOutputRenderTarget(ResourceImage::New(TEST_IMAGE_FILE_NAME), renderTarget); DALI_TEST_CHECK( view.GetBlurredRenderTarget() == renderTarget ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp index b81aa6d..6f45276 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp @@ -66,7 +66,7 @@ public: // From ItemFactory virtual Actor NewItem(unsigned int itemId) { // Create an image actor for this item - Image image = Image::New( TEST_IMAGE_FILE_NAME ); + Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME ); Actor actor = ImageActor::New(image); return actor; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp index a565f6e..c66a650 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp @@ -83,7 +83,7 @@ public: // From ItemFactory virtual Actor NewItem(unsigned int itemId) { // Create an image actor for this item - Image image = Image::New( TEST_IMAGE_FILE_NAME ); + Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME ); Actor actor = ImageActor::New(image); return actor; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index 4b314c0..443de6f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp @@ -507,7 +507,7 @@ int UtcDaliPageTurnViewSignals(void) // [0]: testing PageTurnStartedSignal; [1]: testing PageTurnFinishedSignal // [2]: testing PagePanStartedSignal; [3]: testing PagePanFinishedSignal - bool signalVerified[4]; + bool signalVerified[4] = {false, false, false, false}; PageTurnView currentView; unsigned int pageIndex; bool isTurningForwards; diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index 097097f..1d514dc 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -357,9 +357,9 @@ void BloomView::AllocateResources() // Create render targets // create off screen buffer of new size to render our child actors to - mRenderTargetForRenderingChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused ); - mBloomExtractTarget = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::Unused ); - mOutputRenderTarget = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused ); + mRenderTargetForRenderingChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); + mBloomExtractTarget = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::UNUSED ); + mOutputRenderTarget = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED); ////////////////////////////////////////////////////// diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index 1faf68c..d9b868f 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -22,6 +22,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -89,7 +90,7 @@ void BubbleEmitter::OnInitialize() mBubbleRoot.SetSize(mMovementArea); // Prepare the frame buffer to store the color adjusted background image - mEffectImage = FrameBufferImage::New( mMovementArea.width/4.f, mMovementArea.height/4.f, Pixel::RGBA8888, Dali::Image::Unused ); + mEffectImage = FrameBufferImage::New( mMovementArea.width/4.f, mMovementArea.height/4.f, Pixel::RGBA8888, Dali::Image::UNUSED ); // Generate the material object, which is used by all meshActors GenMaterial(); @@ -107,7 +108,7 @@ void BubbleEmitter::OnInitialize() mMeshActor[i] = MeshActor::New( mMesh[i] ); mMeshActor[i].SetAffectedByLighting( false ); mMeshActor[i].SetParentOrigin(ParentOrigin::TOP_LEFT); - mEffect[i] = BubbleEffect::New( mNumBubblePerShader, mShapeImage.GetFilename() ); + mEffect[i] = BubbleEffect::New( mNumBubblePerShader ); mEffect[i].SetEffectImage( mEffectImage ); mEffect[i].SetMovementArea( mMovementArea ); mMeshActor[i].SetShaderEffect( mEffect[i] ); @@ -120,7 +121,7 @@ void BubbleEmitter::OnInitialize() mMeshActorForNoise = MeshActor::New( Mesh::New(meshDataForNoise) ); mMeshActorForNoise.SetAffectedByLighting( false ); mMeshActorForNoise.SetParentOrigin(ParentOrigin::TOP_LEFT); - mEffectForNoise = BubbleEffect::New( mNumBubblePerShader, mShapeImage.GetFilename() ); + mEffectForNoise = BubbleEffect::New( mNumBubblePerShader ); mEffectForNoise.SetMovementArea( mMovementArea ); mEffectForNoise.SetEffectImage( mEffectImage ); mMeshActorForNoise.SetShaderEffect( mEffectForNoise ); @@ -169,15 +170,6 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta ) void BubbleEmitter::SetShapeImage( Image shapeImage ) { mCustomMaterial.SetDiffuseTexture( shapeImage ); - - //Get pixel width of the shape - float width = Image::GetImageSize(shapeImage.GetFilename()).width; - - for(unsigned int i=0; i < mNumShader; i++ ) - { - mEffect[i].SetShapeImageWidth(width); - } - mEffectForNoise.SetShapeImageWidth(width); } void BubbleEmitter::SetBubbleScale( float scale ) diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp index 08d10bf..4ef25d9 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp @@ -21,6 +21,7 @@ // EXTERNAL INCLUDES #include +#include using namespace Dali; using namespace Dali::Toolkit::Internal; @@ -58,8 +59,8 @@ Dali::Toolkit::RadioButton RadioButton::New() RadioButton::RadioButton() { - mUnselectedImage = Dali::Image::New( UNSELECTED_BUTTON_IMAGE_DIR ); - mSelectedImage = Dali::Image::New( SELECTED_BUTTON_IMAGE_DIR ); + mUnselectedImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR ); + mSelectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR ); mRadioIcon = Dali::ImageActor::New( mUnselectedImage ); diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index f928e1c..d140750 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -438,10 +438,10 @@ void EffectsView::AllocateResources() SetupCameras(); - mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused ); + mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); mActorForChildren.SetImage(mImageForChildren); - mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused ); + mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); mActorPostFilter.SetImage(mImagePostFilter); SetupFilters(); diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 2b993e9..430148a 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -427,13 +427,13 @@ void GaussianBlurView::AllocateResources() mRenderFullSizeCamera.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale); // create offscreen buffer of new size to render our child actors to - mRenderTargetForRenderingChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused ); + mRenderTargetForRenderingChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); // Set ImageActor for performing a horizontal blur on the texture mImageActorHorizBlur.SetImage( mRenderTargetForRenderingChildren ); // Create offscreen buffer for vert blur pass - mRenderTarget1 = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::Unused ); + mRenderTarget1 = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::UNUSED ); // use the completed blur in the first buffer and composite with the original child actors render mImageActorComposite.SetImage( mRenderTarget1 ); @@ -443,7 +443,7 @@ void GaussianBlurView::AllocateResources() } // Create offscreen buffer for horiz blur pass - mRenderTarget2 = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::Unused ); + mRenderTarget2 = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat, Dali::Image::UNUSED ); // size needs to match render target mImageActorHorizBlur.SetSize(mDownsampledWidth, mDownsampledHeight); diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 2bfd96a..8df457f 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -22,6 +22,7 @@ #include #include #include +#include using namespace Dali; @@ -279,7 +280,7 @@ void Magnifier::SetFrameVisibility(bool visible) { Actor self(Self()); - Image image = Image::New( DEFAULT_FRAME_IMAGE_PATH ); + Image image = ResourceImage::New( DEFAULT_FRAME_IMAGE_PATH ); mFrame = ImageActor::New( image ); mFrame.SetDrawMode(DrawMode::OVERLAY); mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH ); 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 c844d88..392f733 100644 --- 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 @@ -376,7 +376,7 @@ void PageTurnView::SetupRenderTasks() Self().Add( mPageSourceActor[i] ); mPageSourceActor[i].SetSensitive( false ); - mRenderedPage[i] = FrameBufferImage::New( mControlSize.width, mControlSize.height, Pixel::RGB8888, Image::Unused ); + mRenderedPage[i] = FrameBufferImage::New( mControlSize.width, mControlSize.height, Pixel::RGB8888, Image::UNUSED ); mOffscreenTask[i] = taskList.CreateTask(); mOffscreenTask[i].SetRefreshRate( RenderTask::REFRESH_ONCE ); mOffscreenTask[i].SetCameraActor(mCameraActor); diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 83ea7eb..fe28ec4 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -27,6 +27,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -340,7 +341,7 @@ void Popup::ShowTail(const Vector3& position) if(image != "") { - Image tail = Image::New( image ); + Image tail = ResourceImage::New( image ); mTailImage = ImageActor::New(tail); const Vector3 anchorPoint = AnchorPoint::FRONT_BOTTOM_RIGHT - position; @@ -369,12 +370,12 @@ PopupStylePtr Popup::GetStyle() const void Popup::SetDefaultBackgroundImage() { - Image bg = Image::New( mPopupStyle->backgroundImage ); + Image bg = ResourceImage::New( mPopupStyle->backgroundImage ); ImageActor bgImage = ImageActor::New( bg ); bgImage.SetStyle( ImageActor::STYLE_NINE_PATCH ); bgImage.SetNinePatchBorder( mPopupStyle->backgroundScale9Border ); - Image buttonBg = Image::New( mPopupStyle->buttonAreaImage ); + Image buttonBg = ResourceImage::New( mPopupStyle->buttonAreaImage ); ImageActor buttonBgImage = ImageActor::New( buttonBg ); buttonBgImage.SetStyle( ImageActor::STYLE_NINE_PATCH ); buttonBgImage.SetNinePatchBorder( mPopupStyle->buttonArea9PatchBorder ); diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 02267f5..a4d6819 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -21,6 +21,7 @@ // EXTERNAL INCLUDES #include #include +#include // INTERNAL INCLUDES #include @@ -148,7 +149,7 @@ void ScrollBar::OnInitialize() { Actor self = Self(); - Image indicatorImage = Image::New( DEFAULT_INDICATOR_IMAGE_PATH ); + Image indicatorImage = ResourceImage::New( DEFAULT_INDICATOR_IMAGE_PATH ); mIndicator = ImageActor::New( indicatorImage ); mIndicator.SetNinePatchBorder( DEFAULT_INDICATOR_NINE_PATCH_BORDER ); mIndicator.SetStyle( ImageActor::STYLE_NINE_PATCH ); diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp index 72dccbe..bc12931 100755 --- a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -367,7 +368,7 @@ ScrollBarInternal::ScrollBarInternal(Toolkit::Scrollable& container, bool vertic mAxisMask(vertical ? Vector3::YAXIS : Vector3::XAXIS), mDragMode(false) { - Image sliderImage = Image::New( BAR_TAB_IMAGE_PATH ); + Image sliderImage = ResourceImage::New( BAR_TAB_IMAGE_PATH ); mSlider = ImageActor::New( sliderImage ); mSlider.SetParentOrigin( ParentOrigin::TOP_LEFT ); diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 76db7ca..a221492 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -24,6 +24,7 @@ // EXTERNAL INCLUDES #include +#include #include @@ -439,7 +440,7 @@ void Slider::SetBackingImageName( const std::string& imageName ) { if( mBacking && imageName != String::EMPTY ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mBacking.SetImage( image ); } } @@ -448,7 +449,7 @@ std::string Slider::GetBackingImageName() { if( mBacking ) { - return mBacking.GetImage().GetFilename(); + return ResourceImage::DownCast( mBacking.GetImage() ).GetUrl(); } return std::string( "" ); @@ -468,7 +469,7 @@ void Slider::SetProgressImageName( const std::string& imageName ) { if( mProgress && imageName != String::EMPTY ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mProgress.SetImage( image ); } } @@ -477,7 +478,7 @@ std::string Slider::GetProgressImageName() { if( mProgress ) { - return mProgress.GetImage().GetFilename(); + return ResourceImage::DownCast( mProgress.GetImage()).GetUrl(); } return std::string( "" ); @@ -497,7 +498,7 @@ void Slider::CreatePopupImage( const std::string& imageName ) { if( mPopup && imageName != String::EMPTY ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mPopup.SetImage( image ); } } @@ -516,7 +517,7 @@ void Slider::CreatePopupArrowImage( const std::string& imageName ) { if( mPopupArrow && imageName != String::EMPTY ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mPopupArrow.SetImage( image ); } } @@ -575,7 +576,7 @@ void Slider::SetHandleImageName( const std::string& imageName ) { if( mHandle && imageName != String::EMPTY ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mHandle.SetImage( image ); } } @@ -584,7 +585,7 @@ std::string Slider::GetHandleImageName() { if( mHandle ) { - return mHandle.GetImage().GetFilename(); + return ResourceImage::DownCast( mHandle.GetImage() ).GetUrl(); } return std::string( "" ); diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 3b2443b..aa27cb5 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -266,7 +266,7 @@ void SuperBlurView::OnControlSizeSet( const Vector3& targetSize ) { float exponent = static_cast(i+1); mBlurredImage[i] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent), - GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::Never ); + GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::NEVER ); } } } diff --git a/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp index 9f83898..77813e8 100644 --- a/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp +++ b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp @@ -24,6 +24,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -493,7 +494,7 @@ ImageActor Decorator::CreateCursor( Image cursorImage, const Vector4& border, co } else { - cursor = ImageActor::New( Image::New( DEFAULT_CURSOR ) ); + cursor = ImageActor::New( ResourceImage::New( DEFAULT_CURSOR ) ); } cursor.SetStyle(ImageActor::STYLE_NINE_PATCH); @@ -506,7 +507,7 @@ ImageActor Decorator::CreateCursor( Image cursorImage, const Vector4& border, co void Decorator::CreateCursors( Actor targetParent ) { - Image mCursorImage = Image::New( DEFAULT_CURSOR ); + Image mCursorImage = ResourceImage::New( DEFAULT_CURSOR ); mCursor = CreateCursor (mCursorImage, DEFAULT_CURSOR_IMAGE_9_BORDER , "mainCursor"); mCursorRTL = CreateCursor ( mCursorImage, DEFAULT_CURSOR_IMAGE_9_BORDER, "rtlCursor"); targetParent.Add( mCursor ); diff --git a/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp index c4d831b..456659a 100644 --- a/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp +++ b/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp @@ -24,6 +24,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -112,8 +113,8 @@ void TextInputHandles::CreateSelectionHandles() { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextInputHandles: CreateSelectionHandles\n" ); - mSelectionHandleOneImage = Image::New( DEFAULT_SELECTION_HANDLE_ONE ); - mSelectionHandleOneImagePressed = Image::New( DEFAULT_SELECTION_HANDLE_ONE_PRESSED ); + mSelectionHandleOneImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_ONE ); + mSelectionHandleOneImagePressed = ResourceImage::New( DEFAULT_SELECTION_HANDLE_ONE_PRESSED ); mSelectionHandleOne = CreateHandle( AnchorPoint::TOP_RIGHT, mSelectionHandleOneImage, "SelectionHandleOne" ); mIsSelectionHandleOneFlipped = false; @@ -123,8 +124,8 @@ void TextInputHandles::CreateSelectionHandles() // mTapDetector.Attach( mHandleOneGrabArea ); - mSelectionHandleTwoImage = Image::New( DEFAULT_SELECTION_HANDLE_TWO ); - mSelectionHandleTwoImagePressed = Image::New( DEFAULT_SELECTION_HANDLE_TWO_PRESSED ); + mSelectionHandleTwoImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_TWO ); + mSelectionHandleTwoImagePressed = ResourceImage::New( DEFAULT_SELECTION_HANDLE_TWO_PRESSED ); mSelectionHandleTwo = CreateHandle( AnchorPoint::TOP_LEFT, mSelectionHandleTwoImage, "SelectionHandleTwo" ); mIsSelectionHandleTwoFlipped = false; @@ -245,7 +246,7 @@ void TextInputHandles::CreateGrabHandle() { if ( !mGrabHandleImage ) { - mGrabHandleImage = Image::New( DEFAULT_GRAB_HANDLE ); + mGrabHandleImage = ResourceImage::New( DEFAULT_GRAB_HANDLE ); } mGrabHandle = CreateHandle( AnchorPoint::TOP_CENTER, mGrabHandleImage, "GrabHandle" ); diff --git a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp index e891f5b..6dd4adf 100644 --- a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp +++ b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp @@ -30,6 +30,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -3021,7 +3022,7 @@ void TextInput::CreateGrabHandle( Dali::Image image ) { if ( !image ) { - mGrabHandleImage = Image::New(DEFAULT_GRAB_HANDLE); + mGrabHandleImage = ResourceImage::New(DEFAULT_GRAB_HANDLE); } else { @@ -3270,8 +3271,8 @@ void TextInput::CreateSelectionHandles( std::size_t start, std::size_t end, Dali if ( !mSelectionHandleOne ) { // create normal and pressed images - mSelectionHandleOneImage = Image::New( DEFAULT_SELECTION_HANDLE_ONE ); - mSelectionHandleOneImagePressed = Image::New( DEFAULT_SELECTION_HANDLE_ONE_PRESSED ); + mSelectionHandleOneImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_ONE ); + mSelectionHandleOneImagePressed = ResourceImage::New( DEFAULT_SELECTION_HANDLE_ONE_PRESSED ); mSelectionHandleOne = ImageActor::New( mSelectionHandleOneImage ); mSelectionHandleOne.SetName("SelectionHandleOne"); @@ -3298,8 +3299,8 @@ void TextInput::CreateSelectionHandles( std::size_t start, std::size_t end, Dali if ( !mSelectionHandleTwo ) { // create normal and pressed images - mSelectionHandleTwoImage = Image::New( DEFAULT_SELECTION_HANDLE_TWO ); - mSelectionHandleTwoImagePressed = Image::New( DEFAULT_SELECTION_HANDLE_TWO_PRESSED ); + mSelectionHandleTwoImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_TWO ); + mSelectionHandleTwoImagePressed = ResourceImage::New( DEFAULT_SELECTION_HANDLE_TWO_PRESSED ); mSelectionHandleTwo = ImageActor::New( mSelectionHandleTwoImage ); mSelectionHandleTwo.SetName("SelectionHandleTwo"); diff --git a/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp index a133275..de6cd6f 100644 --- a/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp @@ -19,6 +19,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -274,14 +275,14 @@ void TextInputPopup::CreateBackground() // Create background-panel if not already created (required if we have at least one option) if ( !mBackground ) { - Image bgImg = Image::New( POPUP_BACKGROUND ); + Image bgImg = ResourceImage::New( POPUP_BACKGROUND ); mBackground = ImageActor::New( bgImg ); mBackground.SetAnchorPoint( AnchorPoint::CENTER ); mBackground.SetParentOrigin( ParentOrigin::CENTER ); mBackground.SetName( "text-input-popup-background" ); mBackground.SetColor( mBackgroundColor ); - Image bgEffectImg = Image::New( POPUP_BACKGROUND_EFFECT ); + Image bgEffectImg = ResourceImage::New( POPUP_BACKGROUND_EFFECT ); mBackgroundEffect = ImageActor::New( bgEffectImg ); mBackgroundEffect.SetAnchorPoint( AnchorPoint::CENTER ); mBackgroundEffect.SetParentOrigin( ParentOrigin::CENTER ); @@ -290,7 +291,7 @@ void TextInputPopup::CreateBackground() mBackgroundEffect.SetZ( 1.0f ); mBackground.Add( mBackgroundEffect ); - Image bgLine = Image::New( POPUP_BACKGROUND_LINE ); + Image bgLine = ResourceImage::New( POPUP_BACKGROUND_LINE ); mBackgroundLine = ImageActor::New( bgLine ); mBackgroundLine.SetAnchorPoint( AnchorPoint::CENTER); mBackgroundLine.SetParentOrigin( ParentOrigin::CENTER ); @@ -308,7 +309,7 @@ void TextInputPopup::CreateTail() { if ( !mTail ) { - Image tail = Image::New( POPUP_TAIL_BOTTOM ); + Image tail = ResourceImage::New( POPUP_TAIL_BOTTOM ); mTail = ImageActor::New( tail ); mTail.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); mTail.SetAnchorPoint( AnchorPoint::TOP_CENTER ); @@ -316,7 +317,7 @@ void TextInputPopup::CreateTail() mTail.SetPosition( 0.0f, POPUP_TAIL_Y_OFFSET - POPUP_BORDER.w, 1.2f ); mTail.SetColor( mBackgroundColor ); - Image tailEffect = Image::New( POPUP_TAIL_BOTTOM_EFFECT ); + Image tailEffect = ResourceImage::New( POPUP_TAIL_BOTTOM_EFFECT ); mTailEffect = ImageActor::New( tailEffect ); mTailEffect.SetParentOrigin( ParentOrigin::CENTER ); mTailEffect.SetAnchorPoint( AnchorPoint::CENTER ); @@ -325,7 +326,7 @@ void TextInputPopup::CreateTail() mTailEffect.SetZ( 0.1f ); mTail.Add( mTailEffect ); - Image tailLine = Image::New( POPUP_TAIL_BOTTOM_LINE ); + Image tailLine = ResourceImage::New( POPUP_TAIL_BOTTOM_LINE ); mTailLine = ImageActor::New( tailLine ); mTailLine.SetParentOrigin( ParentOrigin::CENTER ); mTailLine.SetAnchorPoint( AnchorPoint::CENTER ); @@ -389,37 +390,37 @@ void TextInputPopup::CreateOrderedListOfOptions() { case ButtonsCut: { - Image cutIcon = Image::New( OPTION_ICON_CUT ); + Image cutIcon = ResourceImage::New( OPTION_ICON_CUT ); currentButton = CreateRequiredButton( ButtonsCut, mCutOptionPriority, OPTION_CUT, GET_LOCALE_TEXT("IDS_COM_BODY_CUT"), cutIcon, false ); break; } case ButtonsCopy: { - Image copyIcon = Image::New( OPTION_ICON_COPY ); + Image copyIcon = ResourceImage::New( OPTION_ICON_COPY ); currentButton = CreateRequiredButton( ButtonsCopy, mCopyOptionPriority, OPTION_COPY, GET_LOCALE_TEXT("IDS_COM_BODY_COPY"), copyIcon, false ); break; } case ButtonsPaste: { - Image pasteIcon = Image::New( OPTION_ICON_PASTE ); + Image pasteIcon = ResourceImage::New( OPTION_ICON_PASTE ); currentButton = CreateRequiredButton( ButtonsPaste, mPasteOptionPriority, OPTION_PASTE, GET_LOCALE_TEXT("IDS_COM_BODY_PASTE"), pasteIcon, false ); break; } case ButtonsSelect: { - Image selectIcon = Image::New( OPTION_ICON_SELECT ); + Image selectIcon = ResourceImage::New( OPTION_ICON_SELECT ); currentButton = CreateRequiredButton( ButtonsSelect, mSelectOptionPriority, OPTION_SELECT_WORD, GET_LOCALE_TEXT("IDS_COM_SK_SELECT"), selectIcon, false ); break; } case ButtonsSelectAll: { - Image selectAllIcon = Image::New( OPTION_ICON_SELECT_ALL ); + Image selectAllIcon = ResourceImage::New( OPTION_ICON_SELECT_ALL ); currentButton = CreateRequiredButton( ButtonsSelectAll, mSelectAllOptionPriority, OPTION_SELECT_ALL, GET_LOCALE_TEXT("IDS_COM_BODY_SELECT_ALL"), selectAllIcon, false ); break; } case ButtonsClipboard: { - Image clipboardIcon = Image::New( OPTION_ICON_CLIPBOARD ); + Image clipboardIcon = ResourceImage::New( OPTION_ICON_CLIPBOARD ); currentButton = CreateRequiredButton( ButtonsClipboard, mClipboardOptionPriority, OPTION_CLIPBOARD, GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD"), clipboardIcon, false ); break; } @@ -854,9 +855,9 @@ void TextInputPopup::SetTailPosition( const Vector3& position, bool yAxisFlip ) if ( yAxisFlip ) { - Image tail = Image::New( POPUP_TAIL_TOP ); - Image tailEffect = Image::New( POPUP_TAIL_TOP_EFFECT ); - Image tailLine = Image::New( POPUP_TAIL_TOP_LINE ); + Image tail = ResourceImage::New( POPUP_TAIL_TOP ); + Image tailEffect = ResourceImage::New( POPUP_TAIL_TOP_EFFECT ); + Image tailLine = ResourceImage::New( POPUP_TAIL_TOP_LINE ); mTail.SetImage( tail ); mTailEffect.SetImage( tailEffect ); diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index 5ab09a1..5dd5437 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -146,7 +146,7 @@ void BlurTwoPassFilter::Enable() mActorForInput.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // create internal offscreen for result of horizontal pass - mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); + mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED ); // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = ImageActor::New( mImageForHorz ); @@ -155,7 +155,7 @@ void BlurTwoPassFilter::Enable() mActorForHorz.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // create internal offscreen for result of the two pass blurred image - mBlurredImage = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); + mBlurredImage = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED); // create an actor to blend the blurred image and the input image with the given blur strength mActorForBlending = ImageActor::New( mBlurredImage ); diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index dee4a2e..8f444ac 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -125,8 +125,8 @@ void EmbossFilter::Enable() mCameraActor = CameraActor::New(); mCameraActor.SetParentOrigin(ParentOrigin::CENTER); - mImageForEmboss1 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); - mImageForEmboss2 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); + mImageForEmboss1 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED ); + mImageForEmboss2 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED ); // create actor to render input with applied emboss effect mActorForInput1 = ImageActor::New( mInputImage ); diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp index 3d911b9..3f3eaa6 100644 --- a/dali-toolkit/internal/filters/spread-filter.cpp +++ b/dali-toolkit/internal/filters/spread-filter.cpp @@ -100,7 +100,7 @@ void SpreadFilter::Enable() mActorForInput.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // create internal offscreen for result of horizontal pass - mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); + mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED ); // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = ImageActor::New( mImageForHorz ); diff --git a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp index 986c475..7a46f2e 100644 --- a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp @@ -25,6 +25,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -658,7 +659,7 @@ void FocusManager::SetFocusable(Actor actor, bool focusable) void FocusManager::CreateDefaultFocusIndicatorActor() { // Create a focus indicator actor shared by all the focusable actors - Image borderImage = Image::New(FOCUS_BORDER_IMAGE_PATH); + Image borderImage = ResourceImage::New(FOCUS_BORDER_IMAGE_PATH); ImageActor focusIndicator = ImageActor::New(borderImage); focusIndicator.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 93e5feb..11644e7 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -26,6 +26,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -458,7 +459,7 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor() void KeyboardFocusManager::CreateDefaultFocusIndicatorActor() { // Create a focus indicator actor shared by all the keyboard focusable actors - Image borderImage = Image::New(FOCUS_BORDER_IMAGE_PATH); + Image borderImage = ResourceImage::New(FOCUS_BORDER_IMAGE_PATH); ImageActor focusIndicator = ImageActor::New(borderImage); focusIndicator.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp index 42c121d..91fcfa7 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -179,19 +179,21 @@ void CubeTransitionEffect::SetTargetImage( ImageActor imageActor ) void CubeTransitionEffect::SetImage( ImageActor imageActor ) { mCurrentImage = imageActor; - mIsImageLoading = true; Image image = imageActor.GetImage(); + ResourceImage resourceImage = ResourceImage::DownCast( image ); mBufferIndex = mBufferIndex^1; //must make sure the image is already loaded before using its attributes - if( image.GetLoadingState() == ResourceLoadingSucceeded ) + if( resourceImage && resourceImage.GetLoadingState() != ResourceLoadingSucceeded ) { - OnImageLoaded( image ); + mIsImageLoading = true; + resourceImage.LoadingFinishedSignal().Connect( this, &CubeTransitionEffect::OnImageLoaded ); } else { - image.LoadingFinishedSignal().Connect( this, &CubeTransitionEffect::OnImageLoaded ); + mIsImageLoading = false; + PrepareTiles( image ); } } @@ -299,12 +301,21 @@ void CubeTransitionEffect::StopTransition() } } -void CubeTransitionEffect::OnImageLoaded(Image image) +void CubeTransitionEffect::OnImageLoaded(ResourceImage image) +{ + mIsImageLoading = false; + PrepareTiles( image ); +} + +/** + * Set sub-image to each tile. + * @param[in] image The image content of the imageActor for transition + */ +void CubeTransitionEffect::PrepareTiles( Image image ) { // Fit the image to view area, while keeping the aspect; FitKeepAspectRatio(imageSize, viewAreaSize) - ImageAttributes attributes( image.GetAttributes() ); - float scale = std::min( mViewAreaSize.width / attributes.GetWidth(), mViewAreaSize.height / attributes.GetHeight() ); - Vector2 imageSize(attributes.GetWidth()*scale, attributes.GetHeight()*scale); + float scale = std::min( mViewAreaSize.width / image.GetWidth(), mViewAreaSize.height / image.GetHeight() ); + Vector2 imageSize(image.GetWidth()*scale, image.GetHeight()*scale); mFullImageCreator.SetEffectImage(image); mFullImageCreator.SetRegionSize(mViewAreaSize, imageSize); @@ -325,9 +336,9 @@ void CubeTransitionEffect::OnImageLoaded(Image image) mTiles[mContainerIndex][idx].SetPixelArea( pixelArea ); } } - mIsImageLoading = false; } + void CubeTransitionEffect::OnTransitionFinished(Animation& source) { mRoot.SetVisible(false); diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h index 8e7b983..ec21191 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h @@ -25,6 +25,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -249,7 +250,13 @@ private: * Set image and pixelArea to tiles * @param[in] image The image content of the imageActor for transition */ - void OnImageLoaded(Image image); + void OnImageLoaded(ResourceImage image); + + /** + * Set sub-image to each tile. + * @param[in] image The image content of the imageActor for transition + */ + void PrepareTiles( Image image ); /** * Callback function of transition animation finished diff --git a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp index 5715e49..326d7c9 100644 --- a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp +++ b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp @@ -19,6 +19,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -44,7 +45,7 @@ Alignment CreateAlignedImage( Actor image ) Alignment CreateAlignedImage( const std::string& imagePath ) { - Image image = Image::New( imagePath ); + Image image = ResourceImage::New( imagePath ); return CreateAlignedImage( ImageActor::New( image ) ); } diff --git a/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp index 43bde47..bba811b 100644 --- a/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp +++ b/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -45,7 +46,7 @@ Alignment CreateAlignedImage( Actor image ) Alignment CreateAlignedImage( const std::string& imagePath ) { - Image image = Image::New( imagePath ); + Image image = ResourceImage::New( imagePath ); return CreateAlignedImage( ImageActor::New( image ) ); } diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp b/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp index d335d37..9752e3b 100644 --- a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp +++ b/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp @@ -52,7 +52,7 @@ BubbleEffect::~BubbleEffect() { } -BubbleEffect BubbleEffect::New( unsigned int numberOfBubble, const std::string& shapeImagePath) +BubbleEffect BubbleEffect::New( unsigned int numberOfBubble) { std::ostringstream vertexShaderStringStream; vertexShaderStringStream << "#define NUMBER_OF_BUBBLE "<< numberOfBubble << "\n"; @@ -60,8 +60,6 @@ BubbleEffect BubbleEffect::New( unsigned int numberOfBubble, const std::string& " precision mediump float;\n" // the gravity applied to the y direction " uniform float uGravity; \n" - // Width of the texture in pixels - " uniform float uShapeWidth; \n" // xy: the emit position of the bubble; zw: the destinationof the bubble. // The bubble is moving from (xy) to (zw plus the y drop influenced by gravity). " uniform vec4 uStartAndEndPos[NUMBER_OF_BUBBLE];\n" @@ -118,9 +116,7 @@ BubbleEffect BubbleEffect::New( unsigned int numberOfBubble, const std::string& " gl_Position = uMvpMatrix * position;\n" "\n" // Add multiple bubble shapes in the effect - " mediump float texCoordX = floor( mod(startAndEnd.z, uShapeWidth) );\n " - " mediump float texCoordY = floor( mod(startAndEnd.w, uShapeWidth) );\n " - " vTexCoord = vec2( (texCoordX + aTexCoord.x)/ uShapeWidth,(texCoordY + aTexCoord.y)/ uShapeWidth );\n" + " vTexCoord = aTexCoord;\n" " vPercentage = percentage;\n" // Use the emit position color for the bubble " vEffectTexCoord = startAndEnd.xy * uInvertedMovementArea;\n" @@ -157,10 +153,6 @@ BubbleEffect BubbleEffect::New( unsigned int numberOfBubble, const std::string& handle.SetUniform( "uMagnification", 1.f ); handle.SetUniform( "uDynamicScale", 1.f ); - //Get pixel width of the shape - float width = Image::GetImageSize(shapeImagePath).width; - handle.SetUniform( "uShapeWidth", (width/EACH_WIDTH_PER_SHAPE) ); - Vector4 zeroVector; for( unsigned int i=0; i +#include namespace Dali { @@ -83,7 +84,7 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto GeometryType( GEOMETRY_TYPE_IMAGE ), ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) ); - maskEffect.SetEffectImage( Image::New( maskImage ) ); + maskEffect.SetEffectImage( ResourceImage::New( maskImage ) ); maskEffect.SetUniform( "uImageSize", Vector2(0,0) /*Constrained to actor size*/ ); maskEffect.ApplyConstraint( Constraint::New( maskEffect.GetPropertyIndex("uImageSize"), @@ -101,7 +102,7 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto void Apply( ImageActor actor, const std::string& maskImage ) { - Vector2 maskSize = Image::GetImageSize( maskImage ); + Vector2 maskSize = ResourceImage::GetImageSize( maskImage ); const float leftRight = (maskSize.width - 1.0f) * 0.5f; const float topBottom = (maskSize.height - 1.0f) * 0.5f; @@ -111,7 +112,7 @@ void Apply( ImageActor actor, const std::string& maskImage ) void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder ) { - Vector2 maskSize = Image::GetImageSize( maskImage ); + Vector2 maskSize = ResourceImage::GetImageSize( maskImage ); DoApply( actor, maskImage, maskSize, maskBorder ); }