Kimmo Hoikka [Fri, 29 May 2015 15:44:06 +0000 (08:44 -0700)]
Merge "Remove String::EMPTY" into tizen
Adeel Kazmi [Fri, 29 May 2015 14:34:33 +0000 (07:34 -0700)]
Merge "Change WheelEvent" into tizen
Adeel Kazmi [Fri, 29 May 2015 13:39:53 +0000 (14:39 +0100)]
Remove String::EMPTY
Change-Id: I76d3f352b4c3d7c8c801b9edd70f4b970d3ba0aa
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
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
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>
Adeel Kazmi [Fri, 29 May 2015 08:01:03 +0000 (09:01 +0100)]
DALi Version 1.0.42
Change-Id: I4a3911777dbdef533911c51b8521d09ec044d10f
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
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
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
Xiangyin Ma [Wed, 27 May 2015 15:26:30 +0000 (16:26 +0100)]
Remove PropagateRelayoutFlags() from Actor
Change-Id: Ia1fb8124c4ed75c6c351b2d68b9846e39bfbe16b
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
Adeel Kazmi [Wed, 27 May 2015 16:14:39 +0000 (09:14 -0700)]
Merge "UTC test coverage" into tizen
Lee Morgan [Wed, 27 May 2015 10:50:49 +0000 (11:50 +0100)]
UTC test coverage
Change-Id: I17b3366f7f287d5b4f233515490c76506cd7ecaf
Kimmo Hoikka [Wed, 27 May 2015 10:03:46 +0000 (03:03 -0700)]
Merge "UTC coverage for Path,KeyFrames,LinearConstrainer,Layer,ImageActor" into tizen
Xiangyin Ma [Tue, 26 May 2015 18:55:01 +0000 (19:55 +0100)]
UTC coverage for Path,KeyFrames,LinearConstrainer,Layer,ImageActor
Change-Id: Icb2dad0afb9b074ae355bc04f08090d0c08f4f07
Kimmo Hoikka [Tue, 26 May 2015 18:15:54 +0000 (11:15 -0700)]
Merge "UTC coverage for public-api/images" into tizen
Kimmo Hoikka [Tue, 26 May 2015 17:50:35 +0000 (10:50 -0700)]
Merge "UTC coverage for MathUtils,Matrix,Uint16Pair,PropertyTypes" into tizen
Xiangyin Ma [Tue, 26 May 2015 17:32:09 +0000 (18:32 +0100)]
UTC coverage for public-api/images
Change-Id: Ief02f31b952f94d9d20c141af2301ebfeee366c2
Lee Morgan [Tue, 26 May 2015 13:59:24 +0000 (14:59 +0100)]
UTC coverage for MathUtils,Matrix,Uint16Pair,PropertyTypes
Change-Id: I58973609f12f288f97f26f1ca65abae5234f43e6
Kimmo Hoikka [Tue, 26 May 2015 16:20:40 +0000 (17:20 +0100)]
CustomActorImpl extension and test case
Change-Id: I0d1b330779f68e265e6b534cc955ade107d2699e
HyunJu Shin [Mon, 25 May 2015 08:49:15 +0000 (01:49 -0700)]
Merge "Add utc test cases" into tizen
Heeyong Song [Mon, 25 May 2015 08:43:31 +0000 (17:43 +0900)]
Add utc test cases
Change-Id: I057a8acd569784e367b2492423e9d557a8848603
Yoonsang Lee [Mon, 25 May 2015 08:19:40 +0000 (17:19 +0900)]
Update UTC for EncodedBufferImage
Change-Id: Ibc7690f8065c47f952807b650b77d1afe7b825a2
Kimmo Hoikka [Fri, 22 May 2015 16:29:48 +0000 (09:29 -0700)]
Merge "Changed hit test documentation for unconsumed events" into tizen
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>
taeyoon [Fri, 22 May 2015 06:13:46 +0000 (15:13 +0900)]
Add UTCs for CustomActor and CustomActorImpl
Change-Id: Icae2a9a189c497298fd72fe5e6652c8a087c9bae
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>
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
Kimmo Hoikka [Thu, 21 May 2015 16:25:58 +0000 (09:25 -0700)]
Merge "Update UTC for quaternion.h" into tizen
Kimmo Hoikka [Thu, 21 May 2015 16:25:32 +0000 (09:25 -0700)]
Merge "Fix UTCs for EncodedBufferImage & HitTestAlgorithm" into tizen
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
Francisco Santos [Thu, 21 May 2015 14:44:46 +0000 (15:44 +0100)]
Fix return value of implementation alignment.
Change-Id: I53388938ec7778a0634a0181f2b3b51f29d38eb0
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
Francisco Santos [Wed, 20 May 2015 18:06:49 +0000 (19:06 +0100)]
Fixes crash after merge from tizen.
Change-Id: Ic322d76fb22ddb18cd3c558e89583ceb0b0c3c09
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
Adeel Kazmi [Mon, 18 May 2015 17:39:46 +0000 (18:39 +0100)]
Added Test cases for Constraints
Change-Id: I0d6b2d1c243e7a722dcd40a4c06bc904b541c47b
Nick Holland [Fri, 15 May 2015 16:08:18 +0000 (17:08 +0100)]
Add extension to PropertyInput
Change-Id: Id4b533d23b8471f7687035bfc2a97fe9ef1535ee
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
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
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>
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
Yoonsang Lee [Wed, 8 Apr 2015 08:03:34 +0000 (17:03 +0900)]
Update UTC for quaternion.h
Change-Id: Ib15077a7cbeb3267d994a042f584dc7e5e3b957a
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
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
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
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
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
Lee Morgan [Wed, 22 Apr 2015 16:21:26 +0000 (17:21 +0100)]
UTC tests; PropertyValue, Vector2/3/4, Matrix
Change-Id: Ic2318531b7e1b9b558340e755bd7738547d701a3
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
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
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
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
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
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
Lee Morgan [Tue, 12 May 2015 13:25:16 +0000 (14:25 +0100)]
Added PropertyValue Array as a class
Change-Id: If7dba0e31a53eada586a05a86bb2f23274645aee
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>
Francisco Santos [Fri, 8 May 2015 16:44:21 +0000 (17:44 +0100)]
Add missing header in property-buffer.h
Change-Id: I42be22d8614d795828c93e4b791d521c0a9170c3
Francisco Santos [Wed, 6 May 2015 12:33:41 +0000 (13:33 +0100)]
Add GetImage method to Sampler.
Change-Id: I8be72f20287b1d62e7e539ea64aeb76a69e77f96
Francisco Santos [Mon, 11 May 2015 18:16:36 +0000 (19:16 +0100)]
Correctly calculate alignment of members in propertyBuffers.
Change-Id: I7575c7ec1608517478f1a308f51d1eb90551e45f
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
Adeel Kazmi [Wed, 13 May 2015 08:52:25 +0000 (01:52 -0700)]
Merge "Refactoring of path constraints + LinearConstrainer" into tizen
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
Paul Wisbey [Tue, 12 May 2015 14:52:43 +0000 (15:52 +0100)]
Removed remaining references to glyph cache
Change-Id: Ie476593b5d04cd5aecaed8eaee075325423b0840
Kimmo Hoikka [Tue, 12 May 2015 15:14:42 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen
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
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
Kimmo Hoikka [Tue, 12 May 2015 10:56:41 +0000 (03:56 -0700)]
Merge "Fix uninitialized mResourceClient in NinePatchImage" into tizen
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
Paul Wisbey [Fri, 8 May 2015 15:13:29 +0000 (08:13 -0700)]
Merge "Remove unnecessary dead variable and unnecessary include" into tizen
Nick Holland [Fri, 8 May 2015 12:52:12 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: I8db45baf97da4ada478d61ae1a0072609d1dc8df
Kimmo Hoikka [Thu, 7 May 2015 13:05:28 +0000 (14:05 +0100)]
Remove unnecessary dead variable and unnecessary include
Change-Id: I92dea2209158ad0fb1ca04dade6c988089ea9bff
Lee Morgan [Fri, 1 May 2015 11:43:58 +0000 (12:43 +0100)]
Fixed geometry hints property
Change-Id: Id52fa1800a7a2daa786551d11b9dd8ce78e5feb3
Yoonsang Lee [Thu, 7 May 2015 08:38:40 +0000 (17:38 +0900)]
Fix uninitialized mResourceClient in NinePatchImage
Change-Id: I4b0f20ad6cc88d1e222e3aa5bc8b74bd6c58788f
Kimmo Hoikka [Tue, 5 May 2015 16:05:12 +0000 (09:05 -0700)]
Merge "Allow registering property components for animatable properties" into tizen
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
Francisco Santos [Fri, 1 May 2015 10:53:26 +0000 (11:53 +0100)]
Bug fixes.
Change-Id: Idf22935143d681904417ed0e39cbce0ed8b0b6b9
David Steele [Thu, 30 Apr 2015 11:15:52 +0000 (12:15 +0100)]
Fixed uniform mapping crash
Change-Id: I7499c18ddb5ad4f878c6394c68c695ab03249ac8
Adeel Kazmi [Fri, 1 May 2015 06:50:06 +0000 (23:50 -0700)]
Merge "Remove un-used GetChildren internal actor api" into tizen
Francisco Santos [Thu, 30 Apr 2015 15:30:41 +0000 (16:30 +0100)]
Fix buffer used in the wrong scope.
Change-Id: Ie9f99e798423a810fe1dc9fa7f64ec791648f770
Nick Holland [Thu, 30 Apr 2015 14:22:04 +0000 (15:22 +0100)]
Remove un-used GetChildren internal actor api
Change-Id: Iac7817dcd99315d102f033c56328a5ac8bbff52a
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>
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
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>
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
Francisco Santos [Wed, 29 Apr 2015 16:21:43 +0000 (17:21 +0100)]
Use UNSIGNED_INTEGER for index buffers.
Change-Id: I0ae54acb4f1231f1b0bb3ccafaceded41f836b2b
Lee Morgan [Wed, 29 Apr 2015 14:34:00 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: Ic7c7d1e6e0384df33cbda5be10e34d77fcdbc317
Francisco Santos [Wed, 29 Apr 2015 12:57:39 +0000 (13:57 +0100)]
Upload property buffers when they change.
Change-Id: Ibb2f030c6dd001d5b2db3c169e37ae08dd4376c3
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>
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>
Francisco Santos [Thu, 23 Apr 2015 18:45:50 +0000 (19:45 +0100)]
Fix to avoid copy of non basic types.
Change-Id: I73f32a433f4b8884d49bb248ea55b28285c37cb8
Francisco Santos [Thu, 23 Apr 2015 16:19:36 +0000 (17:19 +0100)]
Fix uninitialized pointer.
Change-Id: I065b84af513803ef46f13bffacc46b0fdff0b8ff
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
Adeel Kazmi [Mon, 27 Apr 2015 09:39:35 +0000 (10:39 +0100)]
Remove boost from the build as well
Change-Id: Ibfab3d31452b5b0715a705339b4e4b8a31ba0c32
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
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
Xiangyin Ma [Thu, 23 Apr 2015 11:04:13 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: I8e0aa8c61691b706a0b37549bf95d15ce24c83e5
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
Tom Robinson [Tue, 21 Apr 2015 14:14:53 +0000 (15:14 +0100)]
Type registry macros made namespace-generic: core
Change-Id: I730f9451fe8e92cef34e08c31c65efe2e001d8e5
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