Adeel Kazmi [Mon, 20 Apr 2015 13:44:05 +0000 (06:44 -0700)]
Merge "Constraint sources may be destroyed before Constraint::Apply()" 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
Paul Wisbey [Sat, 18 Apr 2015 13:48:55 +0000 (14:48 +0100)]
Constraint sources may be destroyed before Constraint::Apply()
Change-Id: I85fbd2cc4f1d7aa3e70888d0130f9ed4dcbf5a65
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
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>
Kimmo Hoikka [Fri, 17 Apr 2015 16:11:14 +0000 (09:11 -0700)]
Merge "Update UTC for type-registry.h" into tizen
Richard Huang [Thu, 16 Apr 2015 14:54:05 +0000 (15:54 +0100)]
Update UTC for type-registry.h
Change-Id: Ie3db4bdc8410465fa9ad24a27230b5554d6152f9
Tom Robinson [Thu, 16 Apr 2015 15:36:44 +0000 (16:36 +0100)]
Dynamics build fix
Change-Id: I16aa313ecf6000e005bba5059a9fb815a5d1ab61
Kimmo Hoikka [Tue, 14 Apr 2015 15:03:14 +0000 (16:03 +0100)]
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
Change-Id: I25bacfb011d4f24d60cabb53b7993dc51633b175
HyunJu Shin [Thu, 16 Apr 2015 07:17:00 +0000 (00:17 -0700)]
Merge "- Update UTC for animation.h - Remove assert when duration is 0 in Animation::SetDuration() because the duration can be 0 in Animation::New()." into tizen
Ferran Sole [Wed, 15 Apr 2015 11:57:47 +0000 (12:57 +0100)]
DALi Version 1.0.38
Change-Id: I5d20db202772d4cc738f39589ee12ede7bc05980
Kimmo Hoikka [Tue, 14 Apr 2015 10:53:13 +0000 (03:53 -0700)]
Merge "Add cmake to the required system packages list in dali_env" into tizen
Kimmo Hoikka [Tue, 14 Apr 2015 10:52:32 +0000 (03:52 -0700)]
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
Heeyong Song [Tue, 14 Apr 2015 07:28:53 +0000 (16:28 +0900)]
- Update UTC for animation.h
- Remove assert when duration is 0 in Animation::SetDuration() because the duration can be 0 in Animation::New().
Change-Id: Ib1c94f7e03956b873cb9151265c79e4a1b5327ec
Kingsley Stephens [Thu, 9 Apr 2015 14:03:14 +0000 (15:03 +0100)]
Size negotiation patch 3: Scope size negotiation enums
Fix FIT_TO_CHILDREN
Change-Id: Iac313b8df1e3e4febd3c3cf162ca1f7c033a4a34
Nick Holland [Mon, 13 Apr 2015 09:40:59 +0000 (10:40 +0100)]
Remove last reference to boost in dali-core
Removed boost::function declared in property-notifcation-declarations.h
which was being included by handle.h, which is include by
most of DALi. The boost function.hpp header was pulling in a
total of 179 other boost header files.
Some files using strcmp, memcpy and memmove no longer compiled after the
removal, so they now include <cstring> which has the API for those functions.
On an i7 with make -j8 dali-core now compiles 20% faster
Change-Id: Ic03c1efaa3f234b3777a4828b6c5e8e28bf1ff75
Yoonsang Lee [Mon, 13 Apr 2015 02:33:20 +0000 (11:33 +0900)]
Add cmake to the required system packages list in dali_env
Change-Id: I80474b0c52f823cce2fb8a65aeeb73a272e585d4
Kimmo Hoikka [Fri, 10 Apr 2015 16:15:16 +0000 (17:15 +0100)]
Only include forward declaring iostream header in public API
Change-Id: I10e1abe3f89277073db9566dc4e7ee5ad7af1628
Kimmo Hoikka [Fri, 10 Apr 2015 14:52:45 +0000 (07:52 -0700)]
Merge "DALi Version 1.0.37" into tizen
Kingsley Stephens [Fri, 10 Apr 2015 14:35:19 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: I66e880f3240f8ec61ecdbb2eddb8445b68b59e3c
Kimmo Hoikka [Fri, 10 Apr 2015 14:19:15 +0000 (07:19 -0700)]
Merge "Moved hash function to public-api" into tizen
Victor Cebollada [Fri, 10 Apr 2015 10:12:43 +0000 (11:12 +0100)]
Add harfbuzz to the package list.
Change-Id: Id51926a053cae5572c9d72e4d5457dd1c862deec
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Thu, 9 Apr 2015 09:48:50 +0000 (10:48 +0100)]
Moved hash function to public-api
Change-Id: Ia51940a6435d92f5d59455ff7393bc0a725efac8
Paul Wisbey [Thu, 9 Apr 2015 15:48:58 +0000 (16:48 +0100)]
Merge branch 'new_text' into tizen
Change-Id: I845577c7ed3878dd1f22718f395afe86acd55863
Paul Wisbey [Thu, 9 Apr 2015 10:55:48 +0000 (11:55 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/CMakeLists.txt
Change-Id: Icbd7f85f995462af30937b35579564640a027afd
Kingsley Stephens [Wed, 8 Apr 2015 13:10:46 +0000 (14:10 +0100)]
Size negotiation patch 2: Move SetPreferredSize into actor-impl.cpp
Fix for putting an actor hierarchy onto stage.
Change-Id: Ib48ea5f2a5dde292292fe18a415fb0d6e749252a
Adeel Kazmi [Wed, 11 Mar 2015 14:13:57 +0000 (14:13 +0000)]
New Constraints
BEFORE:
struct MyObject
{
MyObject( Vector3 input )
: mInput( input ) { }
Vector3 operator()( const Vector3& current, const PropertyInput& parentSize )
{
return current * parentSize.GetVector3() * mInput;
}
Vector3 mInput;
};
...
Actor actor = Actor::New();
Constraint constraint = Constraint::New< Vector3 >( Actor::Property::POSITION,
ParentSource( Actor::Property::SIZE ),
MyObject( Vector::ONE ) );
actor.ApplyConstraint( constraint );
NOW:
struct MyObject
{
MyObject( Vector3 input )
: mInput( input ) { }
void operator()( Vector3& current, const PropertyInputContainer& inputs )
{
current *= inputs[0]->GetVector3() * mInput;
}
Vector3 mInput;
};
...
Actor actor = Actor::New();
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, MyObject( Vector::ONE ) );
constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
constraint.Apply();
DESCRIPTION OF CHANGES:
- Constraints take a handle as parameter
- AddSource to add a source
- Constraints no longer copied unless absolutely required
- Constraints can be cloned for another object
- Replaced the New methods in Dali::Constraint
- Use one constraint function
- Inputs are passed in via Dali::Vector< PropertyInput* >
- Only one PropertyConstraint class being used now
- Constraint function has no return
- Remove PropertyInputComponentAccessor and moved its functionality into PropertyInputAccessor for the time being
- Currently using std::vector internally as Dali::Vector cannot support non-trivial types
- Updated Path Constraints to use new constraints
- Replace boost::function usage in Constraints
- Remove weight property from constraints
- Constraint is no longer an Object, it is a base-object
- Remove duplicated data from Internal::Constraint
- Combine Constraint & ActiveConstraint
Change-Id: I210afffae45820e17ecd901a4106b5f735b2b1a8
Paul Wisbey [Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I08714ae8f982734b411033a121669a0d7cec98b1
Adeel Kazmi [Fri, 3 Apr 2015 05:51:07 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ib03d3aff417f0051eaae07cd2566971c48710bfa
Adeel Kazmi [Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Remove actor SetPreferredSize" into tizen
Kingsley Stephens [Tue, 31 Mar 2015 16:35:45 +0000 (17:35 +0100)]
Size negotiation patch 1: Remove actor SetPreferredSize
Also merge SizeMode enum into ResizePolicies,
fixed control backing, made actor SetSize override size policy to FIXED, removed SetDimensionDependency
from Actor public API
Change-Id: I90b98248a089d2a83064f6bed6e25254e5edd6eb
Richard Huang [Wed, 1 Apr 2015 14:54:35 +0000 (15:54 +0100)]
Lazy register animatable property if not registered yet
Change-Id: I25bbda12ebf4f811653387b187718387a399bb14
Paul Wisbey [Wed, 1 Apr 2015 14:28:12 +0000 (15:28 +0100)]
Removed some TextActor dependent tests
Change-Id: I8825724dab25d223836561b55ff6f95983e91753
Richard Huang [Mon, 30 Mar 2015 14:57:17 +0000 (15:57 +0100)]
Remove compile time assert for animatable property registration
The compile time assert to check the order of the properties relies on
the __COUNTER__ macro which generates sequential integral values starting
from 0 at compile time and there is no way to reset it. Therefore, while
using __COUNTER_ for both DALI_PROPERTY_REGISTRATION and
DALI_ANIMATABLE_PROPERTY_REGISTRATION, depending on which macro is called
first, the condition used by the assert in the other macro will always
get the wrong count.
Change-Id: I7c263cc505050fa9bf73d652a1535fd652ec7596
Heeyong Song [Tue, 31 Mar 2015 01:48:02 +0000 (10:48 +0900)]
Remove non-public APIs of Animation
Change-Id: Id15588f8809069503782b2aadc5dc93df87dd4ec
Paul Wisbey [Mon, 30 Mar 2015 15:26:59 +0000 (16:26 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
dali/internal/common/core-impl.cpp
dali/internal/common/core-impl.h
dali/internal/event/common/thread-local-storage.cpp
dali/internal/event/common/thread-local-storage.h
dali/internal/file.list
dali/internal/render/renderers/scene-graph-text-renderer.cpp
dali/public-api/dali-core.h
Change-Id: Ia39397ce21005dd731862e4e1d4e3cb1ebabe92f
Kingsley Stephens [Thu, 20 Nov 2014 12:54:38 +0000 (12:54 +0000)]
New size negotiation
Change-Id: Ie58e896029fc35dfb4a41d63ea68af3b5d8de6e7
Adeel Kazmi [Mon, 30 Mar 2015 13:24:43 +0000 (06:24 -0700)]
Merge "Look into the range of animatable properties while retrieving Actor's constraint input property" into tizen
Adeel Kazmi [Mon, 30 Mar 2015 10:27:04 +0000 (03:27 -0700)]
Merge "Remove Dynamics APIs from actor.h" into tizen
Richard Huang [Wed, 25 Mar 2015 17:28:52 +0000 (17:28 +0000)]
Look into the range of animatable properties while retrieving Actor's constraint input property
Change-Id: I078c54679b93b4cbaf835343b7bae81e4a6015ac
Paul Wisbey [Wed, 25 Mar 2015 11:45:14 +0000 (11:45 +0000)]
Don't Update twice after a property setter
Change-Id: Iee6daee6ed6fe25f147744d0022f0717401ecbd1
Nick Holland [Fri, 27 Mar 2015 10:01:41 +0000 (10:01 +0000)]
Remove Performance Monitor code
Kept some empty macros in-place should we want to restore functionality
for logging information adaptor does not have. E.g. The start/end
of message processing / constraint processing.
And some counters relating to floating point multiplies etc.
Change-Id: I93c4e9eefd30192194f1ff506cda37af6652c4d7
Heeyong Song [Fri, 27 Mar 2015 00:58:03 +0000 (09:58 +0900)]
Remove Dynamics APIs from actor.h
Change-Id: Id745959c96ee7854aadeef26a932afe24eabb41a
Adeel Kazmi [Wed, 25 Mar 2015 15:06:39 +0000 (08:06 -0700)]
Merge "DALi Version 1.0.35" into tizen
Tom Robinson [Wed, 25 Mar 2015 14:02:01 +0000 (14:02 +0000)]
DALi Version 1.0.35
Change-Id: Id9c74f820e8c3bcb7abcf865663ed5ad1ce6c709
Adeel Kazmi [Wed, 25 Mar 2015 11:28:05 +0000 (04:28 -0700)]
Merge "Remove pointless boost includes" into tizen
Adeel Kazmi [Wed, 25 Mar 2015 09:17:56 +0000 (02:17 -0700)]
Merge "Added PathConstraint object." into tizen
Nick Holland [Mon, 23 Mar 2015 09:21:49 +0000 (09:21 +0000)]
Output stream insert support added to property value
Change-Id: If7bcca7975c75c6d59c6bd5fbe5b94c7a564d71c
Adeel Kazmi [Tue, 24 Mar 2015 17:27:07 +0000 (17:27 +0000)]
Remove pointless boost includes
Change-Id: I238ae129b007174092c1135e4832dc7ffa87621f
Adeel Kazmi [Tue, 24 Mar 2015 10:48:50 +0000 (03:48 -0700)]
Merge "Removed spline class from dali" into tizen
Ferran Sole [Tue, 17 Mar 2015 09:28:27 +0000 (09:28 +0000)]
Added PathConstraint object.
PathConstraints allows to constraint properties to a given path.
Vector3 properties will be constrained to the position of the path
and Rotation properties will be constrained to follow the tangent
of the path.
Change-Id: I1f4f8d98094f257bf1a54221d53293cf22bf7eeb
Ferran Sole [Wed, 18 Mar 2015 16:08:13 +0000 (16:08 +0000)]
Removed spline class from dali
Removed spline class as it has been replaced by Dali::Path
Change-Id: Id31dbb0fd7202854b9ddcf47b159c5861c3c6075
Richard Huang [Mon, 9 Mar 2015 16:08:24 +0000 (16:08 +0000)]
Support animatable property registration during type registry
Use AnimatablePropertyRegistration or DALI_ANIMATABLE_PROPERTY_REGISTRATION
to register the animatable property. The animatable propery will be lazy
registered when it is being accessed.
Change-Id: Idcbf5a55a0d288fe8937a63db1fb087fb968124d
Paul Wisbey [Sun, 22 Mar 2015 13:00:08 +0000 (13:00 +0000)]
Fixed some TCT issues
Change-Id: I056f3d557da30f6b53ac670e754725fef012d245
Paul Wisbey [Fri, 20 Mar 2015 16:36:41 +0000 (16:36 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
dali/internal/event/actor-attachments/text-attachment-impl.cpp
dali/internal/event/actor-attachments/text-attachment-impl.h
dali/internal/event/actors/text-actor-impl.cpp
dali/internal/event/images/emoji-factory.cpp
dali/internal/event/resources/resource-client.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.h
dali/internal/update/resources/resource-manager.h
Change-Id: Ib4d3ac7babb73290aa6faf67a5695eed2ea6b6e7
Kimmo Hoikka [Fri, 20 Mar 2015 11:34:32 +0000 (04:34 -0700)]
Merge "Refactored EventToUpdate into EventThreadServices" into tizen
David Steele [Tue, 17 Mar 2015 19:03:34 +0000 (19:03 +0000)]
Refactored EventToUpdate into EventThreadServices
Moved implementation from UpdateManager to Stage.
Now also store a reference to the Services in the Object base class
and ActorAttachment base class.
This helps decouple event side object implementations from the update manager.
Code specific to the update message queue has been left in the update manager.
Change-Id: Id05aa66ba31f8d18bc2d64acf534a5a88a70573e
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Nick Holland [Wed, 18 Mar 2015 15:22:10 +0000 (15:22 +0000)]
Added V8 support to dali_env script
Checks out and builds a specific version of V8 from source
using Googles depot_tools scripts. Then automatically
generates a package config file and installs the
libraries / headers into dali-env.
Once installed, run autoreconf and configure in dali-toolkit.
This will detect the v8 library using package config, and allow
the DALi JavaScript plugin to be built automatically.
Change-Id: I157ed510bf74758cdb82c24718667ead8d49ec39
Adeel Kazmi [Thu, 19 Mar 2015 11:38:57 +0000 (04:38 -0700)]
Merge "Fix IsPowerOfTwo can be overflowed return value" into tizen
Adeel Kazmi [Thu, 19 Mar 2015 11:27:47 +0000 (04:27 -0700)]
Merge "DALi Version 1.0.34" into tizen
daemyung jang [Wed, 18 Mar 2015 06:19:25 +0000 (15:19 +0900)]
Fix IsPowerOfTwo can be overflowed return value
Change-Id: I1ccc0a174dc9164400aee00e48a08f1c8ca33182
Richard Huang [Thu, 19 Mar 2015 11:04:09 +0000 (11:04 +0000)]
DALi Version 1.0.34
Change-Id: Ic3946113acaf81654da6fb9c354cfbd7f2a204ce
Paul Wisbey [Thu, 19 Mar 2015 09:28:36 +0000 (09:28 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali-internal/utc-Dali-Internal-Text-Culling.cpp
Change-Id: Iefcb16f197a73596c20664bd3bfcfd09a6e17947
Yoonsang Lee [Thu, 19 Mar 2015 05:49:52 +0000 (14:49 +0900)]
Correct comment of Actor::SetKeyboardFocusable()
The default value for SetKeyboardFocusable() is false, not true.
Change-Id: Ia54df8731804f1b3c72b272d3774273eb9a2eb94
Yoonsang Lee [Fri, 6 Mar 2015 08:50:05 +0000 (17:50 +0900)]
Actor's Transformation API Cleanup
Actor::MoveBy -> Actor::TranslateBy
Actor::ColorBy -> <removed>
Actor::OpacityBy -> <removed>
Actor::SetRotation -> Actor::SetOrientation
Actor::GetCurrentRotation -> Actor::GetCurrentOrientation
Actor::GetCurrentWorldRotation -> Actor::GetCurrentWorldOrientation
Actor::SetInheritRotation -> Actor::SetInheritOrientation
Actor::IsRotationInherited -> Actor::IsOrientationInherited
Actor::Property::ROTATION -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION
Change-Id: I51152b3f7f5ab0ff602c973f4faf0422e65eb7bd
Heeyong Song [Mon, 16 Mar 2015 08:20:09 +0000 (17:20 +0900)]
Fix a rendering issue of the mesh which has vertex color
Change-Id: I248c0547357665630f62ce1c323591a53f372816
Paul Wisbey [Sun, 15 Mar 2015 11:57:18 +0000 (11:57 +0000)]
Framework for Font styles
Change-Id: I4ef46e6e2d6ce644aa4a4aa507aa274728f9c736
Paul Wisbey [Fri, 13 Mar 2015 10:25:35 +0000 (10:25 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
dali/internal/update/resources/resource-manager.h
dali/public-api/actors/text-actor.h
dali/public-api/scripting/scripting.h
Change-Id: I0c89909f20b40d72fe3718387eed1a87519c0822
taeyoon [Fri, 13 Mar 2015 07:04:42 +0000 (16:04 +0900)]
Change "SLP" to "Tizen"
Change-Id: I5f9e64fa693336a0b650ee5fc398877bca769315
Adeel Kazmi [Thu, 12 Mar 2015 17:20:22 +0000 (10:20 -0700)]
Merge changes I2e0d0daa,I0b66fbb8 into tizen
* changes:
Dont include dali-core.h inside dali core
Adding thread join to the mutex test case
Adeel Kazmi [Thu, 12 Mar 2015 11:56:05 +0000 (04:56 -0700)]
Merge "DALi Version 1.0.33" into tizen
Kimmo Hoikka [Thu, 12 Mar 2015 11:38:12 +0000 (11:38 +0000)]
Dont include dali-core.h inside dali core
Change-Id: I2e0d0daafba10e97a160f58bfbeb7ce4a6073f60
Kimmo Hoikka [Fri, 6 Mar 2015 18:25:55 +0000 (18:25 +0000)]
Adding thread join to the mutex test case
Change-Id: I0b66fbb89016d2f13c3fb580ae7d8d1dd1f2fe53
Nick Holland [Thu, 12 Mar 2015 09:23:00 +0000 (09:23 +0000)]
DALi Version 1.0.33
Change-Id: I02831eb192a44df97827d88093fb481445563c1d
Xiangyin Ma [Wed, 11 Mar 2015 15:12:08 +0000 (15:12 +0000)]
Atlas: fix the order of allocation and ResourceId query
Change-Id: I81ec538d55beab1b461410593c36bc17e5d3f349
Kimmo Hoikka [Wed, 11 Mar 2015 11:56:01 +0000 (04:56 -0700)]
Merge "Remove unused FindActorByAlias" into tizen
Xiangyin Ma [Tue, 3 Mar 2015 11:18:42 +0000 (11:18 +0000)]
Added Atlas::Upload(url) support
Change-Id: I8cf65c95838dae55c10de77c54b5ef33b86f318a
Kimmo Hoikka [Tue, 10 Mar 2015 17:32:44 +0000 (17:32 +0000)]
Remove unused FindActorByAlias
Change-Id: Ia9a32f2bf1b11cf2c9d8d2c7d956a5004151e831
Adeel Kazmi [Mon, 9 Mar 2015 17:34:50 +0000 (17:34 +0000)]
Remove constraint interpolator
Submitting small changes to tizen branch so all demos don't break straight away.
Change-Id: I2b381ec30528f44dedb437ebfd65ac4497ccc229
Kimmo Hoikka [Mon, 9 Mar 2015 15:26:12 +0000 (08:26 -0700)]
Merge "dali-core property type comment to represent type instead of property enum" into tizen
Tom Robinson [Fri, 6 Mar 2015 17:55:32 +0000 (17:55 +0000)]
dali-core property type comment to represent type instead of property enum
Change-Id: I3e3ef12b11b6984567c4ec1c54de6e54054ce8f0
taeyoon [Mon, 9 Mar 2015 06:09:41 +0000 (15:09 +0900)]
Fix aarch64 build issue
- Change "1:\ldxr ..." to "1:\tldxr ..." in RefObject::Unreference()
Change-Id: Ibbf1f9c6ea33bd19e042e35fd2c8d582aebb3526
Kimmo Hoikka [Fri, 6 Mar 2015 18:45:11 +0000 (10:45 -0800)]
Merge "Remove unsafe new-delete pair from program and change unoptimal resizes to reserve" into tizen
Paul Wisbey [Fri, 6 Mar 2015 15:16:15 +0000 (15:16 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/utc-Dali-TextActor.cpp
dali/integration-api/platform-abstraction.h
dali/internal/event/actors/text-actor-impl.cpp
dali/public-api/actors/text-actor.h
dali/public-api/shader-effects/shader-effect.h
Change-Id: Ie11e1650979d994dc66975c65c55d88ca05570ee
Tom Robinson [Fri, 6 Mar 2015 10:10:56 +0000 (10:10 +0000)]
Property refactor in dali-toolkit: Core changes
Change-Id: I775426aa1ce8018c9dcf41ff125935be1e9f6ccc
Adeel Kazmi [Thu, 5 Mar 2015 16:33:13 +0000 (08:33 -0800)]
Merge "Move memory pool class internal" into tizen
Adeel Kazmi [Thu, 5 Mar 2015 16:16:47 +0000 (08:16 -0800)]
Merge "Property enum name changes in dali-core: Core changes" into tizen
Kingsley Stephens [Thu, 5 Mar 2015 15:09:04 +0000 (15:09 +0000)]
Move memory pool class internal
Change-Id: Ic4eadc317eb46b92f5531d8ee5e489dc6fa9c34d
taeyoon [Thu, 26 Feb 2015 02:15:55 +0000 (11:15 +0900)]
Resource management modification
- Moving shaderbin directory information from dali-core to dali-adaptor
- Addition of SHADERBIN_CACHE_ENABLED for handlig shader binary files.
- Making dali-core support binary updates by storing the version number in the shader binaries by Kimmo Hoikka
Change-Id: Iea5f4be140113c81614318fb272f7a1036867942
Tom Robinson [Thu, 5 Mar 2015 11:27:07 +0000 (11:27 +0000)]
Property enum name changes in dali-core: Core changes
Change-Id: I9d883e667e5a6183473165ac2236171151c5f1d9
Paul Wisbey [Wed, 4 Mar 2015 19:25:19 +0000 (19:25 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I33e5df93b492f44adf18e4d605ffb155c14ac024
Paul Wisbey [Wed, 4 Mar 2015 17:43:18 +0000 (17:43 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
automated-tests/src/dali/utc-Dali-Scripting.cpp
automated-tests/src/dali/utc-Dali-TextActor.cpp
dali/integration-api/resource-types.h
dali/internal/common/core-impl.cpp
dali/internal/event/actor-attachments/actor-attachment-declarations.h
dali/internal/event/actors/text-actor-impl.cpp
dali/internal/event/common/thread-local-storage.cpp
dali/internal/event/common/thread-local-storage.h
dali/internal/event/images/buffer-image-impl.h
dali/internal/update/manager/prepare-render-instructions.cpp
dali/internal/update/resources/resource-manager.cpp
dali/internal/update/resources/resource-manager.h
dali/public-api/actors/text-actor.h
dali/public-api/file.list
dali/public-api/images/glyph-image.cpp
Change-Id: I65b19cb83d62145968c9713c0ddeb2cf16dd2417
Adeel Kazmi [Wed, 4 Mar 2015 15:50:15 +0000 (15:50 +0000)]
(TapGesture) Added min/max taps, removed touches as it's unsupported
Currently, we needed to create two tap-gesture-detectors if we wanted both a single and double tap.
Now we should be able to set the minimum/maximum taps required on each tap-gesture-detector and
just check the noOfTaps member to see how many taps we received.
The touches setter/getter was removed as this is not supported by adaptor. Better to remove this
rather than have unsupported API. Left it in the structs as it could be supported later so that
their sizes do not change when this does happen.
Change-Id: I6112197f867da5a12a2d7dcc20990202a42ca670
Lee Morgan [Wed, 4 Mar 2015 16:10:53 +0000 (16:10 +0000)]
DALi Version 1.0.32
Change-Id: Id8c08eb3594096b3bfa7312a3183e2450e6c714f
Kimmo Hoikka [Wed, 4 Mar 2015 15:26:15 +0000 (15:26 +0000)]
Remove unsafe new-delete pair from program and change unoptimal resizes to reserve
Change-Id: I1d44e31339fba44899a2b37fc6571ad029f2943e
Kimmo Hoikka [Fri, 27 Feb 2015 18:45:11 +0000 (18:45 +0000)]
Removing unnecessary constants and unnecessary exports from built in types
Change-Id: I25a60b0e4866d95035500c0df4e0f48c0db72857
Adeel Kazmi [Tue, 3 Mar 2015 08:41:22 +0000 (00:41 -0800)]
Merge "Added API to generate a MeshData object for a Dali::Path object" into tizen
Adeel Kazmi [Tue, 3 Mar 2015 08:39:26 +0000 (00:39 -0800)]
Merge "Performance enhancement, cache glClear state" into tizen
Tom Robinson [Tue, 24 Feb 2015 19:33:49 +0000 (19:33 +0000)]
Property refactor in dali-core: Core changes
Change-Id: Idb86099961f03a47e7645cffbb9e7640109ee975
Ferran Sole [Tue, 17 Feb 2015 11:45:51 +0000 (11:45 +0000)]
Added API to generate a MeshData object for a Dali::Path object
The method aproximates the path by sampling at regular intervals and
connecting each sampled point to the next sample with a line.
Change-Id: Ia32751f4b5e9b55d679a7dd2c1592d12e566c52a