platform/core/uifw/dali-core.git
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 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 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

9 years agoMerge "Stop unnecessarily exporting BitmapPackedPixel and BitmapCompressed" into...
Adeel Kazmi [Thu, 18 Jun 2015 13:22:33 +0000 (06:22 -0700)]
Merge "Stop unnecessarily exporting BitmapPackedPixel and BitmapCompressed" into devel/master

9 years agoRemoved Overlay override from hit-test-algorithm 45/41345/16
Richard Underhill [Thu, 18 Jun 2015 12:22:22 +0000 (13:22 +0100)]
Removed Overlay override from hit-test-algorithm

Change-Id: I3466823d209986261d0ffc2327313334c71a3091
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Fix prevent issue - GetCurrent() might return null" into devel/master
Kimmo Hoikka [Thu, 18 Jun 2015 12:31:37 +0000 (05:31 -0700)]
Merge "Fix prevent issue - GetCurrent() might return null" into devel/master

9 years agoStop unnecessarily exporting BitmapPackedPixel and BitmapCompressed 70/41870/2
Kimmo Hoikka [Thu, 18 Jun 2015 12:27:43 +0000 (13:27 +0100)]
Stop unnecessarily exporting BitmapPackedPixel and BitmapCompressed

Change-Id: I34904f7ce736b53cc8db7b75f42df769ea5e6787

9 years agoRemove a few unnecessary exports 51/41851/2
Kimmo Hoikka [Thu, 18 Jun 2015 10:21:33 +0000 (11:21 +0100)]
Remove a few unnecessary exports

Change-Id: I81b56ba3008d5099e383294c7718c0536252c1b8

9 years agoDALi Version 1.0.45 57/41857/1 dali_1.0.45
Xiangyin Ma [Thu, 18 Jun 2015 11:14:05 +0000 (12:14 +0100)]
DALi Version 1.0.45

Change-Id: I0e01fce20f0ec725e9931181f2e59297caef434f

9 years agoFix prevent issue - GetCurrent() might return null 19/41019/3
Yoonsang Lee [Thu, 11 Jun 2015 02:08:42 +0000 (11:08 +0900)]
Fix prevent issue - GetCurrent() might return null

- Internal::Stage::GetCurrent() might return null, so add null-checking
code

<Prevent message example>
[actor-impl.cpp]
2. returned_null: GetCurrent returns null. [show details]
CID 405268 (#1 of 1): Dereference null return value (NULL_RETURNS)
3. dereference: Dereferencing a pointer that might be null Dali::Internal::Stage::GetCurrent() when calling GetRenderTaskList. [show details]
1861    const RenderTaskList& taskList = Stage::GetCurrent()->GetRenderTaskList();

Change-Id: Icb306352a14c2660df89cb91261724d6f83b4983

9 years agoChange Property::Value::Get methods to return bool so developer can check if conversi... 02/41602/2
Kimmo Hoikka [Tue, 16 Jun 2015 14:29:25 +0000 (15:29 +0100)]
Change Property::Value::Get methods to return bool so developer can check if conversion is successfull

Change-Id: Ic91f7180412c7bfb81f572857a534fd653e52099

9 years agoMerge "Make mutex test variables volatile to prevent potential errors cused by optimi...
Adeel Kazmi [Tue, 16 Jun 2015 12:07:33 +0000 (05:07 -0700)]
Merge "Make mutex test variables volatile to prevent potential errors cused by optimizer" into devel/master

9 years agoMake mutex test variables volatile to prevent potential errors cused by optimizer 35/41535/1
Kimmo Hoikka [Tue, 16 Jun 2015 10:36:08 +0000 (11:36 +0100)]
Make mutex test variables volatile to prevent potential errors cused by optimizer

Change-Id: I94a455df9ef4fcca817b606220b4de2419649cd3

9 years agoMerge "Remove dali-any from Property::Value - reimplement multivalue using more effic...
Kimmo Hoikka [Mon, 15 Jun 2015 16:31:41 +0000 (09:31 -0700)]
Merge "Remove dali-any from Property::Value - reimplement multivalue using more efficient union inside value - remove unnecessary asserts when types dont match - cleanup and sanitize scripting - remove unnecessary templates from GetEnum, added error handling" into devel/master

9 years agoMerge "Fix prevent issue - animatableProperty might be null" into devel/master
Adeel Kazmi [Mon, 15 Jun 2015 15:32:49 +0000 (08:32 -0700)]
Merge "Fix prevent issue - animatableProperty might be null" into devel/master

9 years agoMerge "Fix prevent issue - pixbuf might be NULL" into devel/master
Adeel Kazmi [Mon, 15 Jun 2015 15:32:14 +0000 (08:32 -0700)]
Merge "Fix prevent issue - pixbuf might be NULL" into devel/master

9 years agoRemove dali-any from Property::Value 57/41357/2
Kimmo Hoikka [Fri, 12 Jun 2015 19:09:23 +0000 (20:09 +0100)]
Remove dali-any from Property::Value
- reimplement multivalue using more efficient union inside value
- remove unnecessary asserts when types dont match
- cleanup and sanitize scripting
- remove unnecessary templates from GetEnum, added error handling

Change-Id: Ifb4031a8a5bdd8887f3025d8950d6526cb5fab57

9 years agoUTC coverage for new mesh 34/39934/11
Xiangyin Ma [Tue, 26 May 2015 14:59:53 +0000 (15:59 +0100)]
UTC coverage for new mesh

Change-Id: Id31a7d7a4df92d97a077103a177ae20f81b53932

9 years agoFixed prevent defects 55/41155/3
suhyung Eom [Thu, 11 Jun 2015 10:07:52 +0000 (19:07 +0900)]
Fixed prevent defects

< Prevent message >
Dereference null return value (NULL_RETURNS)

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

9 years agoRemove uniform mappings. 48/40848/6
Francisco Santos [Tue, 9 Jun 2015 10:17:33 +0000 (11:17 +0100)]
Remove uniform mappings.

Change-Id: I4b735591476675ba390d36d36a283cc13c17f917

9 years agoFix incorrect radian constant value and radian test cases, make failing tests debugga... 01/41201/1
Kimmo Hoikka [Thu, 11 Jun 2015 12:40:03 +0000 (13:40 +0100)]
Fix incorrect radian constant value and radian test cases, make failing tests debuggable (by not catching the exception)

Change-Id: I150380290104d8ce442168ff3ce722b7f790d8f1

9 years agoFix UtcDaliObjectRegistryCopyConstructor 91/41191/1
Yoonsang Lee [Thu, 11 Jun 2015 11:54:53 +0000 (20:54 +0900)]
Fix UtcDaliObjectRegistryCopyConstructor

- Just tet_result( TET_PASS ); does not test anything.

Change-Id: I20801fba50f718c52e436944c000f742eeaf6950

9 years agoDALi Version 1.0.44 43/41143/1 dali_1.0.44
Tom Robinson [Thu, 11 Jun 2015 09:46:01 +0000 (10:46 +0100)]
DALi Version 1.0.44

Change-Id: I43d657eb8fb91c70445e1220b1267bc8a0d7c0c3

9 years agoFix prevent issue - Unsigned compared against 0 21/40921/2
Yoonsang Lee [Wed, 10 Jun 2015 08:36:07 +0000 (17:36 +0900)]
Fix prevent issue - Unsigned compared against 0

- Since t/step can be negative number, min = static_cast<int>(t/step); and
if( min < 0) might cause unexpected behavior.
- Introduce new float tLocation variable instead of direct assigning
t/step to unsigned min variable.

<Prevent message>
CID 436228 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
unsigned_compare: This less-than-zero comparison of an unsigned value is never true. min < 0U.
 95        if( min < 0)

Change-Id: Id1be5aaf7a03f04f9cf61b1ad947f08bacb78563

9 years agoFix prevent issue - animatableProperty might be null 18/40918/3
Yoonsang Lee [Wed, 10 Jun 2015 08:21:49 +0000 (17:21 +0900)]
Fix prevent issue - animatableProperty might be null

- animatableProperty might be null, so move dereferencing code into the null
check block

<Prevent message>
8. var_compare_op: Comparing animatableProperty to null implies that animatableProperty might be null.
1235        if(!animatableProperty)

CID 385005 (#1 of 1): Dereference after null check (FORWARD_NULL)
10. var_deref_op: Dereferencing null pointer animatableProperty.
1245        mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, typeInfo->GetComponentIndex(index), animatableProperty->type, animatableProperty->GetSceneGraphProperty() ) );

Change-Id: Ibf6a6670e258b8729b86da80991e0a3ece64452e

9 years agoFix prevent issue - pixbuf might be NULL 20/40920/1
Yoonsang Lee [Wed, 10 Jun 2015 08:29:13 +0000 (17:29 +0900)]
Fix prevent issue - pixbuf might be NULL

- GetBuffer() might return null, so move pixbuf dereferencing code into
the null checked block

<Prevent message>
2. returned_null: GetBuffer returns null. [show details]
3. var_assigned: Assigning: pixbuf = null return value from GetBuffer.
225    PixelBuffer* pixbuf = imageData->GetBuffer();

CID 402177 (#1 of 1): Dereference null return value (NULL_RETURNS)
7. dereference: Dereferencing a pointer that might be null pixbuf when calling memset. [Note: The source code implementation of the function has been overridden by a builtin model.]
253      memset( pixbuf, a, numPixels );

Change-Id: Ia35e1cb4ea2f04eac6dccbb4b8935b2c54905062

9 years agoRemoved GeometryType from ShaderEffect and ShaderSubType 25/40425/5
Andrew Cox [Wed, 3 Jun 2015 12:35:32 +0000 (13:35 +0100)]
Removed GeometryType from ShaderEffect and ShaderSubType

Needs this in toolkit:
https://review.tizen.org/gerrit/#/c/40841/

Change-Id: I24417fce49eedf63e6eceebd31acc887fe23b980
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoMerge "Added getter for the shader in Material" into devel/new_mesh
Kimmo Hoikka [Tue, 9 Jun 2015 13:23:17 +0000 (06:23 -0700)]
Merge "Added getter for the shader in Material" into devel/new_mesh

9 years agoChanged dynamics variable and UTC tests to use pkgconfig 13/40813/2
Tom Robinson [Mon, 8 Jun 2015 17:41:36 +0000 (18:41 +0100)]
Changed dynamics variable and UTC tests to use pkgconfig

Change-Id: I8b6a6ddbe144c113ab478e9c861207491f755c8e

9 years agoAdded parameter in OnStageConnection method indicating the depth of the actor 31/40431/10
Ferran Sole [Wed, 3 Jun 2015 13:46:05 +0000 (14:46 +0100)]
Added parameter in OnStageConnection method indicating the depth of the actor
in the hierarchy.

Change-Id: I68965e1df12840953e416221f1c539d0fa4004c1

9 years agoAdded getter for the shader in Material 54/40754/3
Ferran Sole [Mon, 8 Jun 2015 16:54:23 +0000 (17:54 +0100)]
Added getter for the shader in Material

Change-Id: I87cc41ad9a0a14cbfcaa18dd59c63626e855387c

9 years agoView frustum culling in update. 42/39342/19
Richard Underhill [Fri, 29 May 2015 12:39:00 +0000 (13:39 +0100)]
View frustum culling in update.

Change-Id: I6f2d1ccfddb703640d88619be75fd91562f8b6cd
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMerge "Remove extension from shader." into devel/new_mesh
Adeel Kazmi [Tue, 9 Jun 2015 09:51:37 +0000 (02:51 -0700)]
Merge "Remove extension from shader." into devel/new_mesh

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 32/40732/2
Francisco Santos [Thu, 4 Jun 2015 16:12:13 +0000 (17:12 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-internal/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-internal/utc-Dali-MeshActor.cpp
automated-tests/src/dali-internal/utc-Dali-MeshData.cpp
automated-tests/src/dali/CMakeLists.txt.in
dali/internal/event/actors/layer-impl.h
dali/internal/event/common/type-info-impl.cpp
dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/file.list
dali/public-api/actors/layer.cpp
dali/public-api/actors/layer.h

Change-Id: Id8a451346a2b5c92276cd38bb63fde1e01036455

9 years ago(AutomatedTests) Split internal tests to Devel & internal 29/40729/1
Adeel Kazmi [Mon, 8 Jun 2015 11:06:28 +0000 (12:06 +0100)]
(AutomatedTests) Split internal tests to Devel & internal

Change-Id: I7258d887c23e4cb4266d5ceab66d91025779eb50

9 years agoDALi Version 1.0.43 88/40488/1 dali_1.0.43
Richard Huang [Thu, 4 Jun 2015 10:05:53 +0000 (11:05 +0100)]
DALi Version 1.0.43

Change-Id: I1cc45e6fceec7dd4f21860371b248c9711783622

9 years agoUTC public API updates: camera-actor.h 92/38492/8
Tom Robinson [Tue, 21 Apr 2015 09:55:06 +0000 (10:55 +0100)]
UTC public API updates: camera-actor.h

Change-Id: I21642b2a0861fd2ab45a51ff8cf1c307456fa2f4

9 years agoMerge "Change default resize policy to USE_NATURAL_SIZE and fix UTC tests" into tizen
Kimmo Hoikka [Wed, 3 Jun 2015 16:12:42 +0000 (09:12 -0700)]
Merge "Change default resize policy to USE_NATURAL_SIZE and fix UTC tests" into tizen

9 years agoMerge "Consider loading to be complete when no resource ID is set" into tizen
Kimmo Hoikka [Wed, 3 Jun 2015 16:11:59 +0000 (09:11 -0700)]
Merge "Consider loading to be complete when no resource ID is set" into tizen

9 years agoRemove extension from shader. 28/40428/3
Francisco Santos [Wed, 3 Jun 2015 13:05:15 +0000 (14:05 +0100)]
Remove extension from shader.

Change-Id: I5ec96696f5fe0ac0b568f607f7eaf98344f20712

9 years agoMerge changes I7fd36a6d,I2c2e4fe7 into devel/new_mesh
Adeel Kazmi [Wed, 3 Jun 2015 15:09:14 +0000 (08:09 -0700)]
Merge changes I7fd36a6d,I2c2e4fe7 into devel/new_mesh

* changes:
  Remove animatable property-buffer API.
  Fix default value of blend color.

9 years ago(AutomatedTests) Exclude installed headers from coverage 08/40408/2
Adeel Kazmi [Wed, 3 Jun 2015 10:45:34 +0000 (11:45 +0100)]
(AutomatedTests) Exclude installed headers from coverage

Change-Id: Ie227dcbaa756bfc61b4fa197ebe74ce18506955a

9 years agoChange default resize policy to USE_NATURAL_SIZE and fix UTC tests 29/40429/3
Tom Robinson [Wed, 3 Jun 2015 13:26:56 +0000 (14:26 +0100)]
Change default resize policy to USE_NATURAL_SIZE and fix UTC tests

Change-Id: I4d223222b6928f8a1801a036b24d9eade18f5e7a

9 years agoRemove animatable property-buffer API. 67/40167/4
Francisco Santos [Fri, 29 May 2015 16:16:03 +0000 (17:16 +0100)]
Remove animatable property-buffer API.

Change-Id: I7fd36a6d530b1272f66025fd834239dcde6c71ed

9 years agoFix default value of blend color. 88/40088/3
Francisco Santos [Thu, 28 May 2015 16:25:32 +0000 (17:25 +0100)]
Fix default value of blend color.

Also added caching in context.

Change-Id: I2c2e4fe7ab0ffede7006047128f989dcdf994349

9 years agoConsider loading to be complete when no resource ID is set 18/40418/5
Paul Wisbey [Wed, 3 Jun 2015 12:05:27 +0000 (13:05 +0100)]
Consider loading to be complete when no resource ID is set

Change-Id: I4d68cde636b6dae4460dd537c3989f428587b87e

9 years agoRemove multiple programs from SceneGraph::Shader 13/40413/4
Andrew Cox [Mon, 1 Jun 2015 16:23:58 +0000 (17:23 +0100)]
Remove multiple programs from SceneGraph::Shader

Change-Id: Ib523cb7ce27be9689a3c54372c562f2ad9ee7606
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoUTC public API updates: stage.h 61/38361/16
Tom Robinson [Fri, 17 Apr 2015 13:32:11 +0000 (14:32 +0100)]
UTC public API updates: stage.h

Includes build fix for utc dynamics tests.

Includes moving Dynamics API from stage.h to dynamics-world.h in the form of static creator, destroyer and getter.

Change-Id: I5c44e47ff6572144067c960ee8c88896a7b3e193

9 years agoUTC missing tests for TypeInfo & NativeImageInterface 42/40242/2
Lee Morgan [Mon, 1 Jun 2015 10:24:16 +0000 (11:24 +0100)]
UTC missing tests for TypeInfo & NativeImageInterface

Change-Id: I9aa4b337c6e1f03460668c678731d5398c105299

9 years agoAdded getters in Renderer to get material and geometry, and in Material to get samplers 96/39796/3
Ferran Sole [Fri, 22 May 2015 11:26:53 +0000 (12:26 +0100)]
Added getters in Renderer to get material and geometry, and in Material to get samplers

Change-Id: Ib290d16ff63fe35cb1d7925e153c4ee6bfc6bee1

9 years agoAdd UTC for Stage::WheelEventSignal() 90/40190/1
Heeyong Song [Mon, 1 Jun 2015 02:58:22 +0000 (11:58 +0900)]
Add UTC for Stage::WheelEventSignal()

Change-Id: I1678e98453e07c6c15415faf6cc54a67e778afad

9 years agoMerge "Remove std::vector from public api" into tizen
Kimmo Hoikka [Fri, 29 May 2015 17:38:39 +0000 (10:38 -0700)]
Merge "Remove std::vector from public api" into tizen

9 years agoRemove std::vector from public api 54/40154/8
Lee Morgan [Fri, 29 May 2015 13:17:33 +0000 (14:17 +0100)]
Remove std::vector from public api

Change-Id: Id5905d7fe7ec8b871e251245a4d86449d9b62ab9

9 years agoMerge "Move native-image-interface.h and image-operations.h to public-api" into tizen
Kimmo Hoikka [Fri, 29 May 2015 15:44:43 +0000 (08:44 -0700)]
Merge "Move native-image-interface.h and image-operations.h to public-api" into tizen

9 years agoMerge "Remove String::EMPTY" into tizen
Kimmo Hoikka [Fri, 29 May 2015 15:44:06 +0000 (08:44 -0700)]
Merge "Remove String::EMPTY" into tizen

9 years agoMerge "Change WheelEvent" into tizen
Adeel Kazmi [Fri, 29 May 2015 14:34:33 +0000 (07:34 -0700)]
Merge "Change WheelEvent" into tizen

9 years agoRemove String::EMPTY 56/40156/1
Adeel Kazmi [Fri, 29 May 2015 13:39:53 +0000 (14:39 +0100)]
Remove String::EMPTY

Change-Id: I76d3f352b4c3d7c8c801b9edd70f4b970d3ba0aa

9 years agoMove native-image-interface.h and image-operations.h to public-api 34/40134/3
Nick Holland [Fri, 29 May 2015 10:28:57 +0000 (11:28 +0100)]
Move native-image-interface.h and image-operations.h to public-api

Homescreen app is using native-image.
image-operations should not have been moved to devel-api as it's
included by resource-image.h

Change-Id: Ibf4227bd636c034c039c25c0934821415e657d07

9 years agoChange WheelEvent 16/40116/2
Heeyong Song [Fri, 29 May 2015 08:34:47 +0000 (17:34 +0900)]
Change WheelEvent

  - Replace MouseWheelEvent with WheelEvent
  - Add custom wheel event type

Change-Id: I6740fa5a1fe41475de488c117ff442dba39abdcb

9 years agoFix for RelayoutController. 28/40128/2
Victor Cebollada [Thu, 28 May 2015 14:46:10 +0000 (15:46 +0100)]
Fix for RelayoutController.

Request to process events on idle if core is not processing events.

Change-Id: Ib7d3fed2fb68add0602694c6d5aa59b4fd3346d6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoDALi Version 1.0.42 06/40106/1 accepted/tizen/common/20150529.134047 dali_1.0.42 submit/tizen/20150529.082236
Adeel Kazmi [Fri, 29 May 2015 08:01:03 +0000 (09:01 +0100)]
DALi Version 1.0.42

Change-Id: I4a3911777dbdef533911c51b8521d09ec044d10f

9 years ago(AutomatedTests) Pushed line & function coverage of public API up 91/40091/1
Adeel Kazmi [Thu, 28 May 2015 18:32:35 +0000 (19:32 +0100)]
(AutomatedTests) Pushed line & function coverage of public API up

Change-Id: I01b33cf0d616e8c622745b1f9b2d165ee93df957

9 years ago(AutomatedTests) Move devel-api dependent tests to internal tests 81/40081/1
Adeel Kazmi [Thu, 28 May 2015 14:50:35 +0000 (15:50 +0100)]
(AutomatedTests) Move devel-api dependent tests to internal tests

TODO:
 - Stage: Move Dynamics API to Dynamics World
 - RenderTask: Uses HitTestAlgorithm, need to modify that test
 - TestNativeImage: Uses devel-api and is included by several image tests

Change-Id: I6f96b4d876c2418d3df99187786347ddd79defcd

9 years agoMore UTC test cases 68/40068/1
Nick Holland [Thu, 28 May 2015 11:53:10 +0000 (12:53 +0100)]
More UTC test cases

100% line coverage for

base-signal.cpp
base-signal.h
callback.cpp
callback.h
connection-tracker-interface.cpp
connection-tracker.cpp
dali-signal.h
functor-delegate.cpp
functor-delegate.h
signal-slot-connections.cpp
signal-slot-observers.cpp
slot-delegate.h

Change-Id: Ied3049844e9723a6fd06710e3ce508e1093c356f

9 years agoRemove PropagateRelayoutFlags() from Actor 16/40016/2
Xiangyin Ma [Wed, 27 May 2015 15:26:30 +0000 (16:26 +0100)]
Remove PropagateRelayoutFlags() from Actor

Change-Id: Ia1fb8124c4ed75c6c351b2d68b9846e39bfbe16b

9 years agoIncrease UTC coverage public/object 93/39993/3
Nick Holland [Wed, 27 May 2015 09:26:07 +0000 (10:26 +0100)]
Increase UTC coverage public/object

line coverage, function coverage.
any.cpp ( 100%, 100% )
any.h   ( 100%, 79.3% )  not possible to get 100% function coverage due to template usage)
base-handle.h ( 92.9%, 100% ) not possible to get 100% line coverage
base-handle.cpp ( 100%, 100% )
base-object.cpp ( 100%, 90.9% ) not possible to get 100% function coverage
base-object.h ( 100%, 100% )
handle.cpp (100%, 100% )
handle.h ( 100%, 100% )
object-registry.cpp ( 100%, 100% )
object-registry.h ( 100%, 100% )

Change-Id: I4ed9f0ea5812da2409215be9842deccb21d57fe6