platform/core/uifw/dali-core.git
7 years agoActor size property should return preferred size if size is fixed as set by SetSize 62/113462/5
Richard Huang [Tue, 7 Feb 2017 17:11:16 +0000 (17:11 +0000)]
Actor size property should return preferred size if size is fixed as set by SetSize

Change-Id: I8662795c67ef377c6417ef4ff7abde394d28cc94

7 years agoMerge "Delete ThreadLocalStorage on shutdown" into devel/master
Adeel Kazmi [Wed, 15 Feb 2017 14:11:28 +0000 (06:11 -0800)]
Merge "Delete ThreadLocalStorage on shutdown" into devel/master

7 years agoDelete ThreadLocalStorage on shutdown 76/114876/2
Nick Holland [Wed, 15 Feb 2017 10:25:23 +0000 (10:25 +0000)]
Delete ThreadLocalStorage on shutdown

Currently DALi ThreadLocalStorage object is not deleted
on shutdown.

Reported by Valgrind / Valkyrie

Change-Id: I376f2a05c149b3ac0d81e07fa1052fd44ee6d8a7

7 years agoPrepare for Tizen 4.0 Build 31/114831/1
MyungJoo Ham [Fri, 13 Jan 2017 05:35:08 +0000 (14:35 +0900)]
Prepare for Tizen 4.0 Build

I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.

Please do not rely on string == compare for version check.

Change-Id: I12eeef7463c50e1be811bb28aac0cf81bb6c5698
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
7 years agoMerge "Remove batching." into devel/master
Adeel Kazmi [Tue, 14 Feb 2017 15:51:26 +0000 (07:51 -0800)]
Merge "Remove batching." into devel/master

7 years agoRemove batching. 40/113940/4
Francisco Santos [Thu, 9 Feb 2017 10:04:03 +0000 (10:04 +0000)]
Remove batching.

Change-Id: Ia834dde43961d11dbac0b71f7770c4e00da7b4e8

7 years agoAdd devel API to link an object (e.g. C# custom control) with its correct type-info 05/114505/2
Richard Huang [Mon, 13 Feb 2017 13:46:01 +0000 (13:46 +0000)]
Add devel API to link an object (e.g. C# custom control) with its correct type-info

Change-Id: I51407eab027b7a73d781b20d15f850ee40d05e92

7 years agoEnsure TestPlatformAbstraction cannot be copied 21/114221/2
Adeel Kazmi [Fri, 10 Feb 2017 09:53:01 +0000 (09:53 +0000)]
Ensure TestPlatformAbstraction cannot be copied

- Fixes an SVACE issue.
- Also synchronized automated tests with other repos.

Change-Id: Ib8cc53264d74aacfcf147706d302f57bb6b822e5

7 years agoDALi Version 1.2.26 65/114165/1 dali_1.2.26
Victor Cebollada [Fri, 10 Feb 2017 07:56:43 +0000 (07:56 +0000)]
DALi Version 1.2.26

Change-Id: I423b6d38c3a91115d8a96630d3edfe795d034eb9

7 years agoMerge "Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage." into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 17:07:28 +0000 (09:07 -0800)]
Merge "Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage." into devel/master

7 years agoMerge "Remove dali.h from core test" into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 16:23:55 +0000 (08:23 -0800)]
Merge "Remove dali.h from core test" into devel/master

7 years agoMerge "Use TextureSet instead when sorting render items." into devel/master
Paul Wisbey [Thu, 9 Feb 2017 13:37:17 +0000 (05:37 -0800)]
Merge "Use TextureSet instead when sorting render items." into devel/master

7 years agoRemove dali.h from core test 76/113976/1
Francisco Santos [Thu, 9 Feb 2017 10:58:05 +0000 (10:58 +0000)]
Remove dali.h from core test

Change-Id: I5f89e11d27daffb275a96466b0e5c100ff8f9027

7 years agoFix SVACE issue - memory leak 98/113898/1
Heeyong Song [Thu, 9 Feb 2017 08:14:50 +0000 (17:14 +0900)]
Fix SVACE issue - memory leak

- Delete the elements of mResourceRequests

Change-Id: Ib0e95cccf8ac755b2e5571a0efd2b90e15a64747

7 years agoMerge "Added travis.yml for auto-building patches" into devel/master
Kimmo Hoikka [Wed, 8 Feb 2017 19:00:13 +0000 (11:00 -0800)]
Merge "Added travis.yml for auto-building patches" into devel/master

7 years agoUse TextureSet instead when sorting render items. 44/113744/3
Francisco Santos [Wed, 8 Feb 2017 14:46:34 +0000 (14:46 +0000)]
Use TextureSet instead when sorting render items.

Change-Id: Id03460a0e99bca4c914a5f28ff397d570034dcba

7 years agoDeprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage. 64/113464/2
David Steele [Tue, 7 Feb 2017 18:15:42 +0000 (18:15 +0000)]
Deprecated Layer::TREE_DEPTH_MULTIPLIER and fixed mis-usage.

Layer::TREE_DEPTH_MULITPLIER has the wrong value for our sorting
algorithm, and has been replaced by DevelLayer::TREE_DEPTH_MULTIPLIER,
which is now set to 1,000,000. Updated HitTestAlgorithm to also use the
correct value.

Change-Id: I7015f485f62a273f9c082171d81cca217dafb7d0
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "DALi Version 1.2.25" into devel/master
David Steele [Fri, 3 Feb 2017 15:40:54 +0000 (07:40 -0800)]
Merge "DALi Version 1.2.25" into devel/master

7 years agoDALi Version 1.2.25 12/113012/1 dali_1.2.25
Umar [Fri, 3 Feb 2017 15:37:20 +0000 (15:37 +0000)]
DALi Version 1.2.25

Change-Id: Ie6091edc01e7c7f93e6a2ea138e70301c5b1924e

7 years agoRemoved ResourceClient 91/112791/2
Paul Wisbey [Thu, 2 Feb 2017 19:17:47 +0000 (19:17 +0000)]
Removed ResourceClient

Change-Id: Iecccb23503008d3c5f24203998f14d92a3a99888

7 years agoMerge "Removed FrameBufferId from SceneGraph::RenderTask" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:51:05 +0000 (10:51 -0800)]
Merge "Removed FrameBufferId from SceneGraph::RenderTask" into devel/master

7 years agoMerge "Remove images from TextureSet" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:50:55 +0000 (10:50 -0800)]
Merge "Remove images from TextureSet" into devel/master

7 years agoDALi Version 1.2.24 02/112202/1 dali_1.2.24
Nick Holland [Fri, 27 Jan 2017 15:14:03 +0000 (15:14 +0000)]
DALi Version 1.2.24

Change-Id: I94c051014beeae1c0283440bd23c91190d15e044

7 years agoRemoved FrameBufferId from SceneGraph::RenderTask 69/112169/2
Ferran Sole [Thu, 26 Jan 2017 17:28:20 +0000 (17:28 +0000)]
Removed FrameBufferId from SceneGraph::RenderTask

Change-Id: I5411bbffd7569a29eb35559b767e3cc5e1159eeb

7 years agoRemove images from TextureSet 65/112165/5
Ferran Sole [Thu, 26 Jan 2017 16:19:55 +0000 (16:19 +0000)]
Remove images from TextureSet

Change-Id: I12e3b03fc9613d0beaf3d18b0ecb62b8be83f406

7 years agoChanged remaining image types to use Texture internally 05/111905/7
Ferran Sole [Tue, 24 Jan 2017 14:26:54 +0000 (14:26 +0000)]
Changed remaining image types to use Texture internally

- FrameBufferImage, NativeImage, EncodedBufferImage and BufferImage use Dali::Texture internally
- Removed Dali::Atlas class as it is not used

Change-Id: Ife1bf687ca314d87cf5974651857dc7242a1ce37

7 years agoDelete ImageFactory and ImageFactoryCache as they are unused 39/111439/2
Ferran Sole [Fri, 20 Jan 2017 09:29:39 +0000 (09:29 +0000)]
Delete ImageFactory and ImageFactoryCache as they are unused

Change-Id: Ia76278fc6d2c3c62e2789f46320e2fc897089603

7 years ago(GCC 6.2) Remove unused functions from automated tests 02/111502/1
Adeel Kazmi [Fri, 20 Jan 2017 18:07:44 +0000 (18:07 +0000)]
(GCC 6.2) Remove unused functions from automated tests

Change-Id: I22092d5c6ed2c6536e26f426ae5b04ef152d86e3

7 years agoDALi Version 1.2.23 85/111485/1 dali_1.2.23
Richard Huang [Fri, 20 Jan 2017 13:34:45 +0000 (13:34 +0000)]
DALi Version 1.2.23

Change-Id: I6454ba8a1df926dabae3b7dfed634d68af2ce792

7 years agoMerge "Changed ResourceImage to use Dali::Texture internally" into devel/master
Paul Wisbey [Thu, 19 Jan 2017 17:25:50 +0000 (09:25 -0800)]
Merge "Changed ResourceImage to use Dali::Texture internally" into devel/master

7 years agoFix undefined behaviour due to strict-aliasing. 30/110930/1
Francisco Santos [Wed, 18 Jan 2017 17:38:32 +0000 (17:38 +0000)]
Fix undefined behaviour due to strict-aliasing.

Change-Id: I5b69e86a01d8f4dd720f685222ce2424aa664d9b

7 years agoChanged ResourceImage to use Dali::Texture internally 49/109749/7
Ferran Sole [Wed, 11 Jan 2017 11:10:33 +0000 (11:10 +0000)]
Changed ResourceImage to use Dali::Texture internally

Change-Id: Ie8e740f8549bb23e4e2caf91a837d844bc6eb89c

7 years agoMerge "Remove erroneous assert, pointers to references cannot be null." into devel...
David Steele [Mon, 16 Jan 2017 18:09:52 +0000 (10:09 -0800)]
Merge "Remove erroneous assert, pointers to references cannot be null." into devel/master

7 years agoUpdate doxygen tags 27/110427/1
Seoyeon Kim [Mon, 16 Jan 2017 10:08:17 +0000 (19:08 +0900)]
Update doxygen tags

- @returns -> @return / @param -> @param[in] / @detail descriptions

Change-Id: I5ae9f7849030988748f0afb4ce58f7b4b06ed7ab
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoRemove erroneous assert, pointers to references cannot be null. 89/110289/4
Francisco Santos [Fri, 13 Jan 2017 14:25:52 +0000 (14:25 +0000)]
Remove erroneous assert, pointers to references cannot be null.

Change-Id: I1556faec4cf03b5bd272230e232e1492a9616e28

7 years agoDALi Version 1.2.22 91/110291/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:14 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I50eca844edc5031109806fe8a865b071de4f2369

7 years agoRemove left over references to ImageActor & ShaderEffect 60/109060/1
Adeel Kazmi [Fri, 6 Jan 2017 17:35:42 +0000 (17:35 +0000)]
Remove left over references to ImageActor & ShaderEffect

Change-Id: Ied2e62c240ffdf563879a54a2b53ed027038606e

7 years agoMerge "DALi Version 1.2.21" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:30 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master

7 years agoDALi Version 1.2.21 42/109042/1 dali_1.2.21
Agnelo Vaz [Fri, 6 Jan 2017 14:00:24 +0000 (14:00 +0000)]
DALi Version 1.2.21

Change-Id: Ia6031e55868f8a9c27df50fc232a5b97ee378990

7 years agoEnsure clipping gets disabled properly when previously enabled 65/108965/1
Adeel Kazmi [Fri, 6 Jan 2017 09:39:03 +0000 (09:39 +0000)]
Ensure clipping gets disabled properly when previously enabled

The clipping sort modifier is used to retrieve the clipping ID but is not cleared when we disable clipping.

Change-Id: Icfea7d7115fe24574edd5a058d65229621e75ae8

7 years ago(Actor) Add enumeration setting support to various properties 09/108509/1
Adeel Kazmi [Wed, 4 Jan 2017 18:07:41 +0000 (18:07 +0000)]
(Actor) Add enumeration setting support to various properties

Before, you could only set these enumeration value properties as strings which is quite annoying from code.

Change-Id: I566bd962c1bbcc43abdf15786e5c06065969ce60

7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:44:48 +0000 (10:44 +0000)]
DALi Version 1.2.20

Change-Id: Ia0568f0964f6e8e72d91b9a1d3016d3055159ab8

7 years agoRemove deprecation warnings from TouchEvent 91/106891/1
Adeel Kazmi [Fri, 23 Dec 2016 10:50:13 +0000 (10:50 +0000)]
Remove deprecation warnings from TouchEvent

This pollutes the log for general touch as it's used by the TouchEventProcessor for backwards compatability
and, thus, the log is always shown even if applications are not using it.

Change-Id: Ied028740a3007914a6c68c0ffa3a66ad6ef840c9

7 years agoMerge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master
Adeel Kazmi [Tue, 20 Dec 2016 16:21:21 +0000 (08:21 -0800)]
Merge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master

* changes:
  Redundant assignments.
  Simplify logic, avoid storing raw pointer
  DaliException should be captured by reference.
  Redundant assignments and unread values.
  Members not set in assignment constructor.
  Comparison between boolean and integer.
  Redundant break, default being used in switch statement.
  Incorrect signature of assignment operator.

7 years agoMove virtual destructor same position as 2.4 64/105864/1
suhyung Eom [Tue, 20 Dec 2016 01:14:17 +0000 (10:14 +0900)]
Move virtual destructor same position as 2.4

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

7 years agoMove virutal method's position to its original 67/105567/1
suhyung Eom [Sun, 18 Dec 2016 23:11:44 +0000 (08:11 +0900)]
Move virutal method's position to its original

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

7 years agoRedundant assignments. 42/102842/4
Francisco Santos [Tue, 6 Dec 2016 14:37:32 +0000 (14:37 +0000)]
Redundant assignments.

Change-Id: I822c304423985c56150047576dfb2e442a68b10d

7 years agoSimplify logic, avoid storing raw pointer 81/102781/3
Francisco Santos [Tue, 6 Dec 2016 11:21:52 +0000 (11:21 +0000)]
Simplify logic, avoid storing raw pointer

Change-Id: I9e0f12e72ec49312080a073afca7db835c5b8006

7 years agoDaliException should be captured by reference. 80/102780/3
Francisco Santos [Tue, 6 Dec 2016 10:56:22 +0000 (10:56 +0000)]
DaliException should be captured by reference.

Change-Id: Ibab0e11ed2290f979c525b0f7c6d0dc16ce4425e

7 years agoRedundant assignments and unread values. 79/102779/3
Francisco Santos [Tue, 6 Dec 2016 10:53:54 +0000 (10:53 +0000)]
Redundant assignments and unread values.

Change-Id: Icb145e7b40cde869279ce5cd6d66a22a91b33df9

7 years agoMembers not set in assignment constructor. 78/102778/3
Francisco Santos [Tue, 6 Dec 2016 10:31:50 +0000 (10:31 +0000)]
Members not set in assignment constructor.

Change-Id: Ib68aba7f7c2208e496f3b64aef0caa122236f7fb

7 years agoComparison between boolean and integer. 77/102777/3
Francisco Santos [Tue, 6 Dec 2016 10:29:01 +0000 (10:29 +0000)]
Comparison between boolean and integer.

Change-Id: I565aee867965ab67bd8d5c97e3ac620a893f4925

7 years agoRedundant break, default being used in switch statement. 76/102776/3
Francisco Santos [Tue, 6 Dec 2016 10:27:42 +0000 (10:27 +0000)]
Redundant break, default being used in switch statement.

Change-Id: I1c9d532eec75571074b65fd110bbfd49f8ffbb30

7 years agoIncorrect signature of assignment operator. 75/102775/3
Francisco Santos [Tue, 6 Dec 2016 10:26:52 +0000 (10:26 +0000)]
Incorrect signature of assignment operator.

Change-Id: I5742daf33fd44d4d25a679c9d5684cdff6374ae7

7 years agoDALi Version 1.2.19 44/105444/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:19:26 +0000 (13:19 +0000)]
DALi Version 1.2.19

Change-Id: Icb57b6cbd45320778be963cb4750eba7f79636ef

7 years agoMerge "Enabling animation of Renderer properties when offstage" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:23 +0000 (08:01 -0800)]
Merge "Enabling animation of Renderer properties when offstage" into devel/master

7 years agoType registry changed C# callback signatures 32/101932/6
Nick Holland [Fri, 2 Dec 2016 11:02:29 +0000 (11:02 +0000)]
Type registry changed C# callback signatures

To save memory / simplicity we now use just 3 C# delegates to
connect between C# and C++ type registry. Previously it was
3 delegates per custom control ( Create, Property Set, Property Get).

Change-Id: I91a1da13014449f2589b6f5f5f3cea6308a4c582

7 years agoEnabling animation of Renderer properties when offstage 18/101318/2
David Steele [Wed, 30 Nov 2016 19:21:54 +0000 (19:21 +0000)]
Enabling animation of Renderer properties when offstage

If the renderer exists, but hasn't been staged yet, then the scene
graph object also exists, but cannot be accessed because of a spurious
check for OnStage().

Removing the OnStage check to allow animations to run on Renderers
that haven't 'quite' been staged but are very likely to in the near
future.

Change-Id: I219cca9e08ebb6c7c5b2b8e7f33fd8bbb24b47ae
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoFix bug binding native image textures 77/104577/4
Ferran Sole [Tue, 13 Dec 2016 14:29:36 +0000 (14:29 +0000)]
Fix bug binding native image textures

NewTexture was always binding native image textures to GL_TEXTURE_2D binding point
even if textures required a different binding point

Change-Id: If01f8d33a92ed993b19818d6ba4b804f21b67253

7 years agoApply deprecate macro and LOG 91/96791/13
suhyung Eom [Thu, 10 Nov 2016 07:51:50 +0000 (16:51 +0900)]
Apply deprecate macro and LOG

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

7 years agoMerge "Adding Devel Property Registration macro" into devel/master
Adeel Kazmi [Fri, 9 Dec 2016 18:02:23 +0000 (10:02 -0800)]
Merge "Adding Devel Property Registration macro" into devel/master

7 years agoDALi Version 1.2.18 35/103835/1 dali_1.2.18
Ferran Sole [Fri, 9 Dec 2016 14:34:00 +0000 (14:34 +0000)]
DALi Version 1.2.18

Change-Id: Idecbcc614e7857fc300971bed885c0ff74dad31e

7 years agoAdding Devel Property Registration macro 14/102914/3
David Steele [Tue, 6 Dec 2016 18:52:16 +0000 (18:52 +0000)]
Adding Devel Property Registration macro

And missing test cases.

Change-Id: I47626b6dd9ef2eca4fbbfb482c3c6073612b7f5b

7 years agoMerge "Remove some dead typedefs from progress-value.h" into devel/master
Adeel Kazmi [Thu, 8 Dec 2016 18:30:34 +0000 (10:30 -0800)]
Merge "Remove some dead typedefs from progress-value.h" into devel/master

7 years agoMerge "Changed log message to inform number of textures != than active sampler from...
Adeel Kazmi [Wed, 7 Dec 2016 08:46:04 +0000 (00:46 -0800)]
Merge "Changed log message to inform number of textures != than active sampler from ERROR to WARNING" into devel/master

7 years agoMerge "Added sibling order property to the actor's property table" into devel/master
Kimmo Hoikka [Tue, 6 Dec 2016 17:04:26 +0000 (09:04 -0800)]
Merge "Added sibling order property to the actor's property table" into devel/master

7 years agoStop calling destroy methods of texture and FrameBuffers on RenderManager destructor 72/102672/5
Ferran Sole [Tue, 6 Dec 2016 09:33:51 +0000 (09:33 +0000)]
Stop calling destroy methods of texture and FrameBuffers on RenderManager destructor

Textures and FrameBuffers GL resources where being destroyed on RenderManager destructor
which is called from event thread causing crashes on some GL drivers.

Removed destruction of texture and framebuffer resources since they will be cleaned up
automatically when the GL context is destroyed

Change-Id: I8bd4d79399554179819e091e662ea0c9a6e0bc5f

7 years agoAdded sibling order property to the actor's property table 85/102785/3
Ferran Sole [Tue, 6 Dec 2016 12:22:34 +0000 (12:22 +0000)]
Added sibling order property to the actor's property table

Added a check in GetDefaultProperty to return a null Value if index
is greater or equal to number of default properties

Change-Id: Ie92a96f26fba7cdbd27395ca1c0f664eaf4b3c97

7 years agoRemove some dead typedefs from progress-value.h 53/101953/2
Kimmo Hoikka [Fri, 2 Dec 2016 12:30:44 +0000 (12:30 +0000)]
Remove some dead typedefs from progress-value.h

Change-Id: Ia67e7802aa6f6940705bb30bbcd83fd190e79361

7 years agoChanged log message to inform number of textures != than active sampler from ERROR... 78/100878/2
Ferran Sole [Tue, 29 Nov 2016 12:12:46 +0000 (12:12 +0000)]
Changed log message to inform number of textures != than active sampler from ERROR to WARNING

Caused false error for SVG visual which creates a renderer but doesn't add it to an actor
until the actual texture is created

Change-Id: I7dec2873e6bb49bc36418ecad1d038d72334ce34

7 years agoMerge "Prevent API generate warning log" into devel/master
Adeel Kazmi [Mon, 5 Dec 2016 11:28:38 +0000 (03:28 -0800)]
Merge "Prevent API generate warning log" into devel/master

7 years agoAdded travis.yml for auto-building patches 97/101997/1
David Steele [Fri, 2 Dec 2016 15:04:18 +0000 (15:04 +0000)]
Added travis.yml for auto-building patches

The Travis build runs in an Ubuntu 14.04 VM, and has the necessary dependencies
to build dali-core and to build and execute the test cases (this does not require
testkit-lite anymore, but does still use it's scripts)

After building and running, it concatenates the coverage .info files
and uploads them to coveralls.io/github/dalihub/dali-core.

Updated coverage script to stop running genhtml (to reduce
time when uploading lcov data to coveralls).

Change-Id: I59bb8a4c043ffd84141b897070121d63f3132bed
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoDALi Version 1.2.17 77/101977/1 dali_1.2.17
adam.b [Fri, 2 Dec 2016 14:07:06 +0000 (14:07 +0000)]
DALi Version 1.2.17

Change-Id: I98d020cea446af271a5c5c287e014a082759d3be

7 years agoMerge "Remove dead code from tests." into devel/master
David Steele [Thu, 1 Dec 2016 17:42:05 +0000 (09:42 -0800)]
Merge "Remove dead code from tests." into devel/master

7 years agoMerge "Add missing includes." into devel/master
David Steele [Thu, 1 Dec 2016 17:41:46 +0000 (09:41 -0800)]
Merge "Add missing includes." into devel/master

7 years agoMerge "Removed ShaderEffect" into devel/master
Kimmo Hoikka [Thu, 1 Dec 2016 17:36:40 +0000 (09:36 -0800)]
Merge "Removed ShaderEffect" into devel/master

7 years agoRemoved ShaderEffect 08/101608/3
Adeel Kazmi [Thu, 1 Dec 2016 14:11:14 +0000 (14:11 +0000)]
Removed ShaderEffect

Change-Id: I428f525da8b70c98dc55795f6a67be56bd8ddaa8

7 years agoRemove dead code from tests. 07/101607/3
Francisco Santos [Thu, 1 Dec 2016 15:06:11 +0000 (15:06 +0000)]
Remove dead code from tests.

Change-Id: I11c0c9f49fe9cf8235e80a84b790c04f4ee9c75d

7 years agoAdd missing includes. 50/101550/4
Francisco Santos [Thu, 1 Dec 2016 11:01:40 +0000 (11:01 +0000)]
Add missing includes.

Change-Id: I31f1ecba458022e7d584d28defcf47233b54b175

7 years agoAdded sibling order property to Actor 20/100620/8
Ferran Sole [Mon, 28 Nov 2016 15:04:06 +0000 (15:04 +0000)]
Added sibling order property to Actor

- Added a sibling order to allow the user to control drawing order in LAYER_UI

Change-Id: Ife3995b46d61ebe7abbc39b6035834b7a581c674

7 years agoRemove unused custom-uniform.cpp 77/101577/1
Kimmo Hoikka [Thu, 1 Dec 2016 12:40:59 +0000 (12:40 +0000)]
Remove unused custom-uniform.cpp

Change-Id: I2235f44d83aae27492a2c2d8a49c217ff9d07f15

7 years agoRemove unused member variable in Render::Renderer 08/101508/1
Adeel Kazmi [Thu, 1 Dec 2016 08:57:18 +0000 (08:57 +0000)]
Remove unused member variable in Render::Renderer

Change-Id: I962ee97d7fbd0ccef6de11ec45e805879fc3ba2f

7 years agoMerge "Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less...
Adeel Kazmi [Thu, 1 Dec 2016 09:29:25 +0000 (01:29 -0800)]
Merge "Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code producing DALI_ABORT" into devel/master

7 years agoReplace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code produ... 68/100868/10
Kimmo Hoikka [Tue, 29 Nov 2016 11:45:29 +0000 (11:45 +0000)]
Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code producing DALI_ABORT

Change-Id: Ic95089ea99d0e5c1a569c40ebbad9c848f87f13c

7 years agoRemove dead code (archive.cpp) 08/101208/2
Kimmo Hoikka [Wed, 30 Nov 2016 11:41:32 +0000 (11:41 +0000)]
Remove dead code (archive.cpp)

Change-Id: Iac020ffbfd0b60b790f076778625c5c33d5785d1

7 years agoRevert public API changes. Handle methods. 83/98183/4
Victor Cebollada [Wed, 16 Nov 2016 09:28:41 +0000 (09:28 +0000)]
Revert public API changes. Handle methods.

* Reverts the addition of the GetPropertyIndex() and RegisterProperty() methods
  in Handle done in public API since the Tizen 3.0 API was frozen.
  Changes have been moved to the devel API.

Change-Id: I7acd05cb8d6ed08c8d7b45f268ad1dbba71f2f57
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge "Revert public API changes. BATCH property." into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 13:51:35 +0000 (05:51 -0800)]
Merge "Revert public API changes. BATCH property." into devel/master

7 years agoMerge "Added C# control / property registration to devel API" into devel/master
Kimmo Hoikka [Fri, 25 Nov 2016 11:02:53 +0000 (03:02 -0800)]
Merge "Added C# control / property registration to devel API" into devel/master

7 years agoMerge "Change CustomActorImpl destructor to protected" into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 11:00:23 +0000 (03:00 -0800)]
Merge "Change CustomActorImpl destructor to protected" into devel/master

7 years agoRevert public API changes. BATCH property. 12/98112/7
Victor Cebollada [Tue, 15 Nov 2016 16:39:44 +0000 (16:39 +0000)]
Revert public API changes. BATCH property.

* Reverts the addition of the BATCH property in Actor and Renderer
  done in public API since the Tizen 3.0 API was frozen.
  Changes have been moved to the devel API.

Change-Id: I188203376f8e3d75248f000b022c5adfce46aad3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.2.16 37/100137/1 dali_1.2.16
Victor Cebollada [Fri, 25 Nov 2016 07:05:30 +0000 (07:05 +0000)]
DALi Version 1.2.16

Change-Id: I0c18e7191f0a35053ef104b2f91cbba2a214f717

7 years agoChange CustomActorImpl destructor to protected 19/100019/2
Adeel Kazmi [Thu, 24 Nov 2016 17:41:45 +0000 (17:41 +0000)]
Change CustomActorImpl destructor to protected

This is a ref-counted object so another non-deriving object should not be able to delete it.

Change-Id: Iacca4e57bc7871c33d0c3602051e2980037de20f

7 years agoFix comment in core-impl.cpp 18/100018/2
Adeel Kazmi [Thu, 24 Nov 2016 17:37:30 +0000 (17:37 +0000)]
Fix comment in core-impl.cpp

Change-Id: I38b5ff5c8b51e2638c0cc14e43dc5d955a63aa94

7 years agoFix incorrect comment about position and position inheritance in actor.h 97/99897/3
Kimmo Hoikka [Thu, 24 Nov 2016 10:59:04 +0000 (10:59 +0000)]
Fix incorrect comment about position and position inheritance in actor.h

Change-Id: Id72d7701f9ea393423591b18f555e43ce1688e27

7 years agoMerge "Update comment for SetParentOrigin & SetAnchorPoint" into devel/master
dongsug song [Thu, 24 Nov 2016 03:49:27 +0000 (19:49 -0800)]
Merge "Update comment for SetParentOrigin & SetAnchorPoint" into devel/master

7 years agoMerge "Update comment for Actor::SetPosition()" into devel/master
dongsug song [Thu, 24 Nov 2016 01:10:47 +0000 (17:10 -0800)]
Merge "Update comment for Actor::SetPosition()" into devel/master

7 years agoMerge "Update the doxygen comment for CameraActor " into devel/master
dongsug song [Thu, 24 Nov 2016 01:08:42 +0000 (17:08 -0800)]
Merge "Update the doxygen comment for CameraActor " into devel/master

7 years agoUpdate comment for Actor::SetPosition() 99/99699/1
Yoonsang Lee [Wed, 23 Nov 2016 23:44:19 +0000 (08:44 +0900)]
Update comment for Actor::SetPosition()

Change-Id: Iad49f543e121f518abf3840b91895dcb96cf93b2

7 years agoUpdate comment for SetParentOrigin & SetAnchorPoint 98/99698/2
Yoonsang Lee [Wed, 23 Nov 2016 23:22:16 +0000 (08:22 +0900)]
Update comment for SetParentOrigin & SetAnchorPoint

- Add figures

Change-Id: I0df2ebc099570430598a956945dbad6926667bea

7 years agoAdded C# control / property registration to devel API 15/96615/12
Nick Holland [Wed, 9 Nov 2016 11:52:44 +0000 (11:52 +0000)]
Added C# control / property registration to devel API

The function signature used by DALi for type registration
and property registration can not be used from C#.
E.g. CreateFunction (for creating controls ) returns a Handle by value. From C#
we can only return a c pointer to the handle.C# knows
nothing about DALi Handles, it just happens to have a
pointer to one, thanks to the SWIG bindings.

Also increased code coverage on type-registry to
100%

Change-Id: Ib88ab1ba48f4ea74a460d5902b740c919e3ac24d