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
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
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
Francisco Santos [Thu, 30 Apr 2015 15:30:41 +0000 (16:30 +0100)]
Fix buffer used in the wrong scope.
Change-Id: Ie9f99e798423a810fe1dc9fa7f64ec791648f770
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
Francisco Santos [Wed, 29 Apr 2015 16:21:43 +0000 (17:21 +0100)]
Use UNSIGNED_INTEGER for index buffers.
Change-Id: I0ae54acb4f1231f1b0bb3ccafaceded41f836b2b
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
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
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
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
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
Francisco Santos [Tue, 21 Apr 2015 12:07:12 +0000 (13:07 +0100)]
Fix wrong deletion.
Change-Id: Ibcbba0859c7298e30e25716ffbd6b51f4f750a49
Kingsley Stephens [Tue, 21 Apr 2015 10:37:39 +0000 (11:37 +0100)]
Fix Actor size negotiation test cases
Change-Id: Id915d9f6c473e113ecea062233488d7eb6adb66a
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:34 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:19 +0000 (10:11 -0700)]
Merge "Remove ImageAttributes from public API" into tizen
Adeel Kazmi [Mon, 20 Apr 2015 15:13:24 +0000 (08:13 -0700)]
Merge "Add size negotiation tests to Actor" into tizen
Kingsley Stephens [Tue, 14 Apr 2015 12:59:24 +0000 (13:59 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled
Change-Id: I051397fc53fe326ee377c8d36ac0b623201a4ea2
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>
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
Kingsley Stephens [Mon, 20 Apr 2015 10:30:40 +0000 (11:30 +0100)]
Add size negotiation tests to Actor
Change-Id: Iace20dec34a99c6ad5b6b0cdb709ee45db526399
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
Francisco Santos [Tue, 14 Apr 2015 18:51:11 +0000 (19:51 +0100)]
Fixes and cleanup.
Change-Id: I9ea103021ed0930428342f99525e18c322f5ebbc
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
David Steele [Tue, 14 Apr 2015 20:05:07 +0000 (21:05 +0100)]
Renamed ConnectionObservers class, un-consted objects
ConnectionObservers class is poorly named - have changed it to
ConnectionChangePropagator, as it enables connection changes to be observed
by 'parent' objects.
SceneGraph objects such as Geometry, Material, Sampler and Shader were stored
as const objects in their parent classes - this is incorrect, as the parent
objects were const-casting; instead they are now stored as non-const, and the
constness is cast away between Event thread objects and SceneGraph objects in
the message passing (i.e. they are const for Event side usage, but non-const
for Update thread usage). Also changed containers to store scene graph objects
rather than their DataProvider interfaces.
Change-Id: I9930e6eabf6bc71c46adf8f15a7e0ea1ba5eaf90
Signed-off-by: David Steele <david.steele@partner.samsung.com>
David Steele [Thu, 9 Apr 2015 18:10:04 +0000 (19:10 +0100)]
Added sampler properties, test cases.
Added the sampler properties to the event side object.
Added DownCast methods to all 6 handles.
Added basic test cases for each of the 6 objects.
Change-Id: If15072860f9de39e823a49e3cecc67a47e9545bc
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Francisco Santos [Wed, 8 Apr 2015 16:38:06 +0000 (17:38 +0100)]
PropertyBuffer Attributes.
Change-Id: I6e2766d3f1726a04c49b463c0f7c2ed62fcbdf38
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
David Steele [Wed, 8 Apr 2015 18:55:56 +0000 (19:55 +0100)]
Added connection for sampler texture
Adding an object connection for the sampler texture enables the
material to be informed when the sampler texture changes.
This is chained up to the renderable attachment, which re-sends
the data providers to the renderer, updating the texture.
Note, doubleBufferedProperty[i] = value does not enable the aging
behaviour, whereas doubleBufferedProperty.Set(i, value) does.
Change-Id: I3c43839e86cbc59a6c47598d287bfae512b18639
Signed-off-by: David Steele <david.steele@partner.samsung.com>
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
David Steele [Tue, 7 Apr 2015 18:45:04 +0000 (19:45 +0100)]
Changed passing of data providers to renderers
The data providers were previously passed as a tree of pointers - this
was wrong because they weren't double buffered in the data
provider implementations.
Instead of passing as a tree, we now collate all the data providers
into a single structure before passing it to the renderer. This is
an owned object, and is doubled buffered through the message system.
This also has the advantage of being able to pass a pointer to
the DataProviders structure around rather than individual pointers.
Change-Id: I3c61fef2e8b86c8e00a1779766158b1ff2bf153b
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Francisco Santos [Tue, 7 Apr 2015 16:43:17 +0000 (17:43 +0100)]
Remove mContext and mTextureCache from Renderer.
Change-Id: I2bea3efe887a7d176139f88fa7e11c9e0883c8c2
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
Francisco Santos [Thu, 19 Mar 2015 16:50:41 +0000 (16:50 +0000)]
PropertyBuffers implementation.
Change-Id: Iedf35d2e4124efb54ead2cccc31f38f00a27deb9
David Steele [Wed, 1 Apr 2015 17:34:51 +0000 (18:34 +0100)]
Added double buffered properties that can be aged
There is currently no means of aging a double buffered value on successive updates.
Added a new templated type DoubleBufferedProperty, which holds a double buffered
value type, and can be 'aged' by calling CopyPrevious.
Users of this type (e.g. SceneGraph::Geometry, etc) will call the CopyPrevious method
in the ResetDefaultProperties method (alongside resetting AnimatableProperty values with ResetToBaseValue()).
Removed ownership of scene graph property buffers from Geometry - they are fully
owned by UpdateManager. Instead, Geometry now holds raw pointers to the buffers.
Change-Id: I4682b3f31eb7947fb19ae34871bdc840e9553d5e
Signed-off-by: David Steele <david.steele@partner.samsung.com>
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
David Steele [Thu, 26 Mar 2015 18:07:09 +0000 (18:07 +0000)]
Uniform map handling
Updated event implementations of geometry, property buffer, material, sampler and renderer to handle custom properties and default animatable properties.
Added uniform maps to property-owners.
Uniform maps are only held by SceneGraph, so the API was updated to match. Event objects do not hold a copy of the map.
The maps from all 6 rendering objects are re-collected in the renderer-attachment's DoPrepareRender step if any of them have changed.
The collected map is accessible by the NewRenderer from the render thread through the UniformMapDataProvider interface, so is double buffered.
The NewRenderer maintains a list of uniform names/ program location index / property value address, and updates the uniform locations from the uniform names only when the uniform mapping has changed, not when property values change.
Change-Id: I9cec141cd7746540eda3f9049b0f4ede907b03f8
Signed-off-by: David Steele <david.steele@partner.samsung.com>
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
David Steele [Mon, 30 Mar 2015 17:30:27 +0000 (18:30 +0100)]
Merge branch 'tizen' of platform/core/uifw/dali-core into devel/new_mesh
Change-Id: I62e3e11ecb6d0019ead84574c5228c8abbd07287
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