Ferran Sole [Tue, 6 Jan 2015 11:09:48 +0000 (11:09 +0000)]
Internal animation changes
- Changed animation system to avoid creating/destroying SceneGraph::Animators each time the target object is connected/disconnected from the stage
- Removed use of boost::function for animator functions
[Problem] AnimatorConnector will create a new SceneGraph::Animator each time the target object gets connected to the stage.
SceneGraph::Animators will be deleted by the SceneGraph::Animation whenever the target object is disconnected.
[Cause] n/a
[Solution] AnimatorConnector creates a SceneGraph::Animator once and notifies to it whenever the target object is connected/disconnected.
SceneGraph::Animation will only remove Animators when the target object has been destroyed.
Change-Id: I0f35e85b8bf150cd954197fe6d213aad2d9f9c89
Kimmo Hoikka [Wed, 7 Jan 2015 18:44:16 +0000 (18:44 +0000)]
Fix hit test API to tell if it succeeds or not, clarify test case
Change-Id: I57e141c099c20461c6b7658bf4a27fd28af3d911
Kimmo Hoikka [Wed, 7 Jan 2015 17:25:34 +0000 (17:25 +0000)]
remove incorrect unit test, most functionality already covered by public API tests anyways
Change-Id: I3f42cecb70e67cd7288524d3f5fd591903e667df
Francisco Santos [Tue, 6 Jan 2015 14:22:26 +0000 (14:22 +0000)]
Unused variables.
Change-Id: I617a32bffd20ce216bf9adcbc98ec3d18ba87147
Francisco Santos [Tue, 6 Jan 2015 14:16:49 +0000 (14:16 +0000)]
Do not overrite vtable of object.
Change-Id: I92260c9e4412dabd01dc969b8171d05c63048e9a
Francisco Santos [Tue, 6 Jan 2015 11:43:08 +0000 (11:43 +0000)]
Unused variables.
Change-Id: Ifa243ac802beb9a379942c112665c5a7bef1cc4d
Kimmo Hoikka [Wed, 7 Jan 2015 11:20:04 +0000 (03:20 -0800)]
Merge "Replaced shift and add sequence with single multiply in hash function" into tizen
Kimmo Hoikka [Wed, 7 Jan 2015 11:19:44 +0000 (03:19 -0800)]
Merge "Fix include guard." into tizen
Andrew Cox [Tue, 23 Dec 2014 19:35:16 +0000 (19:35 +0000)]
Replaced shift and add sequence with single multiply in hash function
Archaic optimisation to think a sequence of instructions with
pipeline-stalling dependencies beats a single imul.
Compilers can still make the substitution with a shift and add if they
want to for a particular platform.
Change-Id: I313a5f98eae665f0fabd266fee09c078547be2ec
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Heeyong Song [Mon, 5 Jan 2015 06:03:14 +0000 (15:03 +0900)]
Jira TSAM-30 issue (Tizen 3.0 Release). Add comments of Pixel::GetAlphaOffsetAndMask()
Change-Id: I2f3b20b60fbe3cda56b1fb85bc5828e8f553c24c
Francisco Santos [Mon, 5 Jan 2015 18:10:18 +0000 (18:10 +0000)]
Fix include guard.
Change-Id: I4cce02b7eb84106e72fcbb566eb03f0ab9880102
Kimmo Hoikka [Mon, 5 Jan 2015 17:57:20 +0000 (09:57 -0800)]
Merge "Fixed shader compilation error handling" into tizen
David Steele [Thu, 18 Dec 2014 19:10:54 +0000 (19:10 +0000)]
Fixed shader compilation error handling
Dali::Vector cannot use operator[0] after a Reserve (it asserts),
unlike std::vector.
Changed error handling to use Begin() instead, which returns a pointer
to the reserved memory without asserting.
Fixed exception handling, which uses the same string without the length
check.
Change-Id: I2e0131aec6cec209f27ef0ea7f903c718cbc4193
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Kimmo Hoikka [Wed, 24 Dec 2014 11:22:07 +0000 (11:22 +0000)]
Remove a dead virtual method from proxy object
Change-Id: Ib86fec7f731f947b1103682af1fa12f4bd91dfb2
David Steele [Fri, 19 Dec 2014 21:02:28 +0000 (21:02 +0000)]
Updated RenderTask test cases
Removed 2 test cases for a feature that is neither desirable or practical ( setting
the render task frequency to anything higher than 1 does not actually make the
update/render cycle at that frequency if nothing changes )
API description has been changed to reflect the current behaviour.
Fixed broken test cases, also found 1 actual error:
A resource response of LoadFailed doesn't make the UpdateManager
update the scene, whereas it should to ensure that attachments are correctly
set as completed status = NEVER; and for any dependent frame buffers to
be marked appropriately as well.
The 2 outstanding errors may also be real errors (in UtcDaliRenderTaskOnce03,
the scene graph gets drawn after the GL Sync occurs for no good reason; in
UtcDaliRenderTaskOnce08, no signal is sent ) but require further investigation.
Change-Id: I2ac9fd6dff68d4861ce1df9bbdc4d1dfb284b78d
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Adeel Kazmi [Wed, 24 Dec 2014 11:12:30 +0000 (11:12 +0000)]
Fixed Klocwork reported issue
Change-Id: I279fdf2407b7d9f514c60c4cfc306a26ca019bb9
Adeel Kazmi [Wed, 24 Dec 2014 10:43:40 +0000 (10:43 +0000)]
DALi Version 1.0.23
Change-Id: Ib0c995a7044efb6d7deba16f7952b6812cdf0b3e
Adeel Kazmi [Fri, 19 Dec 2014 15:05:02 +0000 (07:05 -0800)]
Merge "Add SceneCreated signal to stage." into tizen
Kimmo Hoikka [Tue, 16 Dec 2014 13:59:00 +0000 (13:59 +0000)]
Saving a bit of memory by using pretty function instead of full file name
Change-Id: I9d8a8dc42333582bd789abe8383e388c946b428d
Kingsley Stephens [Tue, 16 Dec 2014 16:22:53 +0000 (16:22 +0000)]
Add SceneCreated signal to stage.
Change-Id: I61ae741964c2f2087a7463152f4071d2a0ce1ade
Kingsley Stephens [Thu, 18 Dec 2014 10:09:25 +0000 (10:09 +0000)]
DALi Version 1.0.22
Change-Id: If5d701f3fbd65b90c9d78be4d7db66316d97b97f
Kimmo Hoikka [Wed, 17 Dec 2014 17:05:55 +0000 (09:05 -0800)]
Merge "Fixed automated tests for ImageFactory" into tizen
Kimmo Hoikka [Wed, 17 Dec 2014 17:04:32 +0000 (09:04 -0800)]
Merge "remove 58k unnecessary asserts from dali-demo startup" into tizen
Andrew Cox [Wed, 17 Dec 2014 16:20:44 +0000 (16:20 +0000)]
Fixed automated tests for ImageFactory
[problem] Tests using outdated 50% fudge factor on image factory cache hits.
[cause] Oversight when updating the factory.
[solution] Use a tighter fudge factor and add a test of no-match case.
Change-Id: I81faf120fbced868bd4b287018d9f007c8ac56cf
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Tue, 16 Dec 2014 19:33:56 +0000 (19:33 +0000)]
remove 58k unnecessary asserts from dali-demo startup
Change-Id: If9713cdc76dcc60cb2d63104e98b61afb8c0e05e
Francisco Santos [Wed, 17 Dec 2014 14:51:37 +0000 (14:51 +0000)]
Do not give an error for actors with size zero.
Change-Id: I9a822df02ea4b03b318f53417c857bbf0cf2ecef
Kimmo Hoikka [Tue, 16 Dec 2014 12:10:37 +0000 (12:10 +0000)]
Remove std::map from custom property lookup, removes some 577 map.find calls from dali-demo startup
[Problem] too much processing, too much memory consumption
[Cause] std::map used to store properties
[Solution] change to dali ownercontainer instead
Change-Id: I4653f3e26a83989a10eb22c45852efab27cd703f
Kimmo Hoikka [Tue, 16 Dec 2014 17:00:52 +0000 (09:00 -0800)]
Merge "Added cubic interpolation for key-frame animations" into tizen
Andrew Cox [Thu, 4 Dec 2014 18:01:25 +0000 (18:01 +0000)]
Image Scaling and filtering - Core API & Cache
Change-Id: Ibe28044b78a4ba7b44f69bce59eeffd3355137d6
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Andrew Cox [Fri, 12 Dec 2014 17:32:19 +0000 (17:32 +0000)]
Added ScopedPointer to build system
Change-Id: I12af3053c98c5353160fdcfd091691f7ede56675
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Andrew Cox [Fri, 12 Dec 2014 17:32:19 +0000 (17:32 +0000)]
Added a ScopedPointer to public API
A simple template class to call delete on an owned pointer when it goes
out of scope, whether that be by ordinary return or stack unwind for
exception throw.
Change-Id: Id4a9f09d1f0b69f85131f771d48d87bcc137350b
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Paul Wisbey [Fri, 12 Dec 2014 14:47:35 +0000 (14:47 +0000)]
Fixed some README comments
dali_env is in build/scripts, not build.
To get a summary.xml for the automated tests use this command: ./execute.sh -s
Change-Id: I8ec329c7341e6a88157f053ee6912ae013a4d051
Ferran Sole [Tue, 2 Dec 2014 16:46:20 +0000 (16:46 +0000)]
Added cubic interpolation for key-frame animations
[Problem] Key-frame animations only supports linear interpolation between key values
[Cause] n/a
[Solution] Allow the user to specify which interpolation method to use [Linear,Cubic]
Added unit tests for cubic interpolation
Change-Id: I152fbd2211d4b7fa52fd44f315c05869cccdd684
Nick Holland [Thu, 11 Dec 2014 15:02:42 +0000 (15:02 +0000)]
[dali_1.0.21] Merge branch 'tizen'
Change-Id: I57126741b8a9e031a7e9b038e0967b96c9a3189f
Nick Holland [Thu, 11 Dec 2014 15:02:23 +0000 (15:02 +0000)]
DALi Version 1.0.21
Change-Id: I4029b8358febcdcdb1cc36c546b05b9d492b8149
Kingsley Stephens [Tue, 9 Dec 2014 15:05:07 +0000 (15:05 +0000)]
Klockwork: Fix CheckGlError assert condition
Change-Id: I9f7d57869091431676deeae095f54d13b9f4d434
Adeel Kazmi [Fri, 5 Dec 2014 16:19:11 +0000 (08:19 -0800)]
Merge "Updated test harness behaviour" into tizen
David Steele [Tue, 2 Dec 2014 15:53:43 +0000 (15:53 +0000)]
Updated test harness behaviour
Running the execute.sh script
o Running "./execute.sh" with no arguments runs each of the test modules with
parallel test case execution.
o Running with "-r" option re-runs failing test cases
o Running with the name of a test module runs only that test module, with
remaining arguments passed on. (i.e, can use -r and test case name)
o Running with a test case name will run each module with that test case name,
and display it's output, or a message if it wasn't found in any test module.
o Running with "-s" option runs the testkit-lite harness (executes all tests serially,
writes to XML output). This has the old behaviours:
o Can run each test module individually by specifying it's name first.
o Can run all tests in a test file by specifying the source filename
Executing a test module directly now has the following behaviour:
o With no arguments, runs all the test cases in parallel.
o With "-r" option, it will run all the test cases in parallel, then rerun
the failing test cases serially (with readable output)
o Running with a test case name will execute only that test case and displays
it's output on the command line
Colorised the output
Change-Id: Ibec29f043b7e4a31d67d0908aa52549953cd97ed
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Adeel Kazmi [Wed, 3 Dec 2014 17:06:05 +0000 (09:06 -0800)]
Merge "DALi Version 1.0.20" into tizen
Adeel Kazmi [Wed, 3 Dec 2014 13:53:34 +0000 (05:53 -0800)]
Merge "Change keep running reasons to enum from exported symbols to avoid external symbol lookup" into tizen
Lee Morgan [Wed, 3 Dec 2014 12:31:04 +0000 (12:31 +0000)]
[dali_1.0.20] Merge branch 'tizen'
Change-Id: I9f1aa3c8d2a030ac953ce7124d00bcf9083ed99d
Lee Morgan [Wed, 3 Dec 2014 12:21:40 +0000 (12:21 +0000)]
DALi Version 1.0.20
Change-Id: I3dce23d153c2cc3325c5db4c94418a4c433a8bb7
Kimmo Hoikka [Tue, 2 Dec 2014 17:57:26 +0000 (17:57 +0000)]
Change keep running reasons to enum from exported symbols to avoid external symbol lookup
Change-Id: I6cd0375a6e6b117311fc0df2ba8a00afd0559870
Kimmo Hoikka [Mon, 1 Dec 2014 16:52:46 +0000 (16:52 +0000)]
Cleanup property system, remove 12 redundant std::maps and 114 std::strings being created in startup
Change-Id: Id7105d126eacaadc9c9efdb5c75a660697203177
Kimmo Hoikka [Tue, 2 Dec 2014 16:47:59 +0000 (08:47 -0800)]
Merge "Refactor ImageFactory file path to hash lookup" into tizen
Andrew Cox [Mon, 1 Dec 2014 21:57:21 +0000 (21:57 +0000)]
Refactor ImageFactory file path to hash lookup
Also beefs-up some documentation around resource loading.
Change-Id: Ifd6b240a700ee0b57d29c8a6f95a1186cff84d7e
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Francisco Santos [Fri, 28 Nov 2014 18:47:25 +0000 (18:47 +0000)]
Safeguard when Actor size is too big.
Change-Id: I21355ac8041a137ad5c6bb0feb89965a280c0326
Adeel Kazmi [Tue, 2 Dec 2014 10:16:14 +0000 (02:16 -0800)]
Merge "Updated test harness to allow parallel execution" into tizen
Kimmo Hoikka [Mon, 1 Dec 2014 18:02:21 +0000 (18:02 +0000)]
Fix the broken camera test case
Change-Id: Id5ee56ba072d408eaa93095a6d910821bc98147f
David Steele [Fri, 28 Nov 2014 20:34:14 +0000 (20:34 +0000)]
Updated test harness to allow parallel execution
Also ensured build script stops on error
WARNING!
Executing in parallel bypasses TestKit-Lite and does not produce XML output.
Change-Id: Ic756ebf6bc69db023494253d6a45b13419323451
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Kimmo Hoikka [Fri, 28 Nov 2014 16:06:57 +0000 (08:06 -0800)]
Merge "Reconfigured dynamics test cases" into tizen
David Steele [Thu, 27 Nov 2014 20:37:57 +0000 (20:37 +0000)]
Reconfigured dynamics test cases
Test cases were failing when there was no dynamics support configured.
Have modified the test cases to pass when support is not configured with
a warning message.
Change-Id: I72a0b563d3ed8064ea49e7fe1328468efd66fa95
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Kimmo Hoikka [Fri, 28 Nov 2014 12:02:55 +0000 (12:02 +0000)]
Friendly janitor cleaning up unnecessary header dependencies
Change-Id: Ic55a10e16aea2817af8260bd55feb052e2c0c305
Kimmo Hoikka [Fri, 28 Nov 2014 14:10:02 +0000 (06:10 -0800)]
Merge "Removed unnecessary templating and initializing internal objects with exported constants --> reduces export table lookups and speeds up compilation due to less template mess" into tizen
Kimmo Hoikka [Fri, 28 Nov 2014 14:09:50 +0000 (06:09 -0800)]
Merge "Fixed documentation build break in path.h" into tizen
Kimmo Hoikka [Fri, 28 Nov 2014 11:22:18 +0000 (11:22 +0000)]
Removed unnecessary templating and initializing internal objects with exported constants
--> reduces export table lookups and speeds up compilation due to less template mess
Change-Id: I22d70a20277a5b522e7c156366a266a2cce441db
Kimmo Hoikka [Fri, 28 Nov 2014 12:38:07 +0000 (04:38 -0800)]
Merge "Shader & Program cleanup, Part 2: Stop calling render thread methods from update threads, cache uniform coordinate types - saves over 1000 messages in bubble effect start, 180 in dali-demo startup - fixed unmanaged test cases - fixed a regression in setting shader from script - removed non-functional geometry mapping enum" into tizen
Kimmo Hoikka [Thu, 27 Nov 2014 19:45:04 +0000 (19:45 +0000)]
Shader & Program cleanup, Part 2: Stop calling render thread methods from update threads, cache uniform coordinate types
- saves over 1000 messages in bubble effect start, 180 in dali-demo startup
- fixed unmanaged test cases
- fixed a regression in setting shader from script
- removed non-functional geometry mapping enum
Change-Id: Ida2e0ec0af1b5c9756691f2513183f2fb65fb124
Ferran Sole [Fri, 28 Nov 2014 10:26:51 +0000 (10:26 +0000)]
Fixed documentation build break in path.h
Change-Id: Ia9eb8c69d0d25228c83689a436f38fbd7aef1d09
Kimmo Hoikka [Thu, 27 Nov 2014 18:23:01 +0000 (10:23 -0800)]
Merge "Check for NULL resource ticket pointer" into tizen
Kimmo Hoikka [Thu, 27 Nov 2014 18:22:51 +0000 (10:22 -0800)]
Merge "Added api to animate an actor (position and orientation) through a path" into tizen
Ferran Sole [Wed, 12 Nov 2014 11:41:57 +0000 (11:41 +0000)]
Added api to animate an actor (position and orientation) through a path
[Problem] N/A
[Cause] N/A
[Solution] N/A
Change-Id: Ibcf6a98cd073c145b3b873822aecde73afb31e39
Andrew Cox [Fri, 21 Nov 2014 16:15:11 +0000 (16:15 +0000)]
Save both Image width and height if either is requested
[problem]
Too many file operations for reading image dimensions synchronously
are showing up in profiles.
[cause]
Image::GetWidth() and Image::GetHeight() each separately initiates
a file read of the image header if the image is not loaded yet.
[solution]
Modify Image::GetWidth() and Image::GetHeight() so that whichever is
called first will save both.
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I8116bbcb682e27eb9aaa0fe7904086df46e7699e
Kevin Butchart [Wed, 26 Nov 2014 17:50:07 +0000 (17:50 +0000)]
Check for NULL resource ticket pointer
When reloading resources after context loss, it is possible for
some of the resources to have already been destroyed, but still
be in the map in the image factory. In this case the search
for the ResourceTicket returns a NULL pointer which should be
checked for.
Change-Id: I967e7e07021903ad57d9a1617295bf94f16b53b6
Kingsley Stephens [Thu, 27 Nov 2014 11:32:04 +0000 (11:32 +0000)]
[dali_1.0.19] Merge branch 'release19'
Change-Id: Ie4e958e8fd80033e0773da67332abbe6b6cee7e2
Kingsley Stephens [Thu, 27 Nov 2014 11:26:02 +0000 (11:26 +0000)]
DALi Version 1.0.19
Change-Id: I9690bba71781c4db7c01d351024b66ea2cac50af
Kimmo Hoikka [Wed, 26 Nov 2014 18:59:16 +0000 (10:59 -0800)]
Merge "Increased precision of texture coordinate in textured mesh shader" into tizen
Kimmo Hoikka [Wed, 26 Nov 2014 18:52:04 +0000 (10:52 -0800)]
Merge "Shader & Program cleanup, Part 1: Remove cyclic dependency between programs and context, remove shader from binary saving path Removes 10 exports and reduces 5 relocs (on Ubuntu profile)" into tizen
Richard Huang [Wed, 26 Nov 2014 16:13:05 +0000 (16:13 +0000)]
Increased precision of texture coordinate in textured mesh shader
Change-Id: I9ad64c6aaef1d014452c5815c8aede41b08e5607
Adeel Kazmi [Tue, 25 Nov 2014 15:06:26 +0000 (07:06 -0800)]
Merge "(TextActor) Ensure TextAttachment is updated after SetTextStyle" into tizen
Kimmo Hoikka [Fri, 21 Nov 2014 11:54:29 +0000 (11:54 +0000)]
Shader & Program cleanup, Part 1: Remove cyclic dependency between programs and context, remove shader from binary saving path
Removes 10 exports and reduces 5 relocs (on Ubuntu profile)
Change-Id: I2aef34c54fcb58904d456e5d767f96f6c8352447
Richard Huang [Fri, 21 Nov 2014 18:10:20 +0000 (18:10 +0000)]
Fixed shader effect precision for mesh
Change-Id: I0a08d89e2a89f95c9f3b35bed6ec1944b556bf2e
Kimmo Hoikka [Thu, 20 Nov 2014 15:10:34 +0000 (07:10 -0800)]
Merge "fix shader binary compilation to work with lazy compilation" into tizen
Kimmo Hoikka [Mon, 20 Oct 2014 15:30:44 +0000 (16:30 +0100)]
fix shader binary compilation to work with lazy compilation
[Problem] shader binary saving was assuming immediately compilation
[Cause]
[Solution] if shader binaries are supported, compile shader immediately for the first time
Change-Id: Id3089046edf5a366ec8c852382a069927f4c980d
Kimmo Hoikka [Mon, 17 Nov 2014 15:26:09 +0000 (15:26 +0000)]
clean up Dali::Any comments and code
[Problem]
[Cause]
[Solution]
Change-Id: Icaa88fea31e8e92c8b6305f5720275c6a529c21c
Xiangyin Ma [Thu, 20 Nov 2014 13:09:30 +0000 (13:09 +0000)]
[dali_1.0.18] Merger branch 'tizen'
Change-Id: I19126efaa4056facab17b984dec53f910f072743
Xiangyin Ma [Thu, 20 Nov 2014 12:54:01 +0000 (12:54 +0000)]
DALi Version 1.0.18
Change-Id: If9671a4e1dd859710409ef208ddce6e7a0a84125
Agnelo Vaz [Tue, 18 Nov 2014 14:43:50 +0000 (14:43 +0000)]
(TextActor) Ensure TextAttachment is updated after SetTextStyle
DoRender in Scene graph text Renderer always had the same pixel size for different font sizes because TextChanged was not called in TextAttachment SetStyle
Change-Id: Ida7f58b4f62577256aecd2fc267210ff42ad260a
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Kimmo Hoikka [Fri, 14 Nov 2014 16:28:03 +0000 (16:28 +0000)]
Reduce texture binds and active texture calls for draw calls by better caching
[Problem]
[Cause]
[Solution]
Change-Id: Ic9d57d4016cd2fd732fac4688aa30f9ad41b2846
Francisco Santos [Fri, 14 Nov 2014 16:43:23 +0000 (16:43 +0000)]
Fixed throwing exceptions from destructors.
Change-Id: I7338f26f821a762d3ff00c06c757659c412a706f
Francisco Santos [Fri, 14 Nov 2014 16:28:48 +0000 (16:28 +0000)]
Iterator is no longer valid after erase.
Change-Id: I5655528f2787e53ce427c407d276671ae01051e5
Francisco Santos [Fri, 14 Nov 2014 16:25:38 +0000 (16:25 +0000)]
Realloc failure not handled
Change-Id: If6e8e5989a131748aa4489d94e53d9da3a9db0fd
Kimmo Hoikka [Wed, 12 Nov 2014 17:28:18 +0000 (17:28 +0000)]
remove std::auto_ptr from ProxyObject
[Problem]
[Cause]
[Solution]
Change-Id: I00262ab2c111eae4b3c13c4619a295db28b441a4
Kimmo Hoikka [Fri, 14 Nov 2014 10:14:01 +0000 (10:14 +0000)]
fix failing tests: 2 incorrect test cases 1 memory leak in dali core
[Problem]
[Cause]
[Solution]
Change-Id: I0b5196756ce3716013eb944c955e7d51cdf4469c
Francisco Santos [Thu, 13 Nov 2014 18:31:47 +0000 (18:31 +0000)]
Fix issues reported by cppcheck
Issues include:
Prefer prefix ++/-- operators for non-primitive types.
Variable 'X' is reassigned a value before the old one has been used.
Change-Id: I15f15fec179a9eaa2253099690b9ac46b6189329
Kimmo Hoikka [Thu, 13 Nov 2014 12:43:28 +0000 (04:43 -0800)]
Merge "(CustomActorImpl) Remove unused key-input-focus methods" into tizen
Nick Holland [Thu, 13 Nov 2014 11:29:30 +0000 (11:29 +0000)]
[dali_1.0.17] Merge branch 'tizen'
Change-Id: I4808a57c41d94af0b92e06679d22d8a88ff18494
Nick Holland [Thu, 13 Nov 2014 11:23:01 +0000 (11:23 +0000)]
DALi Version 1.0.17
Change-Id: I2f51546406f6e7fcc08021c0f0d8db3f21c0c0d0
Kimmo Hoikka [Wed, 12 Nov 2014 18:46:34 +0000 (10:46 -0800)]
Merge "Klockwork: Remove unreachable code" into tizen
Kimmo Hoikka [Wed, 12 Nov 2014 11:53:16 +0000 (11:53 +0000)]
proper enums for texture units to improve readability and allow renderer type specific units for less state changes
[Problem]
[Cause]
[Solution]
Change-Id: Ibdacf7b632f4922cb0a991b267d9723bfd0c71ae
Adeel Kazmi [Wed, 12 Nov 2014 16:53:58 +0000 (16:53 +0000)]
(CustomActorImpl) Remove unused key-input-focus methods
Change-Id: Ibf7ffa77cc75eeb83cdf0616be2f218f9de715b2
Adeel Kazmi [Wed, 12 Nov 2014 16:05:22 +0000 (08:05 -0800)]
Merge "Remove a few exports by getting rid of two std::vectors and two std::sets" into tizen
Kimmo Hoikka [Wed, 12 Nov 2014 13:30:24 +0000 (13:30 +0000)]
Cleaning up property public API
[Problem]
[Cause]
[Solution]
Change-Id: Ia2748d13d3bba9f3a132e4e8bec57eb3707c92a7
Kimmo Hoikka [Mon, 10 Nov 2014 17:53:42 +0000 (17:53 +0000)]
Remove a few exports by getting rid of two std::vectors and two std::sets
[Problem]
[Cause]
[Solution]
Change-Id: I84df0e7804fd732002cd09db72879b4f82c9f211
Adeel Kazmi [Tue, 11 Nov 2014 15:50:22 +0000 (15:50 +0000)]
(Gestures) Pass const refs in callbacks
Change-Id: I783837af2e3021649c64d78ad63294902029fea7
Kingsley Stephens [Tue, 11 Nov 2014 16:02:17 +0000 (16:02 +0000)]
Klockwork: Remove unreachable code
Change-Id: I539ccfb17c9748f3b2b3007c6c3c6d7ff0470798
Adeel Kazmi [Tue, 11 Nov 2014 10:37:07 +0000 (10:37 +0000)]
(Automated Tests) Fix build break
Change-Id: I5b2b2ceb3317d04a6c3481941f9ea316588aebcd
Kimmo Hoikka [Fri, 7 Nov 2014 16:37:49 +0000 (16:37 +0000)]
Cleaning up shader-effect-impl in preparation for future fixes
[Problem]
[Cause]
[Solution]
Change-Id: Ieef7b50f71bf8462b6fc1c5b09d5473995eeb0bb
Kimmo Hoikka [Fri, 7 Nov 2014 17:18:03 +0000 (17:18 +0000)]
removing use of using namespace std;
[Problem]
[Cause]
[Solution]
Change-Id: Ic1e4cafe06369ff5ed8da0a3d066021caa44e537
David Steele [Thu, 6 Nov 2014 15:55:03 +0000 (15:55 +0000)]
Updated shaders, shader script and geometry types.
Updated shader generation script to automatically generate custom
prefix and postfix strings from the main shaders. Deleted prefix/postfix
shaders.
Renamed shader sources to be meaningful.
Renamed shader geometry types to be consistent and meaningful
Change-Id: I8e3a09ba43b450d1bc9eb34d8a559c05a55bb4a4
Signed-off-by: David Steele <david.steele@partner.samsung.com>