platform/core/uifw/dali-demo.git
8 years agoMerge branch 'devel/master' into tizen 86/68386/1 accepted/tizen/common/20160509.135208 accepted/tizen/ivi/20160510.002649 accepted/tizen/mobile/20160510.002552 accepted/tizen/tv/20160510.002617 accepted/tizen/wearable/20160510.002523 submit/tizen/20160509.092357
dongsug.song [Wed, 4 May 2016 00:09:16 +0000 (09:09 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ie7b8cfa4cd8adee13b52fd3bb3ad09fa39bdd1fe
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
8 years agoDALi Version 1.1.32 27/67927/1 dali_1.1.32
Agnelo Vaz [Fri, 29 Apr 2016 08:10:56 +0000 (09:10 +0100)]
DALi Version 1.1.32

Change-Id: Icda20718f0353032008902e333192863d5e7d3f5

8 years agoMerge "Updated demos following StyleManager move to the public API" into devel/master
Adeel Kazmi [Thu, 28 Apr 2016 12:42:01 +0000 (05:42 -0700)]
Merge "Updated demos following StyleManager move to the public API" into devel/master

8 years agoStop using ImageActor in Json files 08/66408/4
Xiangyin Ma [Mon, 18 Apr 2016 17:48:57 +0000 (18:48 +0100)]
Stop using ImageActor in Json files

Change-Id: Ia032845f8db6dc457b940500c453930e8b588207

8 years agoline-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the... 93/66593/5
Adam Bialogonski [Tue, 19 Apr 2016 15:10:28 +0000 (16:10 +0100)]
line-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the index buffer, but changes the range of indices to draw and the type of primitives.

added interface to modify number of used elements from the elements array.

Change-Id: If0b223e6ace3d64aae8f16af0a284a42a7c9d967

8 years agoUpdated demos following StyleManager move to the public API 59/67459/3
David Steele [Tue, 26 Apr 2016 14:23:07 +0000 (15:23 +0100)]
Updated demos following StyleManager move to the public API

Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoChanges following "Remove geometry scvene object" 47/66747/6
Ferran Sole [Wed, 20 Apr 2016 15:11:56 +0000 (16:11 +0100)]
Changes following "Remove geometry scvene object"

Change-Id: I8138d652252f76ef24becc0fcfce3cef15321cad

8 years agoupdate following the changes of the ControlRenderer property names 80/66880/2
Xiangyin Ma [Thu, 21 Apr 2016 16:15:23 +0000 (17:15 +0100)]
update following the changes of the ControlRenderer property names

Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a

8 years agoDALi Version 1.1.31 70/66970/1 dali_1.1.31
Adeel Kazmi [Fri, 22 Apr 2016 09:08:06 +0000 (10:08 +0100)]
DALi Version 1.1.31

Change-Id: I8321e948b6f85990f62c98855bfde433045f432e

8 years agoWorking... Add missed tag and fix launch issue 47/66647/2
taeyoon [Wed, 20 Apr 2016 04:20:21 +0000 (13:20 +0900)]
Working... Add missed tag and fix launch issue

  - Fix mismatch between <ui...> and </ui..>
  - Add DALI_EXPORT_API
  TODO> Example launch issue in dali-demo

Change-Id: I3c685d79c725e08d3798eb9e906734effd1a2fd0

8 years agoMerge branch 'devel/master' into tizen 42/66642/1 accepted/tizen/common/20160427.144413 accepted/tizen/ivi/20160428.002736 accepted/tizen/mobile/20160428.004958 accepted/tizen/tv/20160428.002537 accepted/tizen/wearable/20160428.002827 submit/tizen/20160427.082119
Seoyeon Kim [Wed, 20 Apr 2016 05:20:36 +0000 (14:20 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I8ea2d92322c8f9713328930cd3343c00573d21a8

8 years agoRevert "[3.0] add perf-scroll sample" 41/66641/1
Seoyeon Kim [Wed, 20 Apr 2016 05:19:01 +0000 (14:19 +0900)]
Revert "[3.0] add perf-scroll sample"

This reverts commit 683256773411415423a61e85c9abdd3efac0cc5b.

Change-Id: I7d934143d9765882c1817893a840f170f791f92b

8 years agoMerge "add perf-scroll sample" into devel/master
minho.sun [Wed, 20 Apr 2016 01:32:00 +0000 (18:32 -0700)]
Merge "add perf-scroll sample" into devel/master

8 years agoMerge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control...
Kimmo Hoikka [Tue, 19 Apr 2016 16:01:29 +0000 (09:01 -0700)]
Merge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control" into devel/master

8 years agoFix a typo of EffectsView example 39/66539/1
Xiangyin Ma [Tue, 19 Apr 2016 10:30:04 +0000 (11:30 +0100)]
Fix a typo of EffectsView example

Change-Id: I5639464418baffc593106dbb95a78b39e438aaf4

8 years agoadd perf-scroll sample 85/64085/5
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
add perf-scroll sample

add perf-scroll sample for measuring performance on tizen target.

you can use two options.

--use-mesh  :  use "mesh" to make images.( use imageView by default )
-t30        :  set duration.( In this case, duration will be 30 second )

Change-Id: Ib2caca45bed12a62e3e9d6b57fb240aa21579e0c

8 years ago[3.0] add perf-scroll sample 29/66429/1
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
[3.0] add perf-scroll sample

add perf-scroll sample for measuring performance on tizen target.

you can use two options.

--use-mesh  :  use "mesh" to make images.( use imageView by default )
-t30        :  set duration.( In this case, duration will be 30 second )

Change-Id: Iaf6dd8dcc4d2a3481ea15c47115d7b9387319bd0

8 years agoFlexbox Demo to demonstrates a proof of concept for FlexContainer UI control 12/63412/7
Richard Huang [Wed, 23 Mar 2016 15:33:32 +0000 (15:33 +0000)]
Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control

Change-Id: I20f7a13ebc19b54ab91194b9c6b87d787f23501d

8 years agoImprove application launching speed 47/57547/7
minho.sun [Thu, 21 Jan 2016 04:49:48 +0000 (13:49 +0900)]
Improve application launching speed

To improve app launching speed on Tizen (using launchpad), Use -fPIE option instead -fPIC and attach DALI_EXPORT_API in front of each example's main function.

This is the compare result between before and after patch.
(On hawkP 2.4 / using hello-dalidemo that has one pushbutton on stage)

|    before Patch     |     After Patch     |
---------------------------------------------
|   hello-dalidemo    |   hello-dalidemo    |
---------------------------------------------
|   AVG   MIN   MAX   |   AVG   MIN   MAX   |
|  1134  1060  1188   |   291   250   337   |

After patch, launching speed drops to 30% of before.

Change-Id:I51a4f673d016f9278f867167dc2ff9f407ea6e7e

8 years agoRendering API clean-up 50/64950/7
Ferran Sole [Wed, 6 Apr 2016 09:42:52 +0000 (10:42 +0100)]
Rendering API clean-up

Change-Id: I66e818b2ef1744c20af0997375065e029399df84

8 years agoline mesh demo supports LINES, LINE_LOOP and LINE_STRIP modes. added radio button... 27/66027/2
Adam Bialogonski [Thu, 14 Apr 2016 17:26:00 +0000 (18:26 +0100)]
line mesh demo supports LINES, LINE_LOOP and LINE_STRIP modes. added radio button to select. The geometry has been switched to use interleaved format with inclusion color to make line segments more visible.

Change-Id: Ifbf9ab55afa216c388e123a521e7e9a8004b4ede

8 years agoDALi Version 1.1.30 73/66173/1 dali_1.1.30
Adam Bialogonski [Fri, 15 Apr 2016 13:59:44 +0000 (14:59 +0100)]
DALi Version 1.1.30

Change-Id: I4267d398db533e98296a87ba2d68dddfca5c118f

8 years agoAdded NativeImageSource example 19/58119/8
Xiangyin Ma [Thu, 4 Feb 2016 17:30:10 +0000 (17:30 +0000)]
Added NativeImageSource example

Change-Id: Ia827bef2339bac2c9c6390d98ae27f3aeff62bc7

8 years agoAdded EffectsView Demo 55/54755/11
Xiangyin Ma [Thu, 17 Dec 2015 17:12:05 +0000 (17:12 +0000)]
Added EffectsView Demo

Change-Id: I604b3ae944c17d33a5ecaa5296966865e2eecd69

8 years agoMerge "Update PageTurnView Demo" into devel/master
Adeel Kazmi [Tue, 12 Apr 2016 15:13:41 +0000 (08:13 -0700)]
Merge "Update PageTurnView Demo" into devel/master

8 years agoMerge "Added SVG image to background JSON" into devel/master
Kimmo Hoikka [Mon, 11 Apr 2016 17:11:29 +0000 (10:11 -0700)]
Merge "Added SVG image to background JSON" into devel/master

8 years agoRemoved some dead code from line-mesh-example 85/65585/1
Paul Wisbey [Mon, 11 Apr 2016 12:49:15 +0000 (13:49 +0100)]
Removed some dead code from line-mesh-example

Change-Id: I1858ec61c3b6f662320f74289305cea08d831c98

8 years agoAdded SVG image to background JSON 89/65489/1
Adeel Kazmi [Mon, 11 Apr 2016 09:12:48 +0000 (10:12 +0100)]
Added SVG image to background JSON

Change-Id: I1fe304f892aa92108cbb07a46368eb267b97f9e0

8 years agoMerge "Using nicer gradient for background.json script and use border" into devel...
Adeel Kazmi [Fri, 8 Apr 2016 16:26:55 +0000 (09:26 -0700)]
Merge "Using nicer gradient for background.json script and use border" into devel/master

8 years agoUsing nicer gradient for background.json script and use border 55/65355/3
Agnelo Vaz [Thu, 7 Apr 2016 19:34:02 +0000 (20:34 +0100)]
Using nicer gradient for background.json script and use border

5 renderers now shown in background.json script
TextLabel
Border
Color
Gradient
Image

Examples updated to use Border renderer new property names

Change-Id: I967e9f4e1ea12a1402b247a49d14ec2681272af7

8 years agoUpdate PageTurnView Demo 93/52693/10
Richard Huang [Fri, 20 Nov 2015 10:58:23 +0000 (10:58 +0000)]
Update PageTurnView Demo

Change-Id: I2e051bee26d462acf2487f343d39cc6f1d186842

8 years agoDALi Version 1.1.29 23/65323/1 dali_1.1.29
Xiangyin Ma [Fri, 8 Apr 2016 10:24:51 +0000 (11:24 +0100)]
DALi Version 1.1.29

Change-Id: Ifaa5d94fb9b6d20e897c9ecc049a200bbe5bdce2

8 years ago(Builder Example) Ensured builder layer is shown beneath the toolbar 04/65004/2
Adeel Kazmi [Wed, 6 Apr 2016 16:23:24 +0000 (17:23 +0100)]
(Builder Example) Ensured builder layer is shown beneath the toolbar

Previously, it was in the center of the screen so the top was cut off by the toolbar even though
we were adjusting the size.

Change-Id: I3ed43f9b9a0d61ffc6fdc6fa77cb70557424339b

8 years agoCleaned up some & removed redundant JSON scripts, as well as background color propert... 78/64978/7
Adeel Kazmi [Wed, 6 Apr 2016 09:38:54 +0000 (10:38 +0100)]
Cleaned up some & removed redundant JSON scripts, as well as background color property fixes

Change-Id: Ibc0003534afd5e07d806bcf88dd17640d29ddfad

8 years agoReduced number of metaball in explosion demo to 6 from 12 17/61817/2
Agnelo Vaz [Thu, 10 Mar 2016 16:53:01 +0000 (16:53 +0000)]
Reduced number of metaball in explosion demo to 6 from 12

Size of balls increased to compensate for reduced number

Change-Id: If90ff5f335bd296582af937ee6945e06a8221ceb

8 years agoMerge branch 'devel/master (1.1.28)' into tizen 60/64760/4 accepted/tizen/common/20160411.125934 accepted/tizen/ivi/20160411.051319 accepted/tizen/mobile/20160411.051255 accepted/tizen/tv/20160411.051229 accepted/tizen/wearable/20160411.051155 submit/tizen/20160411.012820
suhyung Eom [Tue, 5 Apr 2016 08:05:18 +0000 (17:05 +0900)]
Merge branch 'devel/master (1.1.28)' into tizen

 - version up 1.1.26 to 1.1.28

Change-Id: I8ce918b32e7f2525362c2151580a6dc0e04d751e

8 years agoRevert "[3.0] change absolute dir to TZ_* path" 59/64759/1
suhyung Eom [Tue, 5 Apr 2016 07:59:39 +0000 (16:59 +0900)]
Revert "[3.0] change absolute dir to TZ_* path"

This reverts commit 7997d145b568da754377a7dcd8eb96c0cbb2a8d8.
Change-Id: I651f1df4c2af25a9f1e43e5eb4d5ec12e438deb9

8 years agoRevert "[3.0] Fix wrong path in spec" 58/64758/1
suhyung Eom [Tue, 5 Apr 2016 07:57:50 +0000 (16:57 +0900)]
Revert "[3.0] Fix wrong path in spec"

This reverts commit 62d8230688564add861d39a2d3904e310ad86d50.
Change-Id: Ic373027cd6577389cd2d739a570c9373d5d981a7

8 years agoRevert "[3.0]add perf-scroll sample" 57/64757/1
suhyung Eom [Tue, 5 Apr 2016 07:55:38 +0000 (16:55 +0900)]
Revert "[3.0]add perf-scroll sample"

This reverts commit eac11f6754453be02224b98ad46c619a725cb02d.
Change-Id: Ibd27a1d25acabe76e741aa2f2ae3b0bed4fa881a

8 years agoGradient Renderer example property names updated 44/64544/6
Agnelo Vaz [Fri, 1 Apr 2016 15:04:16 +0000 (16:04 +0100)]
Gradient Renderer example property names updated

GradientRenderer property names changed in dali-toolkit so reflected here

stopOffset nolonger set in code as uses defaults
gradient json script added

Change-Id: I1412be7fe7d7abeaee847a49dfcdacba806d3efd

8 years agoMerge "Use TZ_path on Tizen 3.x" into devel/master
Heeyong Song [Mon, 4 Apr 2016 04:38:48 +0000 (21:38 -0700)]
Merge "Use TZ_path on Tizen 3.x" into devel/master

8 years agoDALi Version 1.1.28 46/64446/1 dali_1.1.28
Victor Cebollada [Fri, 1 Apr 2016 08:24:37 +0000 (09:24 +0100)]
DALi Version 1.1.28

Change-Id: If4285222301f3d8f5edb0fabadbbc252cffd7ea8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoUse TZ_path on Tizen 3.x 93/63893/2
minho.sun [Mon, 28 Mar 2016 09:35:17 +0000 (18:35 +0900)]
Use TZ_path on Tizen 3.x

Use TZ_path on Tizen 3.x .

btzplatform-config has TZ_path variable.

Attach variable table below.

     variable       |     actual path
----------------------------------------
%TZ_SYS_BIN         |    /usr/bin
%TZ_SYS_RUN         |    /var/run
%TZ_SYS_DATA        |    /opt/data
%TZ_SYS_RW_APP      |    /opt/usr/apps
%TZ_SYS_DB          |    /opt/dbspace
%TZ_SYS_SHARE       |    /opt/share
%TZ_SYS_ETC         |    /opt/etc
%TZ_SYS_HOME        |    /home
%TZ_SYS_ROOT        |    /root
%TZ_SYS_RO_APP      |    /usr/apps
%TZ_SYS_RO_ICONS    |    /usr/share/icons
%TZ_SYS_RO_PACKAGES |    /usr/share/pakages
%TZ_SYS_RO_UG       |    /usr/ug

Change-Id: I09ea4314a76a9445e1dd3c91f3fd4bd8c63dc155

8 years ago[3.0]add perf-scroll sample 39/63539/3
dongsug.song [Thu, 24 Mar 2016 11:30:17 +0000 (20:30 +0900)]
[3.0]add perf-scroll sample

add perf-scroll sample for measuring benchmark.

you can use some options.

--use-imageview : use "imageview" to make images.
--use-mesh : use "mesh" to make images.
-t30 : set duration.(In this case, duration will be 30 second)

Change-Id: Iefa0c8e64998b25d1b778edd7a1eef80f8a04aa4

8 years ago[3.0] Fix wrong path in spec 41/63841/1
minho.sun [Mon, 28 Mar 2016 05:28:40 +0000 (14:28 +0900)]
[3.0] Fix wrong path in spec

Change smack_rule_dir
/etc/smack/accesses2.d/%TZ_SYS_RO_PACKAGES to /etc/smack/accesses2.d/

Change-Id: Ie5ec49a7a4bbee2e90d61ce5cd642a63e7f1d692

8 years agoDALi Version 1.1.27 86/63586/1 dali_1.1.27
Tom Robinson [Thu, 24 Mar 2016 15:49:19 +0000 (15:49 +0000)]
DALi Version 1.1.27

Change-Id: I4a66b67ae99249a4edc7851674336a3ba60f2b88

8 years ago[3.0] change absolute dir to TZ_* path 19/63519/1
minho.sun [Thu, 24 Mar 2016 10:17:32 +0000 (19:17 +0900)]
[3.0] change absolute dir to TZ_* path

 Change absolute dir to TZ_* path

     variable       |     actual path
----------------------------------------
%TZ_SYS_BIN         |    /usr/bin
%TZ_SYS_RUN         |    /var/run
%TZ_SYS_DATA        |    /opt/data
%TZ_SYS_RW_APP      |    /opt/usr/apps
%TZ_SYS_DB          |    /opt/dbspace
%TZ_SYS_SHARE       |    /opt/share
%TZ_SYS_ETC         |    /opt/etc
%TZ_SYS_HOME        |    /home
%TZ_SYS_ROOT        |    /root
%TZ_SYS_RO_APP      |    /usr/apps
%TZ_SYS_RO_ICONS    |    /usr/share/icons
%TZ_SYS_RO_PACKAGES |    /usr/share/pakages
%TZ_SYS_RO_UG       |    /usr/ug

Change-Id: Icc0e03ee703f1ef66a04d268b9b77e137cc78959

8 years agoRender SVG with ImageView 49/60149/13
Xiangyin Ma [Tue, 23 Feb 2016 16:58:07 +0000 (16:58 +0000)]
Render SVG with ImageView

Change-Id: I70f0ffcb30d9d353940eed5c22c631be79122d55

8 years agoPropertyBuffer SetData clean-up 28/63028/1
Paul Wisbey [Mon, 21 Mar 2016 17:29:44 +0000 (17:29 +0000)]
PropertyBuffer SetData clean-up

Change-Id: Ia4783fd5c18ccc97e81c239eadf00663d625d962

8 years agoMerge branch 'devel/master' into tizen 14/62914/1 accepted/tizen/common/20160323.184908 accepted/tizen/ivi/20160323.140655 accepted/tizen/mobile/20160323.135050 accepted/tizen/tv/20160323.135500 accepted/tizen/wearable/20160323.135159 submit/tizen/20160323.065919
minho.sun [Mon, 21 Mar 2016 02:51:25 +0000 (11:51 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ifebc446e0b9318cf264a8065fdd044cb4961ab85

8 years agoRevert "[3.0] change manifest xml file to fix permission denied error when launching... 13/62913/1
minho.sun [Mon, 21 Mar 2016 02:50:48 +0000 (11:50 +0900)]
Revert "[3.0] change manifest xml file to fix permission denied error when launching sample app"

This reverts commit db3183e0aaeda82f2bf9e5f3a668dc1cd86d9310.

Change-Id: Ie81d25be4995cb573479ccfd7cc3ec2a19670b25

8 years agoDALi Version 1.1.26 24/62824/1 dali_1.1.26
Richard Huang [Fri, 18 Mar 2016 13:10:13 +0000 (13:10 +0000)]
DALi Version 1.1.26

Change-Id: I9906d8f0c1cf1ce48e5f2aae6260e30bd076acd3

8 years ago[3.0] change manifest xml file to fix permission denied error when launching sample app 98/62398/1
dongsug.song [Tue, 16 Feb 2016 10:08:05 +0000 (19:08 +0900)]
[3.0] change manifest xml file to fix permission denied error when launching sample app

Change-Id: I442d947144a3723063cbb3c6746b6132d878a1e4

8 years agoMerge "Add TiltSensor demo" into devel/master
suhyung Eom [Wed, 16 Mar 2016 02:04:59 +0000 (19:04 -0700)]
Merge "Add TiltSensor demo" into devel/master

8 years agoDALi Version 1.1.25 76/61976/1 dali_1.1.25
Nick Holland [Fri, 11 Mar 2016 15:02:46 +0000 (15:02 +0000)]
DALi Version 1.1.25

Change-Id: I2ed2d9500bd60f3bb521ccba593ba2ca0cb144af

8 years agoChanges following deprecation of position inheritance modes 04/59804/7
Ferran Sole [Thu, 18 Feb 2016 17:26:19 +0000 (17:26 +0000)]
Changes following deprecation of position inheritance modes

Change-Id: Ia04c81329062610182df63da05b58def4c3d927f

8 years agoFixed dali-demo bubbles non-linear movement and stopping 51/61551/2
Tom Robinson [Tue, 8 Mar 2016 18:43:43 +0000 (18:43 +0000)]
Fixed dali-demo bubbles non-linear movement and stopping

Change-Id: I6788eb41a29a81f9a2f3fb1722d9ef5e416075b8

8 years agoAdd TiltSensor demo 94/61494/2
suhyung Eom [Tue, 8 Mar 2016 08:39:09 +0000 (17:39 +0900)]
Add TiltSensor demo

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9e367f4140f18566526ea917da8e571403bd046c

8 years agoDALi Version 1.1.24 22/61322/1 dali_1.1.24
Ferran Sole [Mon, 7 Mar 2016 09:07:57 +0000 (09:07 +0000)]
DALi Version 1.1.24

Change-Id: I968b8cb3ef02054373ff544804bd7c5735c54073

8 years agoDali-demo install script and README for Emscripten examples 91/60691/2
Tom Robinson [Tue, 1 Mar 2016 14:50:47 +0000 (14:50 +0000)]
Dali-demo install script and README for Emscripten examples

Change-Id: I15c5a25925ed9c8fdd60f8b0fa322fbeaf02c94a

8 years agoMerge "Added Javascript docs live demo example" into devel/master
Kimmo Hoikka [Tue, 1 Mar 2016 13:48:30 +0000 (05:48 -0800)]
Merge "Added Javascript docs live demo example" into devel/master

8 years agoMerge "DALi Version 1.1.23" into devel/master
David Steele [Fri, 26 Feb 2016 14:01:45 +0000 (06:01 -0800)]
Merge "DALi Version 1.1.23" into devel/master

8 years agoDALi Version 1.1.23 96/60496/1 dali_1.1.23
David Steele [Fri, 26 Feb 2016 13:45:40 +0000 (13:45 +0000)]
DALi Version 1.1.23

Change-Id: I120c6f2c6c616129f5f68b6afdce13138031f0c1

8 years agochange manifest xml file to fix permission denied error when launching sample app 39/59539/2
dongsug.song [Tue, 16 Feb 2016 10:08:05 +0000 (19:08 +0900)]
change manifest xml file to fix permission denied error when launching sample app

Change-Id: Icdf807f5d57f533712575daad708ab921151e386

8 years agoAdded Javascript docs live demo example 83/60283/2
Lee Morgan [Wed, 24 Feb 2016 14:48:28 +0000 (14:48 +0000)]
Added Javascript docs live demo example

Change-Id: Ifca2f2f905ba81cdf725737907790586a12a5452

8 years agoMerge branch 'devel/master' into tizen 42/60142/2 accepted/tizen/common/20160302.194056 accepted/tizen/ivi/20160302.073538 accepted/tizen/mobile/20160302.073330 accepted/tizen/tv/20160302.073410 accepted/tizen/wearable/20160302.073514 submit/tizen/20160226.050811 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
dongsug.song [Tue, 23 Feb 2016 13:32:22 +0000 (22:32 +0900)]
Merge branch 'devel/master' into tizen

tizen branch 1.1.16 => 1.1.22 version updated

Change-Id: Iee78a83b217dc42fef8193215ef0771023cc2f63

8 years agoBuild: Only copy dali-toy on Desktop build 69/60369/2
Tom Robinson [Thu, 25 Feb 2016 17:03:03 +0000 (17:03 +0000)]
Build: Only copy dali-toy on Desktop build

Change-Id: I85adbc37a0474ae79918e289ddf2a6e39f7d24a6

8 years agoRevert "[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible" 40/60140/1
dongsug.song [Tue, 23 Feb 2016 13:30:16 +0000 (22:30 +0900)]
Revert "[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible"

This reverts commit 19c4c5ee5277f60974a2937e58e2ccb501c68fa7.

Change-Id: I156a1e8e39fe84a647a3bee093cae4475c29fd96

8 years agoDali-Toy Javascript demo 52/59952/2
Tom Robinson [Fri, 19 Feb 2016 17:30:49 +0000 (17:30 +0000)]
Dali-Toy Javascript demo

Change-Id: I6a663c46a6592bbb3aaa24f3a12ff5937664b262

8 years agoMerge "DALi Version 1.1.22" into devel/master
Adeel Kazmi [Fri, 19 Feb 2016 11:16:56 +0000 (03:16 -0800)]
Merge "DALi Version 1.1.22" into devel/master

8 years agoDALi Version 1.1.22 19/59919/1 dali_1.1.22
Agnelo Vaz [Fri, 19 Feb 2016 10:52:36 +0000 (10:52 +0000)]
DALi Version 1.1.22

Change-Id: I47a1123083a73f1a08bf435c38fc94a27776b582

8 years agoUpdates following rendererType changes 95/59795/1
Adeel Kazmi [Thu, 18 Feb 2016 13:12:07 +0000 (13:12 +0000)]
Updates following rendererType changes

Change-Id: I980d7723528705caa2d903c9b36c24c4b744a55e

8 years ago[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible 44/59744/2 accepted/tizen/ivi/20160219.012722 accepted/tizen/mobile/20160218.111046 accepted/tizen/tv/20160218.111108 accepted/tizen/wearable/20160218.111132 submit/tizen/20160218.103925 submit/tizen_common/20160218.142243
Xiangyin Ma [Thu, 11 Feb 2016 16:37:14 +0000 (16:37 +0000)]
[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible

Change-Id: I699f227e72c4b3ce906a17fdb3dc940331c9ec4a

8 years agoEnsure the use of ShaderEffect in ImageActor is backwards-compatible 42/59242/2
Xiangyin Ma [Thu, 11 Feb 2016 16:37:14 +0000 (16:37 +0000)]
Ensure the use of ShaderEffect in ImageActor is backwards-compatible

Change-Id: I699f227e72c4b3ce906a17fdb3dc940331c9ec4a

8 years agoDALi Version 1.1.21 12/59312/1 dali_1.1.21
Adeel Kazmi [Fri, 12 Feb 2016 10:32:37 +0000 (10:32 +0000)]
DALi Version 1.1.21

Change-Id: I1ed026ec74a77180df3725ec0e930d9cdfb3d84c

8 years agoUpdate following the changes of Blending&Culling options 26/58526/3
Xiangyin Ma [Mon, 1 Feb 2016 13:47:34 +0000 (13:47 +0000)]
Update following the changes of Blending&Culling options

Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07

8 years agoDALi Version 1.1.20 48/58948/1 dali_1.1.20
Xiangyin Ma [Fri, 5 Feb 2016 08:53:19 +0000 (08:53 +0000)]
DALi Version 1.1.20

Change-Id: Iff4015eb3bf56293fd0b098559045344eed81777

8 years agoNew more realistic benchmark creating paged list of icons and performs scroll across... 99/57999/7
Adam Bialogonski [Tue, 26 Jan 2016 15:17:47 +0000 (15:17 +0000)]
New more realistic benchmark creating paged list of icons and performs scroll across pages.

- images have been converted, so they don't crash on the device
- when benchmark uses tableview, no manual sizing is enabled
- font size has been calculated using dpi to work with various screens
- added extra-help text describing benchmark options

Change-Id: Ia2ed1b9019b9b436903f470055ac1eac3be7eb68

8 years agoDALi Version 1.1.19 45/58345/1 dali_1.1.19
Tom Robinson [Fri, 29 Jan 2016 11:33:49 +0000 (11:33 +0000)]
DALi Version 1.1.19

Change-Id: I26839a48cea234d318321338518c84be72a5b89f

8 years agoDALi Version 1.1.18 77/57777/1 dali_1.1.18
Richard Huang [Fri, 22 Jan 2016 13:29:10 +0000 (13:29 +0000)]
DALi Version 1.1.18

Change-Id: I27e43b510d86704a2b3b69e4d14a3cc5ea5e0318

8 years agoChanged DALI_*_DIR to DEMO_*_DIR 46/57046/7
David Steele [Thu, 14 Jan 2016 16:12:33 +0000 (16:12 +0000)]
Changed DALI_*_DIR to DEMO_*_DIR

Scripts, examples and demo code should not use defines from other
parts of DALi. DALI_IMAGE_DIR is defined in Dali toolkit to specify
where the toolkit images are. This is used in the default toolkit
style file to specify the locations of the toolkit images.

It must not be overridden by applications.

Updated the demo style file to utilize a configured variable to point
at the installed demo style's images.

Added an example of a demo-specific image (confirmation popup background)

Updated dali-builder to load the demo theme (Scripting example within demo
already loads it)

Change-Id: Ie43a6611a8db3fc0afc6a1cd4d9d6e48afef75e7
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoExample of using pre-multiplied alpha in ImageView 26/56926/6
Xiangyin Ma [Wed, 13 Jan 2016 14:43:58 +0000 (14:43 +0000)]
Example of using pre-multiplied alpha in ImageView

Change-Id: Icae141ade364286a2bbc7e26ce2db81c583c224e

8 years agoMerge "Example of setting PixelArea in ImageView" into devel/master
Kimmo Hoikka [Wed, 20 Jan 2016 14:59:27 +0000 (06:59 -0800)]
Merge "Example of setting PixelArea in ImageView" into devel/master

8 years agoExample of setting PixelArea in ImageView 94/56794/5
Xiangyin Ma [Tue, 12 Jan 2016 15:31:50 +0000 (15:31 +0000)]
Example of setting PixelArea in ImageView

Change-Id: I488842dcec638e1d290142b143a11e82945eb3c3

8 years agoSeperate dali-adaptor & dali-adaptor-uv packages 36/55836/3
Yoonsang Lee [Tue, 29 Dec 2015 23:12:27 +0000 (08:12 +0900)]
Seperate dali-adaptor & dali-adaptor-uv packages

- Now dali-demo (and other native dali appplication packages) refers dali-adaptor
because native dali apps could not use libuv backend at the moment.
- Before this patch, dali-demo only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- In this patch, dali-demo checks dali-core, dali-adaptor, and
dali-toolkit packages to make it clearer.

Change-Id: Ia9f3f81a35f8df4fdd228d4cf476b9008a287483

8 years agoDALi Version 1.1.17 71/57171/1 dali_1.1.17
Nick Holland [Fri, 15 Jan 2016 14:40:56 +0000 (14:40 +0000)]
DALi Version 1.1.17

Change-Id: Ia0dc10603a77ebcc17b6a48c8bb53f85f004aabf

8 years agoMerge branch 'devel/master( 1.1.16 )' into tizen 81/57081/1 accepted/tizen/common/20160208.162649 accepted/tizen/ivi/20160218.023821 accepted/tizen/mobile/20160122.080639 accepted/tizen/tv/20160122.082355 accepted/tizen/wearable/20160122.082418 submit/tizen_common/20160122.071605 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000003 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
taeyoon [Fri, 15 Jan 2016 04:48:58 +0000 (13:48 +0900)]
Merge branch 'devel/master( 1.1.16 )' into tizen

Change-Id: Icda90c6813e7942899e915913ccb6443fbeae492

8 years agoAdded ASTC Native file format loader 48/56648/7
Tom Robinson [Mon, 11 Jan 2016 17:11:42 +0000 (17:11 +0000)]
Added ASTC Native file format loader

ASTC can be wrapped in a KTX file, but also has its own native file format.
This patch provides support for the native ASTC file format (.astc).

Textures can be generated using tools (Eg. Mali texture compression tool).

Note: ASTC is "OpenGL friendly" in that the textures are pre-flipped vertically.
In DALi there is currently not a differenciation between different texture compression formats in that the data (once the header is extracted) is given to the hardware as-is.
For this reason textures must currently be pre-flipped vertically (before compression) when using the native .astc file format with DALI.

An example .astc file is included as part of the unit tests.

Change-Id: I8604fba28bfb83b0deff8689fd5d7cfb8ac770bb

8 years agoSupport for ASTC compressed textures wrapped in KTX files 79/54479/9
Tom Robinson [Tue, 15 Dec 2015 11:34:47 +0000 (11:34 +0000)]
Support for ASTC compressed textures wrapped in KTX files

ASTC is supported by OpenGL ES 3.1 and above.
To build this patch with ASTC support, a GLES 31 context must be specified.

To build for desktop with configure, the gles version must be set to 31.
Here is an example configure line:
CXXFLAGS="-g -O0 -Wno-unused-local-typedefs" CXX="ccache g++" ./configure --prefix=$DESKTOP_PREFIX --enable-debug=yes --enable-profile=UBUNTU --enable-gles=31

With GBS, add the following to your gbs build line:
--define "%target_gles_version 31"

Change-Id: I4f54f894dd4b8998f16aa98d3d0a06606f0eb7a2

8 years agoDALi Version 1.1.16 97/56497/1 dali_1.1.16
Lee Morgan [Fri, 8 Jan 2016 14:32:58 +0000 (14:32 +0000)]
DALi Version 1.1.16

Change-Id: I5fa005aead7fac1c3776a8124df52ffd148c5674

8 years agoRemoved unused enum 44/56344/1
Adeel Kazmi [Wed, 6 Jan 2016 14:00:14 +0000 (14:00 +0000)]
Removed unused enum

Change-Id: Ia8272ab838dea4276efca08c94b3d38489e85699

8 years agoDALi Version 1.1.15 26/55426/1 dali_1.1.15
Adeel Kazmi [Wed, 23 Dec 2015 17:22:00 +0000 (17:22 +0000)]
DALi Version 1.1.15

Change-Id: Icbfb4b565b3d4e203a7ede1ac246826cdb32324b

8 years agoChanged benchmark to use ImageView by default 07/53407/3
Ferran Sole [Fri, 4 Dec 2015 13:11:29 +0000 (13:11 +0000)]
Changed benchmark to use ImageView by default

-ImageView is used by default
-ImageActor can still be used if the command line option "--use-image-actor" is specified
-Fixed bug on HideAnimation

Change-Id: Ib9664b7a99a142681bfdbe9ebb3ab457069d6cf7

8 years agoAdded SuperBlur & Bloom demo 25/53425/3
Xiangyin Ma [Fri, 4 Dec 2015 17:32:23 +0000 (17:32 +0000)]
Added SuperBlur & Bloom demo

Change-Id: I0de724d4efd822db22db18e2b411263a0f56f10c

8 years agoMerge "Update the ShaderEffect script to resize the geometry" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 18:40:29 +0000 (10:40 -0800)]
Merge "Update the ShaderEffect script to resize the geometry" into devel/master

8 years agoDALi Version 1.1.14 35/54135/1 dali_1.1.14
David Steele [Fri, 11 Dec 2015 14:42:05 +0000 (14:42 +0000)]
DALi Version 1.1.14

Change-Id: I757b36ee3797eca40a3be8b67f73c7b23a81ff70

8 years agoUpdate the ShaderEffect script to resize the geometry 45/53845/3
Xiangyin Ma [Wed, 9 Dec 2015 17:52:37 +0000 (17:52 +0000)]
Update the ShaderEffect script to resize the geometry

Change-Id: Ie7298f5bbd6bb3c4dea7aef4930f15345a97b173

8 years agoChange dali-builder background colour to WHITE 09/54009/1
Adeel Kazmi [Thu, 10 Dec 2015 17:59:11 +0000 (17:59 +0000)]
Change dali-builder background colour to WHITE

Change-Id: I42df9f8118c56a963c5f37d7a1da61d7cf72f17d

8 years agoImplement image fitting modes 59/52859/4
Tom Robinson [Thu, 26 Nov 2015 17:51:17 +0000 (17:51 +0000)]
Implement image fitting modes

Change-Id: Id3088e4f8b6158266b1531a28c1d71b89ac86b95

8 years ago(Popup) Fix back/ESC key handling & ToastPopup 35/53535/2
Adeel Kazmi [Mon, 7 Dec 2015 14:48:59 +0000 (14:48 +0000)]
(Popup) Fix back/ESC key handling & ToastPopup

Change-Id: Ibab6ccde4b3ed1d26e75bacc10f3e96c506b8f2d