platform/core/uifw/dali-core.git
9 years agoCleanup platform abstraction API (to allow removal of dead code from Adaptor) 28/44928/1
Kimmo Hoikka [Wed, 29 Jul 2015 12:02:38 +0000 (13:02 +0100)]
Cleanup platform abstraction API (to allow removal of dead code from Adaptor)

Change-Id: I70b633fa641676d8805f9e854806f54d1372fcbb

9 years agoTemporarily disable v8 build and install from dali_env 74/44874/2
Nick Holland [Tue, 28 Jul 2015 15:36:36 +0000 (16:36 +0100)]
Temporarily disable v8 build and install from dali_env

when running dali_env script the v8 installation fails if the
machine is not using a http proxy.

Change-Id: I5caa75723c0a211b045c8ab30744c9777ae1d233

9 years agoMerge "Stop setting crazy Z value when SetSize(width,height) is used" into devel...
Adeel Kazmi [Tue, 28 Jul 2015 14:42:30 +0000 (07:42 -0700)]
Merge "Stop setting crazy Z value when SetSize(width,height) is used" into devel/master

9 years agoRemove on/off stage behavior from Shader 25/44425/4
Paul Wisbey [Thu, 16 Jul 2015 09:28:37 +0000 (10:28 +0100)]
Remove on/off stage behavior from Shader

Change-Id: I2ee41d546fee1c32c017a507ea9bfac9e471822e

9 years agoStop setting crazy Z value when SetSize(width,height) is used 05/44605/3
Kimmo Hoikka [Thu, 23 Jul 2015 12:42:26 +0000 (13:42 +0100)]
Stop setting crazy Z value when SetSize(width,height) is used

Change-Id: Ic428a491ec271748eac7930a3126c4f9fb5132e3

9 years agoKeep track of Bitmap data ownership 14/44614/9
Paul Wisbey [Thu, 23 Jul 2015 16:59:05 +0000 (17:59 +0100)]
Keep track of Bitmap data ownership

i.e. Disard refers to whether the data can be released after uploading.
ResourcePolicy::RETAIN does not mean that the data is externally owned.

Change-Id: I550f227e5463d677ba7e5ac5e889989360834089

9 years agoMerge "Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the posit...
Adeel Kazmi [Mon, 27 Jul 2015 10:40:29 +0000 (03:40 -0700)]
Merge "Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests." into devel/master

9 years agoChanged UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position... 89/44689/1
Chu Hoang [Fri, 24 Jul 2015 15:22:40 +0000 (16:22 +0100)]
Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests.

Refactored and cleaned up utc-Dali-Internal-FrustumCulling tests.

Change-Id: I5fa7fd85b6cc0866749733d3c13af1202b5cb4a3

9 years agoRemoved unneeded index param and code from ConnectNode / Child 10/44610/2
Tom Robinson [Thu, 23 Jul 2015 13:58:38 +0000 (14:58 +0100)]
Removed unneeded index param and code from ConnectNode / Child

Change-Id: Ic6dd8519b44d861e3208b4d701d18e3f43776506

9 years agoFix sampler property types 09/44609/1
Lee Morgan [Thu, 23 Jul 2015 13:17:18 +0000 (14:17 +0100)]
Fix sampler property types

Change-Id: Ida87e40cd5a8c0ffa90fb6ca4e94ab69cccff5bc

9 years agoMerge "DALi Version 1.0.50" into devel/master
Adeel Kazmi [Thu, 23 Jul 2015 11:08:43 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.50" into devel/master

9 years agoDALi Version 1.0.50 81/44581/1 dali_1.0.50
Richard Huang [Thu, 23 Jul 2015 10:55:38 +0000 (11:55 +0100)]
DALi Version 1.0.50

Change-Id: Ibbd0e36ba833d3b024934038b2eda74e59cfd0e3

9 years agoMerge "Cleanup dead declaration from ShaderEffect" into devel/master
Kimmo Hoikka [Thu, 23 Jul 2015 08:55:21 +0000 (01:55 -0700)]
Merge "Cleanup dead declaration from ShaderEffect" into devel/master

9 years agoMerge "Changed view frustum culling to ignore mesh extents and instead use actor...
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:56 +0000 (07:14 -0700)]
Merge "Changed view frustum culling to ignore mesh extents and instead use actor extents." into devel/master

9 years agoCleanup dead declaration from ShaderEffect 90/44490/1
Kimmo Hoikka [Wed, 22 Jul 2015 12:55:15 +0000 (13:55 +0100)]
Cleanup dead declaration from ShaderEffect

Change-Id: I96e27dd7692fcd828a15f4f1900fe9b6865c2788

9 years agoChanged view frustum culling to ignore mesh extents and instead use actor extents. 91/44291/4
Chu Hoang [Mon, 20 Jul 2015 15:55:39 +0000 (16:55 +0100)]
Changed view frustum culling to ignore mesh extents and instead use actor extents.

Removed Geometry::mHalfExtents and mRadius since they are no longer relevant.

Change-Id: I3d262e157bc30f7d999c0f73ba23469f7eac37a6

9 years agoAdd UTCs for public-api 16/44216/1
taeyoon [Mon, 20 Jul 2015 02:58:58 +0000 (11:58 +0900)]
Add UTCs for public-api

Change-Id: I50392f9caceebb5a39846058181f79ddada9a443

9 years agoMerge "Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called...
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:15 +0000 (08:05 -0700)]
Merge "Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage." into devel/master

9 years agoDALi Version 1.0.49 51/44151/1 dali_1.0.49
Nick Holland [Fri, 17 Jul 2015 08:25:35 +0000 (09:25 +0100)]
DALi Version 1.0.49

Change-Id: I2f9f863ef1aef95cbf0493bf7c6a30305fd82773

9 years agoMerge "Hit test algorithm bug fix" into devel/master
Kimmo Hoikka [Thu, 16 Jul 2015 14:00:48 +0000 (07:00 -0700)]
Merge "Hit test algorithm bug fix" into devel/master

9 years agoMerge "Set default behavior in Layer - to fix target UTC fail" into devel/master
Kimmo Hoikka [Thu, 16 Jul 2015 13:17:20 +0000 (06:17 -0700)]
Merge "Set default behavior in Layer - to fix target UTC fail" into devel/master

9 years agoMove ShaderData from integration api to internal 70/43970/2
Andrew Cox [Wed, 15 Jul 2015 12:56:39 +0000 (13:56 +0100)]
Move ShaderData from integration api to internal

Change-Id: Ibd3cae2fe9c4c08a78e3f99ce3b81f9dfbb2c8f1
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoHit test algorithm bug fix 71/43971/4
Ferran Sole [Wed, 15 Jul 2015 16:44:15 +0000 (17:44 +0100)]
Hit test algorithm bug fix

Change-Id: Ia601bcd0f9c30106eaab1ed3ebc32711ae9e70e3

9 years agoSet default behavior in Layer - to fix target UTC fail 95/43995/1
Heeyong Song [Thu, 16 Jul 2015 04:55:05 +0000 (13:55 +0900)]
Set default behavior in Layer - to fix target UTC fail

Change-Id: I0340dd33102594f2e619205103e0af2c2bc9aced

9 years agoPassing modifiesGeometry flag from Shader and ShaderEffect 63/43963/1
Andrew Cox [Wed, 15 Jul 2015 15:42:41 +0000 (16:42 +0100)]
Passing modifiesGeometry flag from Shader and ShaderEffect

Change-Id: Id06feb3b06c9398f691794a23b178a7c44c4d996
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoFixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after... 39/43839/3
Chu Hoang [Tue, 14 Jul 2015 11:18:21 +0000 (12:18 +0100)]
Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage.

Change-Id: Icda4d33e0abae3b91c790076f82493c4062242d6

9 years agoRemoval of Actor::Insert API 60/43860/2
Tom Robinson [Tue, 14 Jul 2015 15:09:07 +0000 (16:09 +0100)]
Removal of Actor::Insert API

Change-Id: I17c3851fb733d8c97aed024d1c4813e9d3a6fd30

9 years agoMerge "Changed draw ordering to take into account the depth of the node in the hierar...
Kimmo Hoikka [Tue, 14 Jul 2015 13:28:43 +0000 (06:28 -0700)]
Merge "Changed draw ordering to take into account the depth of the node in the hierarchy" into devel/master

9 years agoDeleted stray scene graph shader SetProgram() using resource id. 66/43766/2
Andrew Cox [Mon, 13 Jul 2015 17:02:52 +0000 (18:02 +0100)]
Deleted stray scene graph shader SetProgram() using resource id.

Change-Id: Idcfecd861b6f25b05739dbcfd42e7bddc2eb5786
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoChanged draw ordering to take into account the depth of the node in the hierarchy 05/43505/8
Ferran Sole [Thu, 9 Jul 2015 15:37:43 +0000 (16:37 +0100)]
Changed draw ordering to take into account the depth of the node in the hierarchy

Tree depth is multiplied by a known factor (10.000) to make it dominate the ordering.
Allows controls to still put renderers on top of their children as long as they know
the depth of the child tree

Change-Id: I3793b036150d39a930e9c55da1ea5b16febfd571

9 years agoMerge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master
Kimmo Hoikka [Mon, 13 Jul 2015 17:50:35 +0000 (10:50 -0700)]
Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master

9 years agoFix SceneGraph::Material header include 65/43765/4
Adeel Kazmi [Mon, 13 Jul 2015 16:52:22 +0000 (17:52 +0100)]
Fix SceneGraph::Material header include

Change-Id: Ifae4110dbda898b5738b4806ce62288afbeabb2f

9 years agoRemoved Resource Saving 59/43759/1
Andrew Cox [Mon, 13 Jul 2015 14:48:10 +0000 (15:48 +0100)]
Removed Resource Saving

Change-Id: I4fe2a6b00e364e39a321bc7c13f4a4980350f766
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoChange DrawMode::OVERLAY to DrawMode::OVERLAY_2D 50/43750/2
Richard Huang [Mon, 13 Jul 2015 13:40:21 +0000 (14:40 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D

Change-Id: If2392f95fa4d7ec2e3605d91e6aa9088b48b3104

9 years agoMerge "Remove RenderableActor" into devel/master
Kimmo Hoikka [Mon, 13 Jul 2015 14:01:09 +0000 (07:01 -0700)]
Merge "Remove RenderableActor" into devel/master

9 years agoRemove RenderableActor 15/43715/5
Adeel Kazmi [Mon, 13 Jul 2015 11:17:31 +0000 (12:17 +0100)]
Remove RenderableActor

Change-Id: Ie92dea9a3301ba3e6226a097684689ab0e04d561

9 years agoShader binary synchronous simplified IO 87/42487/14
Andrew Cox [Fri, 12 Jun 2015 19:23:55 +0000 (20:23 +0100)]
Shader binary synchronous simplified IO

Loading shader binaries synchronously on event thread.
Saving shader binaries from ShaderFactory on event thread.
Deleted old resource sytem based shader binary loading.

Change-Id: I38a79a7b4e9eb33d9a5059f1c43d9e8c892b0867
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoBug fix which makes applications crash when adding a renderer to an on stage actor 66/43366/5
Ferran Sole [Wed, 8 Jul 2015 10:56:10 +0000 (11:56 +0100)]
Bug fix which makes applications crash when adding a renderer to an on stage actor

Change-Id: I8db74fac8cad03cc3a8fa5d2f86267882c1baa93

9 years agoMerge "New parameter for FrameBufferImage creation" into devel/master
Kimmo Hoikka [Fri, 10 Jul 2015 14:47:14 +0000 (07:47 -0700)]
Merge "New parameter for FrameBufferImage creation" into devel/master

9 years agoAllow sharing RenderGeometries across multiple Renderers 03/42903/6
Ferran Sole [Fri, 3 Jul 2015 16:26:48 +0000 (17:26 +0100)]
Allow sharing RenderGeometries across multiple Renderers

Change-Id: I48d337a4d258e067fd5e01ad7075b24984092dcb

9 years agoNew parameter for FrameBufferImage creation 82/42382/16
David Fumanal [Fri, 26 Jun 2015 14:07:50 +0000 (15:07 +0100)]
New parameter for FrameBufferImage creation

Change-Id: I2d5898848ec7c76dea78d60d3da64a24ccd496be

9 years agoRemove de-funct dynamics support 09/43509/3
Kimmo Hoikka [Thu, 9 Jul 2015 17:34:05 +0000 (18:34 +0100)]
Remove de-funct dynamics support

Change-Id: I9633610eb33e9952dd3f10539e7272ed19287757

9 years agoMerge "DALi Version 1.0.48" into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:10:56 +0000 (09:10 -0700)]
Merge "DALi Version 1.0.48" into devel/master

9 years agoDALi Version 1.0.48 91/43491/1 dali_1.0.48
Lee Morgan [Thu, 9 Jul 2015 14:03:17 +0000 (15:03 +0100)]
DALi Version 1.0.48

Change-Id: I501559f0819bc872c246578515f9866d9716388b

9 years agoRemove UNSIGNED_INTEGER property type as it does not fully work and causes headache 84/43384/2
Kimmo Hoikka [Wed, 8 Jul 2015 14:24:06 +0000 (15:24 +0100)]
Remove UNSIGNED_INTEGER property type as it does not fully work and causes headache

Change-Id: I76a5607ed0a16d29029dd968e684f29189bf4ea5

9 years agoAllow property conversions: float from int and int from float 54/43054/2
Kimmo Hoikka [Tue, 7 Jul 2015 10:46:01 +0000 (11:46 +0100)]
Allow property conversions: float from int and int from float

Change-Id: Ic304cfb187cfba6fdd65d34764a6634e4fcd5d43

9 years agoMerge "Fix issues and added Wextra flag." into devel/master
Adeel Kazmi [Wed, 8 Jul 2015 12:59:35 +0000 (05:59 -0700)]
Merge "Fix issues and added Wextra flag." into devel/master

9 years agoMerge "Fix Klocwork issue." into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 09:31:07 +0000 (02:31 -0700)]
Merge "Fix Klocwork issue." into devel/master

9 years agoMerge "Remove utc-Dali-GlyphImage.cpp" into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 09:06:29 +0000 (02:06 -0700)]
Merge "Remove utc-Dali-GlyphImage.cpp" into devel/master

9 years agoFix Klocwork issue. 59/42959/1
Victor Cebollada [Mon, 6 Jul 2015 09:46:13 +0000 (10:46 +0100)]
Fix Klocwork issue.

Change-Id: I134af7bf46aec9226f406d6f7ec81103fef52150
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoFix issues and added Wextra flag. 04/42704/2
Francisco Santos [Wed, 1 Jul 2015 14:05:57 +0000 (15:05 +0100)]
Fix issues and added Wextra flag.

Change-Id: Ifcdf9f7620ed4b19d80482beeb100fb4e28c5685

9 years agoHarmonize test failures 71/42871/1
Adeel Kazmi [Fri, 3 Jul 2015 09:51:53 +0000 (10:51 +0100)]
Harmonize test failures

Change-Id: Ibed413b277af32ad4b30426fcec317aed93d3895

9 years agoMerge "Fix in CompareItems" into devel/master
Adeel Kazmi [Thu, 2 Jul 2015 16:47:38 +0000 (09:47 -0700)]
Merge "Fix in CompareItems" into devel/master

9 years agoMerge "Added api to check actor's depth in the hierarchy" into devel/master
Adeel Kazmi [Thu, 2 Jul 2015 13:55:17 +0000 (06:55 -0700)]
Merge "Added api to check actor's depth in the hierarchy" into devel/master

9 years agoFix in CompareItems 89/42789/2
Heeyong Song [Thu, 2 Jul 2015 09:34:20 +0000 (18:34 +0900)]
Fix in CompareItems

Change-Id: Id8f480a3b2f517ade6749c79c6ae0a1d1c4e6721

9 years agoCommented test case until proper fix 93/42793/1
Ferran Sole [Thu, 2 Jul 2015 09:41:11 +0000 (10:41 +0100)]
Commented test case until proper fix

Failed test case in PropertyBuffer was causing all verifications
by build server to fail. Commented until the proper fix can be merged.

Change-Id: Iba6a1935e92d6ed7c991d74c98810f59e1108013

9 years agoMerge "Bug fix when changing geometry in a Renderer" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 16:54:55 +0000 (09:54 -0700)]
Merge "Bug fix when changing geometry in a Renderer" into devel/master

9 years agoAdded api to check actor's depth in the hierarchy 39/42539/7
Ferran Sole [Mon, 29 Jun 2015 16:27:15 +0000 (17:27 +0100)]
Added api to check actor's depth in the hierarchy

Change-Id: Iafa09ddf3fb0c1507693330714a3675d9c9f6f61

9 years agoMerge "DALi Version 1.0.47" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 13:23:21 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master

9 years agoDALi Version 1.0.47 90/42690/1 dali_1.0.47
Ferran Sole [Wed, 1 Jul 2015 13:18:07 +0000 (14:18 +0100)]
DALi Version 1.0.47

Change-Id: Ib2e1b826560776c8152b3543cb7f75609cbde6ff

9 years agoChange state before releasing mutex 11/42611/3
Kimmo Hoikka [Tue, 30 Jun 2015 13:29:44 +0000 (14:29 +0100)]
Change state before releasing mutex

Change-Id: I696606f63baa61eb20585e9f5fb86f6da0ea56d2

9 years agoFix in RenderAttachment destructor 65/42665/2
David Fumanal [Wed, 1 Jul 2015 09:53:09 +0000 (10:53 +0100)]
Fix in RenderAttachment destructor

Change-Id: I2bb8be038314b07cd410a3ab28739b35cb843926

9 years agoFix double deletion in message. 42/42542/5
David Fumanal [Mon, 29 Jun 2015 16:40:22 +0000 (17:40 +0100)]
Fix double deletion in message.

Change-Id: I345a11ae68ca85ab2bc02dd6aba6cef8ba323e4b

9 years agoBug fix when changing geometry in a Renderer 88/42588/2
Ferran Sole [Tue, 30 Jun 2015 10:50:51 +0000 (11:50 +0100)]
Bug fix when changing geometry in a Renderer

Attribute location vector in RenderPropertyBuffer was not being updated when geometry changed.
Change-Id: I3bb5b13f552965790fbb8c4738fdd9372d618a07

9 years agoRemove utc-Dali-GlyphImage.cpp 84/42484/2
Yoonsang Lee [Mon, 29 Jun 2015 09:24:08 +0000 (18:24 +0900)]
Remove utc-Dali-GlyphImage.cpp

- This file is not built (not included in CMakeLists.txt) and class GlyphImage even does not exist any more (after merge of new_text)

Change-Id: Id7d69b8e9b49df0a2241bec860a533ae60f541ee

9 years agoRemove Cloth, DynamicsShape::MESH; Remove 'enable-dynamics' from configure 18/42518/5
root [Mon, 29 Jun 2015 13:14:59 +0000 (14:14 +0100)]
Remove Cloth, DynamicsShape::MESH; Remove 'enable-dynamics' from configure

Change-Id: I864bfdc6283152b969df8a3cec8fa231ffeac3e4

9 years agoRemove unused & unnecessary fitting functions from Vector2 & Vector3 27/42527/1
Kimmo Hoikka [Mon, 29 Jun 2015 13:56:53 +0000 (14:56 +0100)]
Remove unused & unnecessary fitting functions from Vector2 & Vector3

Change-Id: Ia12b4da6f718f2fabca942fa5a51a987093d84df

9 years agoPerformance optimizing actor-impl & relayout controller 24/42324/6
Kimmo Hoikka [Mon, 29 Jun 2015 12:07:44 +0000 (13:07 +0100)]
Performance optimizing actor-impl & relayout controller

- Store child actors as intrusive pointers rather than handles
- Stop using public handles in internal code in actor (removes about a dozen unnecessary GetImplementation calls)
- Stop calling Stage::GetCurrent().GetSize every size negotiation, store it internally instead

Change-Id: I18615aa1f8d2c736cd8502fa02de55e9146a1ef6

9 years agoMerge "Remove Random::Chance()" into devel/master
HyunJu Shin [Mon, 29 Jun 2015 10:03:14 +0000 (03:03 -0700)]
Merge "Remove Random::Chance()" into devel/master

9 years agoImplement additional UTC 37/42437/1
suhyung Eom [Mon, 29 Jun 2015 07:36:24 +0000 (16:36 +0900)]
Implement additional UTC

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

9 years agoRemove Random::Chance() 09/42409/2
Yoonsang Lee [Mon, 29 Jun 2015 01:16:43 +0000 (10:16 +0900)]
Remove Random::Chance()

Change-Id: Ib78940c744e5d9c689c7cecb44815d07e133e1af

9 years agoStage member has been removed from actor. 98/42398/1
Francisco Santos [Fri, 26 Jun 2015 18:11:10 +0000 (19:11 +0100)]
Stage member has been removed from actor.

Change-Id: I7eb63d20edbe087cf1e9dde4d6bcb427cd091785

9 years agoMerge "Merge branch 'devel/new_mesh' into devel/master" into devel/master
Adeel Kazmi [Fri, 26 Jun 2015 17:37:23 +0000 (10:37 -0700)]
Merge "Merge branch 'devel/new_mesh' into devel/master" into devel/master

9 years agoMerge branch 'devel/new_mesh' into devel/master 84/42384/1
Francisco Santos [Fri, 26 Jun 2015 14:18:45 +0000 (15:18 +0100)]
Merge branch 'devel/new_mesh' into devel/master

Change-Id: I491fcf5f6663e8de6bba090279d3f35420453129

9 years agoMerge branch 'devel/master' into devel/new_mesh 79/42379/1
Francisco Santos [Fri, 26 Jun 2015 14:00:14 +0000 (15:00 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Change-Id: Ibaa203f8ccb1e3526faac8b168440c7a41ec6c69

9 years ago(Actor) Stop creating RelayoutData struct in getters 26/42326/3
Adeel Kazmi [Thu, 25 Jun 2015 17:56:54 +0000 (18:56 +0100)]
(Actor) Stop creating RelayoutData struct in getters

Change-Id: Ibbdc0991c8a3ad612a65be3a76ea28bc2ee12ec0

9 years agoFix for SizeNegotiation. 17/42317/1
Victor Cebollada [Thu, 25 Jun 2015 09:33:09 +0000 (10:33 +0100)]
Fix for SizeNegotiation.

  The RelayoutController::RequestRelayout() does not add a dirty Actor to the
  request list if it has a child which is not dependant on it.

Change-Id: I7f4131d58dfe4a7135cf7e3e8077c86e83b44133
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge branch 'devel/master' into devel/new_mesh 15/42315/1
Francisco Santos [Thu, 25 Jun 2015 13:25:07 +0000 (14:25 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Conflicts:
automated-tests/src/dali-devel/mesh-builder.cpp
automated-tests/src/dali-devel/mesh-builder.h
automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp
automated-tests/src/dali-devel/utc-Dali-MeshData.cpp
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
dali/devel-api/dynamics/dynamics-shape.cpp
dali/integration-api/profiling.h
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/common/property-helper.h
dali/internal/event/effects/shader-effect-impl.cpp
dali/internal/event/events/hit-test-algorithm-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/update/modeling/scene-graph-animatable-mesh.cpp

Change-Id: If6d0998584a46ed811855237d340a7fa388c4451

9 years agoMerge "Fix crash on removal of Renderers from stage." into devel/new_mesh
Adeel Kazmi [Wed, 24 Jun 2015 16:47:31 +0000 (09:47 -0700)]
Merge "Fix crash on removal of Renderers from stage." into devel/new_mesh

9 years agoMerge "Fixes scale issue in Frustum Culling" into devel/new_mesh
Adeel Kazmi [Wed, 24 Jun 2015 16:46:25 +0000 (09:46 -0700)]
Merge "Fixes scale issue in Frustum Culling" into devel/new_mesh

9 years agoMerge "Removed DepthIndex methods from public-api" into devel/new_mesh
Adeel Kazmi [Wed, 24 Jun 2015 16:46:23 +0000 (09:46 -0700)]
Merge "Removed DepthIndex methods from public-api" into devel/new_mesh

9 years agoDALi Version 1.0.46 33/42233/1 dali_1.0.46
Chu Hoang [Wed, 24 Jun 2015 14:54:20 +0000 (15:54 +0100)]
DALi Version 1.0.46

Change-Id: Iad4ab1c54d8a5fa3a07036736068f14669b5863f

9 years agoFix crash on removal of Renderers from stage. 19/42219/1
Francisco Santos [Wed, 24 Jun 2015 13:35:09 +0000 (14:35 +0100)]
Fix crash on removal of Renderers from stage.

Change-Id: I117b78d4e48edf465500051647a57c0d6430a37a

9 years agoFixes scale issue in Frustum Culling 30/41530/4
Richard Underhill [Wed, 24 Jun 2015 12:57:25 +0000 (13:57 +0100)]
Fixes scale issue in Frustum Culling

Change-Id: I7b15e52b1e387981638ee622dfe463fb253fefe7
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoRemoved DepthIndex methods from public-api 96/42196/3
Richard Underhill [Wed, 24 Jun 2015 10:29:19 +0000 (11:29 +0100)]
Removed DepthIndex methods from public-api

Needs: https://review.tizen.org/gerrit/#/c/42201/
       https://review.tizen.org/gerrit/#/c/42203/

Change-Id: If6a14183e3d4f87125484b1dd4ff88b8aae38832
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMove new mesh API to devel-api 97/42197/1
Francisco Santos [Tue, 23 Jun 2015 13:10:19 +0000 (14:10 +0100)]
Move new mesh API to devel-api

Change-Id: I35c1dbf42048a468ee0b51d4913b8f393322fe22

9 years agoMerge "Revert "Move new mesh API to devel-api"" into devel/new_mesh
Kimmo Hoikka [Wed, 24 Jun 2015 10:05:41 +0000 (03:05 -0700)]
Merge "Revert "Move new mesh API to devel-api"" into devel/new_mesh

9 years agoRevert "Move new mesh API to devel-api" 94/42194/1
Kimmo Hoikka [Wed, 24 Jun 2015 10:05:33 +0000 (03:05 -0700)]
Revert "Move new mesh API to devel-api"

This reverts commit 174599e5921a33ac4b457369d9d96cc204741970.

Change-Id: I443072220d03adf27f109b67b06749c999f2f36b

9 years agoMerge changes I539c58fc,I6e1141c1 into devel/new_mesh
Kimmo Hoikka [Wed, 24 Jun 2015 09:59:26 +0000 (02:59 -0700)]
Merge changes I539c58fc,I6e1141c1 into devel/new_mesh

* changes:
  Move new mesh API to devel-api
  Update profiling of objects with new mesh objects.

9 years agoMerge "Add behaviour for 2D / 3D layers." into devel/new_mesh
Kimmo Hoikka [Wed, 24 Jun 2015 09:58:59 +0000 (02:58 -0700)]
Merge "Add behaviour for 2D / 3D layers." into devel/new_mesh

9 years agoMerge "Fix for signals not being received on an Atlas upload" into devel/new_mesh
Kimmo Hoikka [Wed, 24 Jun 2015 09:58:30 +0000 (02:58 -0700)]
Merge "Fix for signals not being received on an Atlas upload" into devel/new_mesh

9 years agoMove new mesh API to devel-api 31/42131/2
Francisco Santos [Tue, 23 Jun 2015 13:10:19 +0000 (14:10 +0100)]
Move new mesh API to devel-api

Change-Id: I539c58fcae42b8dccb1569c38ffb0f80de4c52f6

9 years agoUpdate profiling of objects with new mesh objects. 55/41855/8
Francisco Santos [Thu, 18 Jun 2015 16:12:23 +0000 (17:12 +0100)]
Update profiling of objects with new mesh objects.

Change-Id: I6e1141c1ddbdc1a0420f714d2a36a451835f9e64

9 years agoAdd behaviour for 2D / 3D layers. 37/40437/13
Francisco Santos [Tue, 2 Jun 2015 16:06:10 +0000 (17:06 +0100)]
Add behaviour for 2D / 3D layers.

Change-Id: I74c5a2b806cb154ba6483f4010b3520ef0ef10c6

9 years agoFix for signals not being received on an Atlas upload 95/42095/2
Richard Underhill [Tue, 23 Jun 2015 08:31:51 +0000 (09:31 +0100)]
Fix for signals not being received on an Atlas upload

Change-Id: I84d3a3d637496b584dc616c0423e0fad4e420a21
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoChange depth-index to non-animatable property. 07/41607/5
Francisco Santos [Tue, 16 Jun 2015 15:02:48 +0000 (16:02 +0100)]
Change depth-index to non-animatable property.

Change-Id: I5f27e5912de519cbd672cd1ced32cb81ae152411

9 years agoMerge "Fix prevent issue - Unsigned compared against 0" into devel/master
Adeel Kazmi [Fri, 19 Jun 2015 09:01:44 +0000 (02:01 -0700)]
Merge "Fix prevent issue - Unsigned compared against 0" into devel/master

9 years agoMerge "Fix UtcDaliObjectRegistryCopyConstructor" into devel/master
Adeel Kazmi [Fri, 19 Jun 2015 08:59:36 +0000 (01:59 -0700)]
Merge "Fix UtcDaliObjectRegistryCopyConstructor" into devel/master

9 years agoStop unnecessarily exporting ImageAttributes 77/41877/1
Andrew Cox [Thu, 18 Jun 2015 13:56:57 +0000 (14:56 +0100)]
Stop unnecessarily exporting ImageAttributes

Change-Id: Ifc37aab6819329e1ae9226a2d3a7621bc2babb2f
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoMerge "Remove a few unnecessary exports" into devel/master
Adeel Kazmi [Thu, 18 Jun 2015 13:24:39 +0000 (06:24 -0700)]
Merge "Remove a few unnecessary exports" into devel/master