platform/core/uifw/dali-core.git
9 years agoCustomActorImpl extension and test case 40/39940/1
Kimmo Hoikka [Tue, 26 May 2015 16:20:40 +0000 (17:20 +0100)]
CustomActorImpl extension and test case

Change-Id: I0d1b330779f68e265e6b534cc955ade107d2699e

9 years agoMerge "Add utc test cases" into tizen accepted/tizen/common/20150529.134107 accepted/tizen/mobile/20150529.134836 accepted/tizen/tv/20150529.134909 accepted/tizen/wearable/20150529.134852 submit/tizen/20150529.084413
HyunJu Shin [Mon, 25 May 2015 08:49:15 +0000 (01:49 -0700)]
Merge "Add utc test cases" into tizen

9 years agoAdd utc test cases 58/39858/1
Heeyong Song [Mon, 25 May 2015 08:43:31 +0000 (17:43 +0900)]
Add utc test cases

Change-Id: I057a8acd569784e367b2492423e9d557a8848603

9 years agoUpdate UTC for EncodedBufferImage 57/39857/1
Yoonsang Lee [Mon, 25 May 2015 08:19:40 +0000 (17:19 +0900)]
Update UTC for EncodedBufferImage

Change-Id: Ibc7690f8065c47f952807b650b77d1afe7b825a2

9 years agoMerge "Changed hit test documentation for unconsumed events" into tizen
Kimmo Hoikka [Fri, 22 May 2015 16:29:48 +0000 (09:29 -0700)]
Merge "Changed hit test documentation for unconsumed events" into tizen

9 years agoChanged hit test documentation for unconsumed events 02/38602/3
David Steele [Wed, 22 Apr 2015 14:38:27 +0000 (15:38 +0100)]
Changed hit test documentation for unconsumed events

Stage is used for receiving up/down events to the screen regardless of
actor event handling and consumption.

Instead, the stage's root layer should be used to catch unconsumed events

Change-Id: I83b55d53f50bee8cb466bb9d6d9eeb5e70df4229
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
9 years agoAdd UTCs for CustomActor and CustomActorImpl 76/39776/4
taeyoon [Fri, 22 May 2015 06:13:46 +0000 (15:13 +0900)]
Add UTCs for CustomActor and CustomActorImpl

Change-Id: Icae2a9a189c497298fd72fe5e6652c8a087c9bae

9 years agoChanged depth sorting algorithm. 98/38698/9
David Steele [Fri, 24 Apr 2015 17:39:51 +0000 (18:39 +0100)]
Changed depth sorting algorithm.

Opaque items are sorted first by depth index, then by Shader, Geometry and Material.
Transparent items are sorted first by depth index, then by distance from camera, then by
Shader, Geometry and Material.

Changed the render algorithm to interleave the opaque and transparent lists for
items at the same depth index.

Change-Id: I2c21c986d790a4ac0f2a519e1bb58242537f4f8a
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoMerge "Put lockless-buffer in the correct folder & ensure local headers are picked...
Kimmo Hoikka [Thu, 21 May 2015 16:28:10 +0000 (09:28 -0700)]
Merge "Put lockless-buffer in the correct folder & ensure local headers are picked before installed" into tizen

9 years agoMerge "Update UTC for quaternion.h" into tizen
Kimmo Hoikka [Thu, 21 May 2015 16:25:58 +0000 (09:25 -0700)]
Merge "Update UTC for quaternion.h" into tizen

9 years agoMerge "Fix UTCs for EncodedBufferImage & HitTestAlgorithm" into tizen
Kimmo Hoikka [Thu, 21 May 2015 16:25:32 +0000 (09:25 -0700)]
Merge "Fix UTCs for EncodedBufferImage & HitTestAlgorithm" into tizen

9 years agoAdded test cases and fixed bugs 66/39566/2
David Steele [Mon, 18 May 2015 19:04:04 +0000 (20:04 +0100)]
Added test cases and fixed bugs

Added test cases for property values on each property owner,
testing constraints and animations on these properties.

Checked that using the properties as uniform maps correctly
set the right uniform in the shader program.

Added tests for uniform mapping
 - checked the precedence of each object
 - checked the collection of uniform maps and types was correct

Change-Id: Iffc5ce9d94a2c14401bee8c568208dc7bdd91cf3

9 years agoFix return value of implementation alignment. 38/39738/1
Francisco Santos [Thu, 21 May 2015 14:44:46 +0000 (15:44 +0100)]
Fix return value of implementation alignment.

Change-Id: I53388938ec7778a0634a0181f2b3b51f29d38eb0

9 years agoPut lockless-buffer in the correct folder & ensure local headers are picked before... 18/39718/3
Adeel Kazmi [Thu, 21 May 2015 11:10:47 +0000 (12:10 +0100)]
Put lockless-buffer in the correct folder & ensure local headers are picked before installed

Also 100% constraint coverage

Change-Id: I7262d610a7bf7fcc4106115bc0e855ad1baa813f

9 years agoFixes crash after merge from tizen. 82/39682/4
Francisco Santos [Wed, 20 May 2015 18:06:49 +0000 (19:06 +0100)]
Fixes crash after merge from tizen.

Change-Id: Ic322d76fb22ddb18cd3c558e89583ceb0b0c3c09

9 years agoFix property buffers data types passed in to GL. 63/39563/3
Francisco Santos [Mon, 18 May 2015 18:24:50 +0000 (19:24 +0100)]
Fix property buffers data types passed in to GL.

Change-Id: I869f7d3a50cab9670c1005c948389991f30a3776

9 years agoAdded Test cases for Constraints 60/39560/4
Adeel Kazmi [Mon, 18 May 2015 17:39:46 +0000 (18:39 +0100)]
Added Test cases for Constraints

Change-Id: I0d6b2d1c243e7a722dcd40a4c06bc904b541c47b

9 years agoAdd extension to PropertyInput 95/39495/2
Nick Holland [Fri, 15 May 2015 16:08:18 +0000 (17:08 +0100)]
Add extension to PropertyInput

Change-Id: Id4b533d23b8471f7687035bfc2a97fe9ef1535ee

9 years agoFix CallbackBase::Execute assertion to arise in both debug/release build 26/39626/1
Yoonsang Lee [Wed, 20 May 2015 02:36:18 +0000 (11:36 +0900)]
Fix CallbackBase::Execute assertion to arise in both debug/release build

- DALI_ASSERT_DEBUG -> DALI_ASSERT_ALWAYS
- With DALI_ASSERT_DEBUG, UtcDaliSignalConnectN01() only passes in case
of debug build.
- If an exception is required for null signal callback, it should arise
in both debug / release build.

Change-Id: I2b89889c86da8d8e3336a69377bfbad8e1d0d02b

9 years agoMerge "Cleaning up size negotiation - Check for recursive SetSize from inside OnSizeS...
Adeel Kazmi [Tue, 19 May 2015 13:37:26 +0000 (06:37 -0700)]
Merge "Cleaning up size negotiation - Check for recursive SetSize from inside OnSizeSet - Dont call onSizeSet unless size actually changed - Fix width for height to treat 0 size as 1:1 aspect ratio - Add base helpers for width for height" into tizen

9 years agoTests for IntrusivePtr and deleted ScopedPointer 64/39564/2
Andrew Cox [Mon, 18 May 2015 18:25:45 +0000 (19:25 +0100)]
Tests for IntrusivePtr and deleted ScopedPointer

One last test still to do.

Change-Id: I10345cf9baf29ae1492f1940cbccdcd0a18712b1
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoCleaning up size negotiation 58/39558/2
Kimmo Hoikka [Mon, 18 May 2015 17:02:10 +0000 (18:02 +0100)]
Cleaning up size negotiation
- Check for recursive SetSize from inside OnSizeSet
- Dont call onSizeSet unless size actually changed
- Fix width for height to treat 0 size as 1:1 aspect ratio
- Add base helpers for width for height

Change-Id: Ib8bd5f3e347df0d66ea504f659c3c416800be4fb

9 years agoUpdate UTC for quaternion.h 02/37902/4
Yoonsang Lee [Wed, 8 Apr 2015 08:03:34 +0000 (17:03 +0900)]
Update UTC for quaternion.h

Change-Id: Ib15077a7cbeb3267d994a042f584dc7e5e3b957a

9 years agoAdded Dali::Path test cases for DownCast and assignment operator 93/39593/1
Ferran Sole [Tue, 19 May 2015 08:19:17 +0000 (09:19 +0100)]
Added Dali::Path test cases for DownCast and assignment operator

Change-Id: I9aeae9bd022ac6ba90a4c513428713f2a89059e9

9 years agoFix UTCs for EncodedBufferImage & HitTestAlgorithm 91/38591/3
Yoonsang Lee [Wed, 22 Apr 2015 10:28:11 +0000 (19:28 +0900)]
Fix UTCs for EncodedBufferImage & HitTestAlgorithm

- UtcDaliEncodedBufferImageNew02, UtcDaliEncodedBufferImageNew03 :
Assertion message can be different depending on --enable-debug flag, so
remove code to check assertion message.
- UtcDaliHitTestAlgorithmOrtho02 : Maybe due to different machine
precision, the desktop & m0 report different results. So change to
epsilon based comparision to pass for both environments.

Change-Id: I1c5a528a59fd64d7dfb62f05c9222dd428162886

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 62/39562/1
Francisco Santos [Mon, 18 May 2015 16:47:03 +0000 (17:47 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Change-Id: I7a43438cd1bff11bcd1093e147432246a758084e

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 56/39556/1
Francisco Santos [Mon, 18 May 2015 16:19:43 +0000 (17:19 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-internal/utc-Dali-Internal-Mesh.cpp
automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali/utc-Dali-MeshActor.cpp
automated-tests/src/dali/utc-Dali-MeshData.cpp
dali/devel-api/actors/mesh-actor.cpp
dali/devel-api/actors/mesh-actor.h
dali/devel-api/dynamics/dynamics-shape.h
dali/devel-api/geometry/animatable-mesh.cpp
dali/devel-api/geometry/animatable-mesh.h
dali/devel-api/geometry/animatable-vertex.cpp
dali/devel-api/geometry/animatable-vertex.h
dali/devel-api/geometry/cloth.cpp
dali/devel-api/geometry/cloth.h
dali/devel-api/geometry/mesh-data.cpp
dali/devel-api/geometry/mesh-data.h
dali/devel-api/geometry/mesh-factory.cpp
dali/devel-api/geometry/mesh-factory.h
dali/devel-api/geometry/mesh.cpp
dali/devel-api/geometry/mesh.h
dali/devel-api/modeling/bone.cpp
dali/devel-api/modeling/bone.h
dali/devel-api/modeling/material.cpp
dali/devel-api/modeling/material.h
dali/integration-api/dynamics/dynamics-body-intf.h
dali/integration-api/dynamics/dynamics-shape-intf.h
dali/internal/event/actor-attachments/mesh-attachment-impl.h
dali/internal/event/actors/mesh-actor-impl.h
dali/internal/event/modeling/animatable-mesh-impl.h
dali/internal/event/modeling/cloth-impl.h
dali/internal/event/modeling/material-impl.h
dali/internal/event/modeling/mesh-impl.cpp
dali/internal/event/modeling/mesh-impl.h
dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp
dali/internal/update/modeling/internal-mesh-data.h
dali/internal/update/node-attachments/scene-graph-mesh-attachment.h
dali/internal/update/resources/resource-manager.cpp
dali/public-api/actors/renderable-actor.cpp
dali/public-api/actors/renderable-actor.h
dali/public-api/dali-core.h
dali/public-api/file.list

Change-Id: I43f0cad38d302fde14bde4288825d6f15443d43c

9 years agoAdded test cases and fix bug in property buffer reupload. 46/39546/1
Francisco Santos [Mon, 18 May 2015 13:07:37 +0000 (14:07 +0100)]
Added test cases and fix bug in property buffer reupload.

Change-Id: Ibe695e96183396ee9fdf3d81a3fe78d395dcbd83

9 years agoUTC tests; PropertyValue, Vector2/3/4, Matrix 47/39447/4
Lee Morgan [Wed, 22 Apr 2015 16:21:26 +0000 (17:21 +0100)]
UTC tests; PropertyValue, Vector2/3/4, Matrix

Change-Id: Ic2318531b7e1b9b558340e755bd7738547d701a3

9 years agoMove more public-api headers to devel-api. PART 2 88/39488/4
Nick Holland [Fri, 15 May 2015 10:59:33 +0000 (11:59 +0100)]
Move more public-api headers to devel-api. PART 2

Removed the following files from public-api and placed in devel-api

dali/public-api/actors/mesh-actor.h
dali/public-api/animation/path-constrainer.h
dali/public-api/common/hash.h
dali/public-api/common/mutex.h
dali/public-api/common/ref-counted-dali-vector.h
dali/public-api/common/scoped-pointer.h
dali/public-api/events/hit-test-algorithm.h
dali/public-api/geometry/animatable-mesh.h
dali/public-api/geometry/animatable-vertex.h
dali/public-api/geometry/cloth.h
dali/public-api/geometry/mesh-data.h
dali/public-api/geometry/mesh-factory.h
dali/public-api/geometry/mesh.h
dali/public-api/images/atlas.h
dali/public-api/images/distance-field.h
dali/public-api/images/image-operations.h
dali/public-api/images/native-image-interface.h
dali/public-api/modeling/bone.h
dali/public-api/modeling/material.h
dali/public-api/object/type-registry-helper.h

Change-Id: Id65fd245b761b3e326bfcb70ddb48f1b350fe17f

9 years agoFix crash in exit of dali applications 64/39464/1
Kimmo Hoikka [Fri, 15 May 2015 10:54:47 +0000 (11:54 +0100)]
Fix crash in exit of dali applications

[Problem] stage called rootactor.Remove( cameraActor ) during destruction, which attempts to kick start a size negotiation
[Solution] do not call Remove, just release the handle

Change-Id: I475f7fb17f45141ad001827db1f775a37e77eb78

9 years agoStore the property types for the update thread to use. 44/39444/1
Francisco Santos [Fri, 15 May 2015 09:08:14 +0000 (10:08 +0100)]
Store the property types for the update thread to use.

Change-Id: I1926045631009a09105c85ebebd32976cfc62fec

9 years agoCreate devel-api folder for header files used by Adaptor/Toolkit 00/39200/7
Nick Holland [Mon, 11 May 2015 13:15:12 +0000 (14:15 +0100)]
Create devel-api folder for header files used by Adaptor/Toolkit

Moved the following from public-api to devel-api:
map-wrapper
set-wrapper
dynamics

Change-Id: If8d7c30fa48c893e1433bc4cf0585ccffe55cc83

9 years agoMerge "Add dali-vector extension support for types that have destructor and/or copy...
Adeel Kazmi [Thu, 14 May 2015 15:40:37 +0000 (08:40 -0700)]
Merge "Add dali-vector extension support for types that have destructor and/or copy constructor but are still POD" into tizen

9 years agoAdd dali-vector extension support for types that have destructor and/or copy construc... 14/39414/3
Kimmo Hoikka [Thu, 14 May 2015 12:55:58 +0000 (13:55 +0100)]
Add dali-vector extension support for types that have destructor and/or copy constructor but are still POD

Change-Id: Ic4aa6336d6d3514d5c2d487d7550ae788be9eb70

9 years agoAdded PropertyValue Array as a class 03/39403/4
Lee Morgan [Tue, 12 May 2015 13:25:16 +0000 (14:25 +0100)]
Added PropertyValue Array as a class

Change-Id: If7dba0e31a53eada586a05a86bb2f23274645aee

9 years agoAPI for eager GLTexture Creation in NativeImage 97/37197/8
Andrew Cox [Tue, 17 Mar 2015 15:38:31 +0000 (15:38 +0000)]
API for eager GLTexture Creation in NativeImage

Change-Id: I975c87cfdb59921695ecfb8ceedd741df238297e
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoAdd missing header in property-buffer.h 25/39225/3
Francisco Santos [Fri, 8 May 2015 16:44:21 +0000 (17:44 +0100)]
Add missing header in property-buffer.h

Change-Id: I42be22d8614d795828c93e4b791d521c0a9170c3

9 years agoAdd GetImage method to Sampler. 46/39046/4
Francisco Santos [Wed, 6 May 2015 12:33:41 +0000 (13:33 +0100)]
Add GetImage method to Sampler.

Change-Id: I8be72f20287b1d62e7e539ea64aeb76a69e77f96

9 years agoCorrectly calculate alignment of members in propertyBuffers. 26/39226/4
Francisco Santos [Mon, 11 May 2015 18:16:36 +0000 (19:16 +0100)]
Correctly calculate alignment of members in propertyBuffers.

Change-Id: I7575c7ec1608517478f1a308f51d1eb90551e45f

9 years agoRemove ActorContainer typedef 09/39309/4
Nick Holland [Tue, 12 May 2015 13:03:52 +0000 (14:03 +0100)]
Remove ActorContainer typedef

Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files

Change-Id: I158193751290c01614f2a05211dd629bb5cf04fd

9 years agoMerge "Refactoring of path constraints + LinearConstrainer" into tizen
Adeel Kazmi [Wed, 13 May 2015 08:52:25 +0000 (01:52 -0700)]
Merge "Refactoring of path constraints + LinearConstrainer" into tizen

9 years agoRefactoring of path constraints + LinearConstrainer 51/38051/17
Ferran Sole [Thu, 9 Apr 2015 15:53:23 +0000 (16:53 +0100)]
Refactoring of path constraints + LinearConstrainer

- Renamed to PathConstrainer ( an object who applies constraints ).
- Added a base class (Constrainer) who is responsible for observing constrained objects
  and remove the constraints created when it is destroyed.
- Removed range property. Range is now specified in the 'apply' method.
- Added new properties "points" and "control-points" to specify the path.
- Added option to wrap source property value inside a given domain.
- Added LinearConstrainer object to constraint properties given a linear map

Change-Id: Iea89384808505881057c1d75d8e1929b14ecd3d3

9 years agoRemoved remaining references to glyph cache 02/39302/2
Paul Wisbey [Tue, 12 May 2015 14:52:43 +0000 (15:52 +0100)]
Removed remaining references to glyph cache

Change-Id: Ie476593b5d04cd5aecaed8eaee075325423b0840

9 years agoMerge "Reduce ImageActor & RenderableActor APIs" into tizen
Kimmo Hoikka [Tue, 12 May 2015 15:14:42 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen

9 years agodali-signal and connection tracker test cases 63/38363/8
Nick Holland [Fri, 17 Apr 2015 14:18:32 +0000 (15:18 +0100)]
dali-signal and connection tracker test cases

Added tests to match new test standard of 1 positive 1 negative
test per API (where possible).

Change-Id: I44e658891e504db21316ced0f621b661a45f7989

9 years agoRemove dependency to std::vector and property::value from property notification API 83/39283/3
Kimmo Hoikka [Tue, 12 May 2015 12:48:06 +0000 (13:48 +0100)]
Remove dependency to std::vector and property::value from property notification API

[Problem] inefficient API, unnecessary dependencies
[Solution] change to Dali::Vector

Change-Id: I579d1060c54444d725bcb24124f7e67a501289c2

9 years agoMerge "Fix uninitialized mResourceClient in NinePatchImage" into tizen
Kimmo Hoikka [Tue, 12 May 2015 10:56:41 +0000 (03:56 -0700)]
Merge "Fix uninitialized mResourceClient in NinePatchImage" into tizen

9 years agoReduce ImageActor & RenderableActor APIs 94/39194/1
Yoonsang Lee [Mon, 11 May 2015 12:23:49 +0000 (21:23 +0900)]
Reduce ImageActor & RenderableActor APIs

- Remove ImageActor::IsPixelAreaSet(), ClearPixelArea()
- Remove RenderableActor::SetBlendFunc(), SetBlendEquation(), GetBlendEquation(), SetBlendColor(), GetBlendColor()

Change-Id: I979f8c2ddf3af0716844568d62cc7caf9eb07433

9 years agoMerge "Remove unnecessary dead variable and unnecessary include" into tizen
Paul Wisbey [Fri, 8 May 2015 15:13:29 +0000 (08:13 -0700)]
Merge "Remove unnecessary dead variable and unnecessary include" into tizen

9 years agoDALi Version 1.0.41 95/39095/1 accepted/tizen/common/20150512.125112 accepted/tizen/mobile/20150513.005622 accepted/tizen/tv/20150513.005255 accepted/tizen/wearable/20150513.005508 dali_1.0.41 submit/tizen/20150511.143422
Nick Holland [Fri, 8 May 2015 12:52:12 +0000 (13:52 +0100)]
DALi Version 1.0.41

Change-Id: I8db45baf97da4ada478d61ae1a0072609d1dc8df

9 years agoRemove unnecessary dead variable and unnecessary include 53/39053/1
Kimmo Hoikka [Thu, 7 May 2015 13:05:28 +0000 (14:05 +0100)]
Remove unnecessary dead variable and unnecessary include

Change-Id: I92dea2209158ad0fb1ca04dade6c988089ea9bff

9 years agoFixed geometry hints property 27/39027/1
Lee Morgan [Fri, 1 May 2015 11:43:58 +0000 (12:43 +0100)]
Fixed geometry hints property

Change-Id: Id52fa1800a7a2daa786551d11b9dd8ce78e5feb3

9 years agoFix uninitialized mResourceClient in NinePatchImage 24/39024/1
Yoonsang Lee [Thu, 7 May 2015 08:38:40 +0000 (17:38 +0900)]
Fix uninitialized mResourceClient in NinePatchImage

Change-Id: I4b0f20ad6cc88d1e222e3aa5bc8b74bd6c58788f

9 years agoMerge "Allow registering property components for animatable properties" into tizen
Kimmo Hoikka [Tue, 5 May 2015 16:05:12 +0000 (09:05 -0700)]
Merge "Allow registering property components for animatable properties" into tizen

9 years agoCleaned up signed / unsigned mismatch in FixedSizeMemoryPool tests 70/38970/2
Andrew Cox [Fri, 24 Apr 2015 19:12:28 +0000 (20:12 +0100)]
Cleaned up signed / unsigned mismatch in FixedSizeMemoryPool tests

Was causing compiler warnings.

Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I2e8bf5ce9d2a6fd945bd112112c4731bcff61519

9 years agoBug fixes. 47/38947/1
Francisco Santos [Fri, 1 May 2015 10:53:26 +0000 (11:53 +0100)]
Bug fixes.

Change-Id: Idf22935143d681904417ed0e39cbce0ed8b0b6b9

9 years agoFixed uniform mapping crash 19/38919/3
David Steele [Thu, 30 Apr 2015 11:15:52 +0000 (12:15 +0100)]
Fixed uniform mapping crash

Change-Id: I7499c18ddb5ad4f878c6394c68c695ab03249ac8

9 years agoMerge "Remove un-used GetChildren internal actor api" into tizen
Adeel Kazmi [Fri, 1 May 2015 06:50:06 +0000 (23:50 -0700)]
Merge "Remove un-used GetChildren internal actor api" into tizen

9 years agoFix buffer used in the wrong scope. 36/38936/1
Francisco Santos [Thu, 30 Apr 2015 15:30:41 +0000 (16:30 +0100)]
Fix buffer used in the wrong scope.

Change-Id: Ie9f99e798423a810fe1dc9fa7f64ec791648f770

9 years agoRemove un-used GetChildren internal actor api 30/38930/2
Nick Holland [Thu, 30 Apr 2015 14:22:04 +0000 (15:22 +0100)]
Remove un-used GetChildren internal actor api

Change-Id: Iac7817dcd99315d102f033c56328a5ac8bbff52a

9 years agoEnsured shader blending hints override actor color 92/38792/4
David Steele [Tue, 28 Apr 2015 17:25:17 +0000 (18:25 +0100)]
Ensured shader blending hints override actor color

Changed scene-graph-material to have a blending policy set by
PrepareRender() that is used to determine how the actor should behave
w.r.t opacity.

Fixed the default blending options in the scene-graph-material.

Change-Id: Ic9f5a5410a3927cc0846af566d633e84d22c00c2
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoWired up material API for blending options 90/38790/2
David Steele [Tue, 28 Apr 2015 13:52:03 +0000 (14:52 +0100)]
Wired up material API for blending options

Added Blending source/destination factors for RBG and Alpha
Added Blending equations for RGB and Alpha

Added test cases for the above.

Changed properties for the above to non-animated, non-constrainable, implemented
the scene graph property with a double-buffered int to hold the bitmask.

Change-Id: I767c859ae959e69ff4500d81f7721f4e7e3b08a5

9 years agoDowngraded assert on SetUniform to a log error. 07/38607/3
David Steele [Wed, 22 Apr 2015 15:39:30 +0000 (16:39 +0100)]
Downgraded assert on SetUniform to a log error.

Change-Id: Id71cd9785f0a828745be9c49ab699e64ef74347c
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoAllow registering property components for animatable properties 87/38787/4
Richard Huang [Tue, 28 Apr 2015 13:04:20 +0000 (14:04 +0100)]
Allow registering property components for animatable properties

Use AnimatablePropertyComponentRegistration or DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION
to register property components for animatable properties that support property component (i.e.
Vector2, Vector3 or Vector4).

Change-Id: Ia9f780f75961b4b6ab90d7a45440c126dbc40c3f

9 years agoUse UNSIGNED_INTEGER for index buffers. 88/38888/1
Francisco Santos [Wed, 29 Apr 2015 16:21:43 +0000 (17:21 +0100)]
Use UNSIGNED_INTEGER for index buffers.

Change-Id: I0ae54acb4f1231f1b0bb3ccafaceded41f836b2b

9 years agoDALi Version 1.0.40 69/38869/1 dali_1.0.40
Lee Morgan [Wed, 29 Apr 2015 14:34:00 +0000 (15:34 +0100)]
DALi Version 1.0.40

Change-Id: Ic7c7d1e6e0384df33cbda5be10e34d77fcdbc317

9 years agoUpload property buffers when they change. 87/38887/1
Francisco Santos [Wed, 29 Apr 2015 12:57:39 +0000 (13:57 +0100)]
Upload property buffers when they change.

Change-Id: Ibb2f030c6dd001d5b2db3c169e37ae08dd4376c3

9 years agoFixed samplers using images with a load policy of ON_DEMAND 89/38689/3
David Steele [Fri, 24 Apr 2015 12:29:59 +0000 (13:29 +0100)]
Fixed samplers using images with a load policy of ON_DEMAND

Images that have an ON_DEMAND policy, such as ResourceImage and Atlas
delay getting their resource ticket until they are staged. Sampler
should not attempt to read the resource Id until the image has been
connected.

Change-Id: I20772d1505eb92256e937363f14c70ac73d238ab
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoAdded Blending handling for materials and renderers 54/38654/2
David Steele [Tue, 21 Apr 2015 15:52:39 +0000 (16:52 +0100)]
Added Blending handling for materials and renderers

Updated the material properties and data handlers to pass the blending
factors and equations through to the renderer.

Updated the RendererAttachment and SceneGraph::Material to determine
if blending is required.

Updated renderer to pass the depth index to the scene graph renderer
Ensured the scene graph renderer has it's properties reset. (WIP)
Temporarily copied the depth index to the existing sort modifier
(Allows the depth index to be used without changing ProcessRenderTasks)

Change-Id: I9eb98b67b8b0f79c9bf855203215cc96e94c112b
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoFix to avoid copy of non basic types. 63/38663/2
Francisco Santos [Thu, 23 Apr 2015 18:45:50 +0000 (19:45 +0100)]
Fix to avoid copy of non basic types.

Change-Id: I73f32a433f4b8884d49bb248ea55b28285c37cb8

9 years agoFix uninitialized pointer. 57/38657/2
Francisco Santos [Thu, 23 Apr 2015 16:19:36 +0000 (17:19 +0100)]
Fix uninitialized pointer.

Change-Id: I065b84af513803ef46f13bffacc46b0fdff0b8ff

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 81/38781/1
Francisco Santos [Mon, 27 Apr 2015 14:46:05 +0000 (15:46 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
dali/integration-api/profiling.cpp
dali/integration-api/resource-types.h
dali/internal/event/actor-attachments/actor-attachment-declarations.h
dali/internal/event/actors/actor-declarations.h
dali/internal/event/actors/actor-impl.h
dali/internal/event/common/object-impl.cpp
dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/event/resources/resource-client.cpp
dali/internal/event/resources/resource-client.h
dali/internal/event/resources/resource-type-path.cpp
dali/internal/file.list
dali/internal/render/renderers/scene-graph-text-renderer.cpp
dali/internal/render/renderers/scene-graph-text-renderer.h
dali/internal/render/shaders/program.cpp
dali/internal/render/shaders/program.h
dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h
dali/internal/update/manager/update-algorithms.cpp
dali/internal/update/manager/update-manager.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.h
dali/internal/update/resources/resource-manager.cpp
dali/internal/update/resources/resource-manager.h
dali/public-api/actors/actor.h
dali/public-api/actors/mesh-actor.cpp
dali/public-api/actors/mesh-actor.h
dali/public-api/dali-core.h
dali/public-api/file.list
dali/public-api/geometry/animatable-mesh.cpp
dali/public-api/geometry/animatable-mesh.h
dali/public-api/geometry/animatable-vertex.cpp
dali/public-api/geometry/animatable-vertex.h
dali/public-api/geometry/cloth.cpp
dali/public-api/geometry/cloth.h
dali/public-api/geometry/mesh-data.cpp
dali/public-api/geometry/mesh-data.h
dali/public-api/geometry/mesh-factory.cpp
dali/public-api/geometry/mesh-factory.h
dali/public-api/geometry/mesh.cpp
dali/public-api/geometry/mesh.h
dali/public-api/modeling/bone.cpp
dali/public-api/modeling/bone.h
dali/public-api/modeling/material.cpp
dali/public-api/modeling/material.h

Change-Id: Ibb8ab185f4e54f757d7de78be85ae6b537c7e7f4

9 years agoRemove boost from the build as well 22/38722/1
Adeel Kazmi [Mon, 27 Apr 2015 09:39:35 +0000 (10:39 +0100)]
Remove boost from the build as well

Change-Id: Ibfab3d31452b5b0715a705339b4e4b8a31ba0c32

9 years agoAlphaFunction refactoring 12/38412/21
Ferran Sole [Mon, 20 Apr 2015 13:35:58 +0000 (14:35 +0100)]
AlphaFunction refactoring

Removed all the alpha functions from public api. Alpha functions can now be
defined using an enum to use one of the predefined alpha functions, a pointer,
to define a custom alpha function, or two Vector2 which are used for cubic bezier
alpha function.

The new API is used as follows:

//Using a predefined alpha function
animation.AnimateTo( property, value, AlphaFunction::EASE_IN_OUT );

//Using a custom alpha function
animation.AnimateTo( property, value, &my_alpha_function );

//Using a bezier alpha function
animation.AnimateTo( property, value, AlphaFunction(Vector2(0.0f,1.0f),Vector2(1.0f,0.0f) ) );

Change-Id: I4051c752d826770447923b6e9a3215f2575d6370

9 years ago(Properties) OnPropertySet is called when any property is set 82/38682/4
Adeel Kazmi [Fri, 24 Apr 2015 10:33:48 +0000 (11:33 +0100)]
(Properties) OnPropertySet is called when any property is set

Change-Id: I075dca41b6bd975cd0a682ef62f4296d094334ab

9 years agoDALi Version 1.0.39 41/38641/1 dali_1.0.39
Xiangyin Ma [Thu, 23 Apr 2015 11:04:13 +0000 (12:04 +0100)]
DALi Version 1.0.39

Change-Id: I8e0aa8c61691b706a0b37549bf95d15ce24c83e5

9 years agoMerge "Added animation and constraint support for UNSIGNED_INTEGER property type...
Kimmo Hoikka [Wed, 22 Apr 2015 15:30:43 +0000 (08:30 -0700)]
Merge "Added animation and constraint support for UNSIGNED_INTEGER property type" into tizen

9 years agoType registry macros made namespace-generic: core 21/38521/3
Tom Robinson [Tue, 21 Apr 2015 14:14:53 +0000 (15:14 +0100)]
Type registry macros made namespace-generic: core

Change-Id: I730f9451fe8e92cef34e08c31c65efe2e001d8e5

9 years agoAdded animation and constraint support for UNSIGNED_INTEGER property type 03/37703/7
David Steele [Thu, 2 Apr 2015 15:30:42 +0000 (16:30 +0100)]
Added animation and constraint support for UNSIGNED_INTEGER property type

Change-Id: Idbb1a954584d2528a5de7912082054c0f4313d27

9 years agoMerge "Remove unnecessary stream operators from radian and degree as well as unnecess...
Adeel Kazmi [Wed, 22 Apr 2015 10:23:39 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen

9 years agoUpdate copyright year to 2015 for public api: core 97/38497/2
Tom Robinson [Tue, 21 Apr 2015 11:02:21 +0000 (12:02 +0100)]
Update copyright year to 2015 for public api: core

Change-Id: I5c250b9cbc7bfd8f44720f3b4969292db5da7d7b

9 years agoRemove unnecessary stream operators from radian and degree as well as unnecessary... 94/38494/4
Kimmo Hoikka [Tue, 21 Apr 2015 10:38:50 +0000 (11:38 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis

Change-Id: Ia9fe5699e21b938786508ba63a9082dcbbc99523

9 years agoFix wrong deletion. 05/38505/1
Francisco Santos [Tue, 21 Apr 2015 12:07:12 +0000 (13:07 +0100)]
Fix wrong deletion.

Change-Id: Ibcbba0859c7298e30e25716ffbd6b51f4f750a49

9 years agoFix Actor size negotiation test cases 93/38493/1
Kingsley Stephens [Tue, 21 Apr 2015 10:37:39 +0000 (11:37 +0100)]
Fix Actor size negotiation test cases

Change-Id: Id915d9f6c473e113ecea062233488d7eb6adb66a

9 years agoMerge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:34 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

9 years agoMerge "Remove ImageAttributes from public API" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:19 +0000 (10:11 -0700)]
Merge "Remove ImageAttributes from public API" into tizen

9 years agoMerge "Add size negotiation tests to Actor" into tizen
Adeel Kazmi [Mon, 20 Apr 2015 15:13:24 +0000 (08:13 -0700)]
Merge "Add size negotiation tests to Actor" into tizen

9 years agoSize negotiation patch 4: Remove SetRelayoutEnabled 77/38277/6
Kingsley Stephens [Tue, 14 Apr 2015 12:59:24 +0000 (13:59 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled

Change-Id: I051397fc53fe326ee377c8d36ac0b623201a4ea2

9 years agoRemove ImageAttributes from public API 13/37213/16
Andrew Cox [Fri, 20 Mar 2015 17:59:45 +0000 (17:59 +0000)]
Remove ImageAttributes from public API

The point is to clean up the API and bury ImageAttributes.
A later patch will rewrite internals not to use it at all.

Change-Id: I58c738101c61ab1dc2c7b25894c933006aa9da50
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoMerge "Constraint sources may be destroyed before Constraint::Apply()" into tizen
Adeel Kazmi [Mon, 20 Apr 2015 13:44:05 +0000 (06:44 -0700)]
Merge "Constraint sources may be destroyed before Constraint::Apply()" into tizen

9 years agoMerge "Added P/N test cases, fixed last 2 cases." into tizen
Paul Wisbey [Mon, 20 Apr 2015 13:02:35 +0000 (06:02 -0700)]
Merge "Added P/N test cases, fixed last 2 cases." into tizen

9 years agoAdd size negotiation tests to Actor 07/38407/1
Kingsley Stephens [Mon, 20 Apr 2015 10:30:40 +0000 (11:30 +0100)]
Add size negotiation tests to Actor

Change-Id: Iace20dec34a99c6ad5b6b0cdb709ee45db526399

9 years agoConstraint sources may be destroyed before Constraint::Apply() 70/38370/1
Paul Wisbey [Sat, 18 Apr 2015 13:48:55 +0000 (14:48 +0100)]
Constraint sources may be destroyed before Constraint::Apply()

Change-Id: I85fbd2cc4f1d7aa3e70888d0130f9ed4dcbf5a65

9 years agoMerge "Cleaned up Degree, Radian, AngleAxis and Quaternion classes - Inline Degree...
Kimmo Hoikka [Fri, 17 Apr 2015 18:13:33 +0000 (11:13 -0700)]
Merge "Cleaned up Degree, Radian, AngleAxis and Quaternion classes - Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code - Change AngleAxis to store a Radian angle for better accuracy - Make Quaternion explicitly take a Radian as constructor" into tizen

9 years agoAdded P/N test cases, fixed last 2 cases. 65/38365/1
David Steele [Fri, 17 Apr 2015 17:01:00 +0000 (18:01 +0100)]
Added P/N test cases, fixed last 2 cases.

UtcDaliRenderTaskOnce03 was expecting a behaviour that Dali should
have but doesn't - i.e. a draw should not happen if the scene does not
update, but currently, it renders twice more with the old render items.
Have fixed the test case to handle this.

UtcDaliRenderTaskOnce08 was broken - it didn't set the sync variable,
and thus could not get the finished signal. Have set it appropriately,
and corrected the test case.

Change-Id: Idf57356a5a2170ab27051bcd6b222613a3a1d8c3
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoMerge "Update UTC for type-registry.h" into tizen
Kimmo Hoikka [Fri, 17 Apr 2015 16:11:14 +0000 (09:11 -0700)]
Merge "Update UTC for type-registry.h" into tizen

9 years agoUpdate UTC for type-registry.h 32/38332/3
Richard Huang [Thu, 16 Apr 2015 14:54:05 +0000 (15:54 +0100)]
Update UTC for type-registry.h

Change-Id: Ie3db4bdc8410465fa9ad24a27230b5554d6152f9

9 years agoFixes and cleanup. 19/38219/6
Francisco Santos [Tue, 14 Apr 2015 18:51:11 +0000 (19:51 +0100)]
Fixes and cleanup.

Change-Id: I9ea103021ed0930428342f99525e18c322f5ebbc

9 years agoDynamics build fix 33/38333/1
Tom Robinson [Thu, 16 Apr 2015 15:36:44 +0000 (16:36 +0100)]
Dynamics build fix

Change-Id: I16aa313ecf6000e005bba5059a9fb815a5d1ab61