From 0de4495ae0ad22b60ce3d1257e30628ea518f377 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Mon, 12 Sep 2016 20:47:54 +0900 Subject: [PATCH] Remove/Move experimental features Change-Id: If7a3d70969b139a7e4024324a832f5aa9f09f88c Signed-off-by: Adeel Kazmi --- .../src/dali-toolkit/utc-Dali-GaussianBlurView.cpp | 3 +- .../src/dali-toolkit/utc-Dali-ImageView.cpp | 8 +- .../src/dali-toolkit/utc-Dali-VisualFactory.cpp | 7 +- build/tizen/dali-toolkit/Makefile.am | 4 +- dali-toolkit/dali-toolkit.h | 2 - dali-toolkit/devel-api/builder/builder.h | 3 +- .../devel-api/controls/bloom-view/bloom-view.h | 6 +- .../gaussian-blur-view/gaussian-blur-view.cpp | 4 +- .../gaussian-blur-view/gaussian-blur-view.h | 0 dali-toolkit/devel-api/file.list | 6 +- .../devel-api/shader-effects/bendy-effect.h | 4 +- .../devel-api/shader-effects/blind-effect.h | 4 +- .../devel-api/shader-effects/bouncing-effect.h | 4 +- .../devel-api/shader-effects/carousel-effect.h | 4 +- .../devel-api/shader-effects/displacement-effect.h | 4 +- .../shader-effects/dissolve-local-effect.h | 4 +- .../devel-api/shader-effects/iris-effect.h | 4 +- .../devel-api/shader-effects/mask-effect.h | 4 +- .../devel-api/shader-effects/mirror-effect.h | 4 +- .../devel-api/shader-effects/overlay-effect.h | 4 +- .../devel-api/shader-effects/quadratic-bezier.h | 4 +- .../devel-api/shader-effects/ripple-effect.h | 4 +- .../devel-api/shader-effects/ripple2d-effect.h | 4 +- .../devel-api/shader-effects/shear-effect.h | 4 +- .../devel-api/shader-effects/soft-button-effect.h | 4 +- .../devel-api/shader-effects/spot-effect.h | 4 +- .../shader-effects/square-dissolve-effect.h | 4 +- .../devel-api/shader-effects/swirl-effect.h | 4 +- .../controls/bloom-view/bloom-view-impl.cpp | 10 +- .../internal/controls/bloom-view/bloom-view-impl.h | 4 +- .../controls/bubble-effect/bubble-emitter-impl.cpp | 2 +- .../controls/buttons/check-box-button-impl.cpp | 3 +- .../controls/buttons/check-box-button-impl.h | 5 +- .../controls/effects-view/effects-view-impl.cpp | 4 +- .../controls/effects-view/effects-view-impl.h | 3 +- .../gaussian-blur-view/gaussian-blur-view-impl.cpp | 1 - .../gaussian-blur-view/gaussian-blur-view-impl.h | 4 +- .../controls/shadow-view/shadow-view-impl.h | 1 - .../super-blur-view/super-blur-view-impl.cpp | 2 +- .../super-blur-view/super-blur-view-impl.h | 4 +- .../text-controls/text-selection-popup-impl.cpp | 4 +- .../internal/filters/blur-two-pass-filter.cpp | 4 +- dali-toolkit/internal/filters/emboss-filter.cpp | 4 +- dali-toolkit/internal/filters/spread-filter.cpp | 2 +- dali-toolkit/internal/text/text-scroller.cpp | 2 +- .../internal/visuals/image/batch-image-visual.cpp | 1 - .../internal/visuals/npatch/npatch-visual.h | 2 +- .../default-controls/solid-color-actor.cpp | 136 --------------------- .../controls/default-controls/solid-color-actor.h | 50 -------- dali-toolkit/public-api/file.list | 8 -- .../src/constants/constants-wrapper.cpp | 2 - .../src/image/frame-buffer-image-api.cpp | 12 +- 52 files changed, 91 insertions(+), 294 deletions(-) rename dali-toolkit/{public-api => devel-api}/controls/gaussian-blur-view/gaussian-blur-view.cpp (96%) rename dali-toolkit/{public-api => devel-api}/controls/gaussian-blur-view/gaussian-blur-view.h (100%) delete mode 100644 dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp delete mode 100644 dali-toolkit/public-api/controls/default-controls/solid-color-actor.h diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index f3f6f77..d0f90ce 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 1a9a704..424e79d 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -351,10 +351,10 @@ int UtcDaliImageViewSetGetProperty03(void) int destFactorRgb = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); int srcFactorAlpha = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); int destFactorAlpha = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendingFactor::ONE ); - DALI_TEST_CHECK( destFactorRgb == BlendingFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendingFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendingFactor::ONE ); + DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE ); + DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); + DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); + DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE ); value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); DALI_TEST_CHECK( value.Get( enable ) ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index b3c6795..40e37c9 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -372,7 +373,7 @@ int UtcDaliVisualFactoryGetBorderVisual1(void) DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::ON, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::ON, TEST_LOCATION ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -425,7 +426,7 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) application.Render(0); int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::AUTO, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::AUTO, TEST_LOCATION ); Vector4 actualColor(Vector4::ZERO); DALI_TEST_CHECK( gl.GetUniformValue( "borderColor", actualColor ) ); @@ -449,7 +450,7 @@ int UtcDaliVisualFactoryGetBorderVisual2(void) application.SendNotification(); application.Render(0); blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLEND_MODE ); - DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::ON, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendMode::ON, TEST_LOCATION ); END_TEST; } diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 18944e5..4f98271 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -101,6 +101,7 @@ develapicontrolsdir = $(develapidir)/controls develapibloomviewdir = $(develapicontrolsdir)/bloom-view develapibubbleemitterdir = $(develapicontrolsdir)/bubble-effect develapieffectsviewdir = $(develapicontrolsdir)/effects-view +develapigaussianblurviewdir = $(develapicontrolsdir)/gaussian-blur-view develapimagnifierdir = $(develapicontrolsdir)/magnifier develapipopupdir = $(develapicontrolsdir)/popup develapiprogressbardir = $(develapicontrolsdir)/progress-bar @@ -123,6 +124,7 @@ develapibubbleemitter_HEADERS = $(devel_api_bubble_emitter_header_files) develapibuilder_HEADERS = $(devel_api_builder_header_files) develapieffectsview_HEADERS = $(devel_api_effects_view_header_files) develapifocusmanager_HEADERS = $(devel_api_focus_manager_header_files) +develapigaussianblurview_HEADERS = $(devel_api_gaussian_blur_view_header_files) develapiimageatlas_HEADERS = $(devel_api_image_atlas_header_files) develapimagnifier_HEADERS = $(devel_api_magnifier_header_files) develapipopup_HEADERS = $(devel_api_popup_header_files) @@ -144,7 +146,6 @@ publicapialignmentdir = $(publicapicontrolsdir)/alignment publicapibuttonsdir = $(publicapicontrolsdir)/buttons publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls publicapiflexcontainerdir = $(publicapicontrolsdir)/flex-container -publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view publicapiimageviewdir = $(publicapicontrolsdir)/image-view publicapivideoviewdir = $(publicapicontrolsdir)/video-view publicapimodel3dviewdir = $(publicapicontrolsdir)/model3d-view @@ -169,7 +170,6 @@ publicapialignment_HEADERS = $(public_api_alignment_header_files) publicapibuttons_HEADERS = $(public_api_buttons_header_files) publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files) publicapiflexcontainer_HEADERS = $(public_api_flex_container_header_files) -publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files) publicapiimageview_HEADERS = $(public_api_image_view_header_files) publicapivideoview_HEADERS = $(public_api_video_view_header_files) publicapiitemview_HEADERS = $(public_api_item_view_header_files) diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h index 2c5fe2a..0ac408b 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -27,9 +27,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/dali-toolkit/devel-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h index 0526510..530a81a 100644 --- a/dali-toolkit/devel-api/builder/builder.h +++ b/dali-toolkit/devel-api/builder/builder.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_UIBUILDER_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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,7 +24,6 @@ #include #include #include -#include namespace Dali { diff --git a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h index 50ae2a8..23cc950 100644 --- a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h +++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_BLOOM_VIEW_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -18,9 +18,11 @@ * */ +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include -#include namespace Dali { diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp similarity index 96% rename from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp rename to dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp index c1e1c97..2001939 100644 --- a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp +++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h similarity index 100% rename from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h rename to dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index e4abc92..674b9c7 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -24,7 +24,8 @@ devel_api_src_files = \ $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \ $(devel_api_src_dir)/visual-factory/visual-factory.cpp \ - $(devel_api_src_dir)/visual-factory/visual-base.cpp + $(devel_api_src_dir)/visual-factory/visual-base.cpp \ + $(devel_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp # Add devel header files here @@ -113,3 +114,6 @@ devel_api_transition_effects_header_files = \ $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.h \ $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.h \ $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.h + +devel_api_gaussian_blur_view_header_files = \ + $(devel_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h diff --git a/dali-toolkit/devel-api/shader-effects/bendy-effect.h b/dali-toolkit/devel-api/shader-effects/bendy-effect.h index 6708394..78f4e69 100644 --- a/dali-toolkit/devel-api/shader-effects/bendy-effect.h +++ b/dali-toolkit/devel-api/shader-effects/bendy-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_BENDY_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/blind-effect.h b/dali-toolkit/devel-api/shader-effects/blind-effect.h index 8b68860..21e7cd8 100644 --- a/dali-toolkit/devel-api/shader-effects/blind-effect.h +++ b/dali-toolkit/devel-api/shader-effects/blind-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_BLIND_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/bouncing-effect.h b/dali-toolkit/devel-api/shader-effects/bouncing-effect.h index fc9d718..d3d3bb0 100644 --- a/dali-toolkit/devel-api/shader-effects/bouncing-effect.h +++ b/dali-toolkit/devel-api/shader-effects/bouncing-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_BOUNCING_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/carousel-effect.h b/dali-toolkit/devel-api/shader-effects/carousel-effect.h index e7de082..393e1e4 100644 --- a/dali-toolkit/devel-api/shader-effects/carousel-effect.h +++ b/dali-toolkit/devel-api/shader-effects/carousel-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CAROUSEL_EFFECT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/displacement-effect.h b/dali-toolkit/devel-api/shader-effects/displacement-effect.h index f50a177..69e7920 100644 --- a/dali-toolkit/devel-api/shader-effects/displacement-effect.h +++ b/dali-toolkit/devel-api/shader-effects/displacement-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_DISPLACEMENT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h index 31dcebd..de4c109 100644 --- a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h +++ b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_LOCAL_DISSOLVE_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/devel-api/shader-effects/iris-effect.h b/dali-toolkit/devel-api/shader-effects/iris-effect.h index 6c7f6cd..b0af465 100644 --- a/dali-toolkit/devel-api/shader-effects/iris-effect.h +++ b/dali-toolkit/devel-api/shader-effects/iris-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_IRIS_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/mask-effect.h b/dali-toolkit/devel-api/shader-effects/mask-effect.h index 8da0c99..dd11e2f 100644 --- a/dali-toolkit/devel-api/shader-effects/mask-effect.h +++ b/dali-toolkit/devel-api/shader-effects/mask-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_MASK_EFFECT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/mirror-effect.h b/dali-toolkit/devel-api/shader-effects/mirror-effect.h index a4f8dad..7240743 100644 --- a/dali-toolkit/devel-api/shader-effects/mirror-effect.h +++ b/dali-toolkit/devel-api/shader-effects/mirror-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_MIRROR_EFFECT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/overlay-effect.h b/dali-toolkit/devel-api/shader-effects/overlay-effect.h index f013b25..9c22102 100644 --- a/dali-toolkit/devel-api/shader-effects/overlay-effect.h +++ b/dali-toolkit/devel-api/shader-effects/overlay-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_OVERLAY_EFFECT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h index 3848916..45667ac 100644 --- a/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h +++ b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_QUADRATIC_BEZIER_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/ripple-effect.h b/dali-toolkit/devel-api/shader-effects/ripple-effect.h index 767de60..1b99839 100644 --- a/dali-toolkit/devel-api/shader-effects/ripple-effect.h +++ b/dali-toolkit/devel-api/shader-effects/ripple-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_RIPPLE_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/ripple2d-effect.h b/dali-toolkit/devel-api/shader-effects/ripple2d-effect.h index cbef85b..e0a5bfa 100644 --- a/dali-toolkit/devel-api/shader-effects/ripple2d-effect.h +++ b/dali-toolkit/devel-api/shader-effects/ripple2d-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_RIPPLE2D_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/shear-effect.h b/dali-toolkit/devel-api/shader-effects/shear-effect.h index 880784f..bb0900b 100644 --- a/dali-toolkit/devel-api/shader-effects/shear-effect.h +++ b/dali-toolkit/devel-api/shader-effects/shear-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHEAR_EFFECT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/soft-button-effect.h b/dali-toolkit/devel-api/shader-effects/soft-button-effect.h index f02963e..03eb313 100644 --- a/dali-toolkit/devel-api/shader-effects/soft-button-effect.h +++ b/dali-toolkit/devel-api/shader-effects/soft-button-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SOFT_BUTTON_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/spot-effect.h b/dali-toolkit/devel-api/shader-effects/spot-effect.h index 054942e..48cf305 100644 --- a/dali-toolkit/devel-api/shader-effects/spot-effect.h +++ b/dali-toolkit/devel-api/shader-effects/spot-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SPOT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h b/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h index 6d93f86..2e07ea4 100644 --- a/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h +++ b/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SQUARE_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/devel-api/shader-effects/swirl-effect.h b/dali-toolkit/devel-api/shader-effects/swirl-effect.h index 020b320..c8c61bb 100644 --- a/dali-toolkit/devel-api/shader-effects/swirl-effect.h +++ b/dali-toolkit/devel-api/shader-effects/swirl-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_SWIRL_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { 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 d6e218e..dfe2c56 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -32,7 +32,7 @@ #include // INTERNAL INCLUDES -#include +#include #include #include #include @@ -363,10 +363,10 @@ 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 ); - FrameBufferImage mBlurExtractTarget = 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 ); + mBloomExtractTarget = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat ); + FrameBufferImage mBlurExtractTarget = FrameBufferImage::New( mDownsampledWidth, mDownsampledHeight, mPixelFormat ); + mOutputRenderTarget = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat ); ////////////////////////////////////////////////////// diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h index 3b44b51..7048bc8 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -26,7 +26,7 @@ // INTERNAL INCLUDES #include -#include +#include #include #include 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 2904ece..9e95a76 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -136,7 +136,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 ); // Generate the geometry, which is used by all bubbleActors mMeshGeometry = CreateGeometry( mNumBubblePerActor*mDensity ); diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index 6607c5c..5bf5344 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -26,6 +26,7 @@ #include #include #include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h index 7e9d314..ec0ac2c 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,11 +20,10 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include -#include #include "button-impl.h" 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 ed94ff8..c302e28 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -435,11 +435,11 @@ void EffectsView::AllocateResources() Actor self( Self() ); - mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); + mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat ); InitializeVisual( self, mVisualForChildren, mImageForChildren ); mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 ); - mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); + mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat ); TextureSet textureSet = TextureSet::New(); TextureSetImage( textureSet, 0u, mImagePostFilter ); self.GetRendererAt( 0 ).SetTextures( textureSet ); diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h index 5c49da3..8bf498e 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -26,7 +26,6 @@ // INTERNAL INCLUDES #include #include -#include #include namespace Dali 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 56fd9e5..7d6f4d1 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 @@ -30,7 +30,6 @@ #include // INTERNAL INCLUDES -#include #include // TODO: diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h index b4b9baf..1b3bf38 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -25,7 +25,7 @@ // INTERNAL INCLUDES #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h index 442bf22..ff0156a 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h @@ -24,7 +24,6 @@ #include #include #include -#include #include // INTERNAL INCLUDES 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 c88636f..decefaf 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 @@ -280,7 +280,7 @@ void SuperBlurView::OnSizeSet( const Vector3& targetSize ) { float exponent = static_cast(i); mBlurredImage[i-1] = 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 ); InitializeVisual( self, mVisuals[i], mBlurredImage[i - 1] ); mVisuals[ i ].SetDepthIndex( i ); SetShaderEffect( mVisuals[ i ] ); diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h index 5ab5a49..4380a6e 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index f3670fd..bf07f06 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index ee86bb3..d345893 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -132,14 +132,14 @@ void BlurTwoPassFilter::Enable() mActorForInput.SetSize( mTargetSize ); // 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 ); // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = Toolkit::ImageView::New( mImageForHorz ); mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); mActorForHorz.SetSize( mTargetSize ); // 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 ); // create an actor to blend the blurred image and the input image with the given blur strength mActorForBlending.SetImage( mBlurredImage ); mActorForBlending.SetParentOrigin( ParentOrigin::CENTER ); diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index 4bb7c30..b274558 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -90,8 +90,8 @@ EmbossFilter::~EmbossFilter() void EmbossFilter::Enable() { - 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 ); + mImageForEmboss2 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat ); Property::Map customShader; customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE; diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp index 6ea9221..e4f6224 100644 --- a/dali-toolkit/internal/filters/spread-filter.cpp +++ b/dali-toolkit/internal/filters/spread-filter.cpp @@ -91,7 +91,7 @@ void SpreadFilter::Enable() mActorForInput.RegisterProperty( TEX_SCALE_UNIFORM_NAME, Vector2( 1.0f / mTargetSize.width, 0.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 ); // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = Toolkit::ImageView::New( mImageForHorz ); mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index b3c56de..d2f9348 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -268,7 +268,7 @@ void TextScroller::SetParameters( Actor sourceActor, const Size& controlSize, co DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters controlSize[%f,%f] offscreenSize[%f,%f] direction[%d] alignmentOffset[%f]\n", controlSize.x, controlSize.y, offScreenSize.x, offScreenSize.y, direction, alignmentOffset ); - FrameBufferImage offscreenRenderTargetForText = FrameBufferImage::New( offScreenSize.width, offScreenSize.height, Pixel::RGBA8888, Dali::Image::UNUSED ); + FrameBufferImage offscreenRenderTargetForText = FrameBufferImage::New( offScreenSize.width, offScreenSize.height, Pixel::RGBA8888 ); Renderer renderer; CreateCameraActor( offScreenSize, mOffscreenCameraActor ); diff --git a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp index 1ce668b..10418b7 100644 --- a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include // INTERNAL HEADER diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index a993303..e6c4872 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -24,7 +24,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include #include #include diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp deleted file mode 100644 index 84b37a6..0000000 --- a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2015 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace Toolkit -{ - -namespace -{ -const unsigned int MAX_BORDER_SIZE( 9 ); -} - -ImageActor CreateSolidColorActor( const Vector4& color, bool border, const Vector4& borderColor, const unsigned int borderSize ) -{ - ImageActor image; - if( borderSize > MAX_BORDER_SIZE ) - { - return image; - } - - const unsigned int bitmapWidth = borderSize * 2 + 2; - bool needAlphaChannel = (color.a < 1.0f) || ( border && borderColor.a < 1.0f ); - BufferImage imageData; - if( needAlphaChannel ) - { - imageData = BufferImage::New( bitmapWidth, bitmapWidth, Pixel::RGBA8888 ); - } - else - { - imageData = BufferImage::New( bitmapWidth, bitmapWidth, Pixel::RGB888 ); - } - - // Create the image - PixelBuffer* pixbuf = imageData.GetBuffer(); - if( !pixbuf ) - { - return image; - } - - Vector4 outerColor = color; - if ( border ) - { - outerColor = borderColor; - } - - // Using a (2 + border) x (2 + border) image gives a better blend with the GL implementation - // than a (1 + border) x (1 + border) image - const unsigned int bitmapSize = bitmapWidth * bitmapWidth; - const unsigned int topLeft = bitmapWidth * borderSize + borderSize; - const unsigned int topRight = topLeft + 1; - const unsigned int bottomLeft = bitmapWidth * (borderSize + 1) + borderSize; - const unsigned int bottomRight = bottomLeft + 1; - - if( needAlphaChannel ) - { - for( size_t i = 0; i < bitmapSize; ++i ) - { - if( i == topLeft || - i == topRight || - i == bottomLeft || - i == bottomRight ) - { - pixbuf[i*4+0] = 0xFF * color.r; - pixbuf[i*4+1] = 0xFF * color.g; - pixbuf[i*4+2] = 0xFF * color.b; - pixbuf[i*4+3] = 0xFF * color.a; - } - else - { - pixbuf[i*4+0] = 0xFF * outerColor.r; - pixbuf[i*4+1] = 0xFF * outerColor.g; - pixbuf[i*4+2] = 0xFF * outerColor.b; - pixbuf[i*4+3] = 0xFF * outerColor.a; - } - } - } - else - { - for( size_t i = 0; i < bitmapSize; ++i ) - { - if( i == topLeft || - i == topRight || - i == bottomLeft || - i == bottomRight ) - { - pixbuf[i*3+0] = 0xFF * color.r; - pixbuf[i*3+1] = 0xFF * color.g; - pixbuf[i*3+2] = 0xFF * color.b; - } - else - { - pixbuf[i*3+0] = 0xFF * outerColor.r; - pixbuf[i*3+1] = 0xFF * outerColor.g; - pixbuf[i*3+2] = 0xFF * outerColor.b; - } - } - } - - imageData.Update(); - image = ImageActor::New( imageData ); - image.SetParentOrigin( ParentOrigin::CENTER ); - - if( border ) - { - image.SetStyle( ImageActor::STYLE_NINE_PATCH ); - image.SetNinePatchBorder( Vector4::ONE * (float)borderSize * 2.0f ); - } - - return image; -} - -} // namespace Toolkit - -} // namespace Dali diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h deleted file mode 100644 index f433553..0000000 --- a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef __DALI_TOOLKIT_SOLID_COLOR_ACTOR_H__ -#define __DALI_TOOLKIT_SOLID_COLOR_ACTOR_H__ - -/* - * Copyright (c) 2015 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include -#include - - -namespace Dali -{ - -namespace Toolkit -{ -/** - * @brief Creates a Dali::ImageActor with a solid color, optionally it creates a border. - * - * If the \e border parameter is set to \e true, the Dali::ImageActor's style is set to Dali::ImageActor::STYLE_NINE_PATCH. - * - * @SINCE_1_0.0 - * @remarks This is an experimental feature and might not be supported in the next release. We do recommend not to use it. - * @param[in] color The ImageActor's color. - * @param[in] border If \e true, a border is created. By default, the value is set to \e false. - * @param[in] borderColor The color for the ImageActor's border. By default, the value is set to Color::WHITE. - * @param[in] borderSize The size for the ImageActor's border. By default, the value is set to 1 pixel. It supports under 10 pixel for clear result of gl blend - * @return a handle to the new ImageActor - * @see Control - */ -DALI_IMPORT_API ImageActor CreateSolidColorActor( const Vector4& color, bool border = false, const Vector4& borderColor = Color::WHITE, const unsigned int borderSize = 1 ); -} // namespace Toolkit - -} // namespace Dali - -#endif // __DALI_TOOLKIT_SOLID_COLOR_ACTOR_H__ diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index 7eb3cfc..7e7268f 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -8,7 +8,6 @@ public_api_src_files = \ $(public_api_src_dir)/controls/buttons/check-box-button.cpp \ $(public_api_src_dir)/controls/buttons/push-button.cpp \ $(public_api_src_dir)/controls/buttons/radio-button.cpp \ - $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \ $(public_api_src_dir)/controls/flex-container/flex-container.cpp \ $(public_api_src_dir)/controls/image-view/image-view.cpp \ $(public_api_src_dir)/controls/model3d-view/model3d-view.cpp \ @@ -29,7 +28,6 @@ public_api_src_files = \ $(public_api_src_dir)/controls/text-controls/text-editor.cpp \ $(public_api_src_dir)/controls/text-controls/text-label.cpp \ $(public_api_src_dir)/controls/text-controls/text-field.cpp \ - $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \ $(public_api_src_dir)/styling/style-manager.cpp \ $(public_api_src_dir)/accessibility-manager/accessibility-manager.cpp \ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \ @@ -57,18 +55,12 @@ public_api_buttons_header_files = \ $(public_api_src_dir)/controls/buttons/push-button.h \ $(public_api_src_dir)/controls/buttons/radio-button.h -public_api_default_controls_header_files = \ - $(public_api_src_dir)/controls/default-controls/solid-color-actor.h - public_api_model3d_view_header_files = \ $(public_api_src_dir)/controls/model3d-view/model3d-view.h public_api_flex_container_header_files = \ $(public_api_src_dir)/controls/flex-container/flex-container.h -public_api_gaussian_blur_view_header_files = \ - $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h - public_api_image_view_header_files = \ $(public_api_src_dir)/controls/image-view/image-view.h diff --git a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp index 5ea93df..ea4e120 100644 --- a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp +++ b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/plugins/dali-script-v8/src/image/frame-buffer-image-api.cpp b/plugins/dali-script-v8/src/image/frame-buffer-image-api.cpp index 252bf0d..49e59f3 100644 --- a/plugins/dali-script-v8/src/image/frame-buffer-image-api.cpp +++ b/plugins/dali-script-v8/src/image/frame-buffer-image-api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -53,7 +53,6 @@ namespace FrameBufferImageApi * @param {Integer} options.height image height * @param {Object } [options.nativeImage] ** currently not supported ** * @param {Integer} [options.pixelFormat] pixel format ( see dali constants, e.g. dali.PIXEL_FORMAT_RGB8888) - * @param {Integer} [options.releasePolicy] optionally release memory when image is not visible on screen. * @return {Object} Image */ Image New( const v8::FunctionCallbackInfo< v8::Value >& args ) @@ -99,14 +98,7 @@ Image New( const v8::FunctionCallbackInfo< v8::Value >& args ) return FrameBufferImage(); } - Image::ReleasePolicy releasePolicy = Dali::Image::NEVER; - v8::Local releasePolicyValue = obj->Get( v8::String::NewFromUtf8( isolate, "releasePolicy" ) ); - if( releasePolicyValue->IsUint32() ) - { - releasePolicy = static_cast( releasePolicyValue->ToUint32()->Value() ); - } - - return FrameBufferImage::New( width, height, pixelFormat, releasePolicy ); + return FrameBufferImage::New( width, height, pixelFormat ); } } // FrameBufferImageApi -- 2.7.4