Adeel Kazmi [Wed, 17 Jun 2020 10:54:24 +0000 (10:54 +0000)]
Merge "Remove Actor::OnStage public API" into devel/master
Richard Huang [Wed, 17 Jun 2020 10:11:46 +0000 (11:11 +0100)]
Remove Actor::OnStage public API
Change-Id: I52c0db4981a2faefd6ba10443b5f0156933a00ac
Adeel Kazmi [Wed, 17 Jun 2020 09:24:34 +0000 (09:24 +0000)]
Merge "Replace some Dali::Actor public APIs with new properties" into devel/master
Richard Huang [Tue, 16 Jun 2020 11:11:50 +0000 (12:11 +0100)]
Replace some Dali::Actor public APIs with new properties
Change-Id: I84865a0f1050abfb5f89dd8b05fd91c0736a4243
Adeel Kazmi [Tue, 16 Jun 2020 14:07:22 +0000 (15:07 +0100)]
Remove NativeImage
Change-Id: Ia2f92c5eb0365733d4a63709333c465e03e6c1d1
Heeyong Song [Mon, 8 Jun 2020 08:39:43 +0000 (17:39 +0900)]
Always throw an exception in GetEventThreadServices() if the Core is not running
Change-Id: If6e77e7b61ba02319a39079c6619682d5bffd4a8
Adeel Kazmi [Fri, 12 Jun 2020 16:57:06 +0000 (17:57 +0100)]
BufferImage Removal
Change-Id: Ib7daba0bd04cdcbb850488f23746f1ae85d055ad
Adeel Kazmi [Fri, 12 Jun 2020 15:36:49 +0000 (16:36 +0100)]
(Scripting) Remove Image class Usage
Change-Id: I71b7b14762a1bc3bdae106b55642c62160d4d088
Cheng-Shiun Tsai [Fri, 12 Jun 2020 09:06:51 +0000 (10:06 +0100)]
DALi Version 1.9.16
Change-Id: I162e0ba7519c218799ee5ee1d95510e947055647
Richard Huang [Wed, 10 Jun 2020 12:49:27 +0000 (13:49 +0100)]
Remove Setter/Getter public APIs from Dali::Layer
Change-Id: Ic256f62b5488ee271802ff24aeaac1283c1d4634
Adeel Kazmi [Tue, 9 Jun 2020 21:00:10 +0000 (22:00 +0100)]
(AutomatedTests) Remove most BufferImage Usage
Change-Id: I83bf923e1a85e917d34e8e28801dd7a90de89a98
Adeel Kazmi [Mon, 8 Jun 2020 16:42:27 +0000 (17:42 +0100)]
Remove NinePatchImage
Change-Id: Ifb13537311981d83b8dc18078b2e857e1dd13188
Adeel Kazmi [Mon, 8 Jun 2020 13:20:01 +0000 (14:20 +0100)]
Remove EncodedBufferImage
Change-Id: Id883d9910037f0ed8380facf4a9bfc159feea6c4
Anton Obzhirov [Fri, 5 Jun 2020 10:20:42 +0000 (11:20 +0100)]
DALi Version 1.9.15
Change-Id: Ibd80f5eebe7affe7517e24d0d95855a0dad96465
Richard Huang [Tue, 2 Jun 2020 16:15:31 +0000 (17:15 +0100)]
Further Setter/Getter public API removal from Dali::Actor
Change-Id: I121380ad068c2825957405652331597769fb0bc7
Adeel Kazmi [Thu, 4 Jun 2020 09:05:13 +0000 (09:05 +0000)]
Merge "Add DALI_CORE_API at the DevelFrameBuffer apis" into devel/master
Seungho, Baek [Thu, 4 Jun 2020 01:55:09 +0000 (10:55 +0900)]
Add DALI_CORE_API at the DevelFrameBuffer apis
- With the patch "Util functions that convert a kind of buffers to url"
Change-Id: I978ae6d7c2d0ec44e70253de13df7686aa82e015
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Seungho, Baek [Tue, 2 Jun 2020 06:29:18 +0000 (15:29 +0900)]
Return Animation information
Change-Id: Icc69c676d45ae5205bfa8a30bdae83aa9bff01a4
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Heeyong Song [Tue, 19 May 2020 08:27:08 +0000 (17:27 +0900)]
Ensure not rendering before a Renderer is added
Change-Id: Ia933e3058e90ca563d035f8d041fc062a96625e3
Heeyong Song [Fri, 29 May 2020 02:05:28 +0000 (11:05 +0900)]
Fix actor size issue
SetSize() was ignored if Actor::SetSize() and the size animation was used at the same time
because the mRelayoutData->preferredSize was updated in OnNotifyDefaultPropertyAnimation().
Do not change mRelayoutData->preferredSize in OnNotifyDefaultPropertyAnimation()
and keep the animated size value as a separate value while the animation is playing.
Change-Id: I2de604e9e10c22e970dbc5902826cd67eb306f54
Adeel Kazmi [Fri, 29 May 2020 11:17:24 +0000 (12:17 +0100)]
DALi Version 1.9.14
Change-Id: Id11621baf1adb6746fe5274900093feba0ea03a0
Richard Huang [Thu, 28 May 2020 12:55:50 +0000 (13:55 +0100)]
Add assignment operator for Rect to take Vector4
Change-Id: I4a91f7fbbfc4b12c9cc10c42ce00b70ce85ccca0
Richard Huang [Wed, 27 May 2020 13:00:07 +0000 (14:00 +0100)]
Remove more public Setter/Getter APIs from Dali::Actor
Change-Id: I2bdf4121679a09af4b0880675d244f3bb2a883f8
sunghyun kim [Wed, 27 May 2020 00:51:32 +0000 (00:51 +0000)]
Merge "Call SetClearEnabled() for clearing background" into devel/master
Sunghyun Kim [Thu, 21 May 2020 02:23:27 +0000 (11:23 +0900)]
Call SetClearEnabled() for clearing background
Default window already set Background because it is base on stage
But extra Window doesn't set background.
Change-Id: I0cada60409361bd31e4b01f2b2fd8333c2fe671b
Seungho, Baek [Mon, 25 May 2020 06:32:47 +0000 (15:32 +0900)]
Fix documentation of FrameBuffer
Change-Id: I2769eb346761de6b33c3dc893d41b166f1841a62
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
adam.b [Fri, 22 May 2020 09:53:44 +0000 (10:53 +0100)]
DALi Version 1.9.13
Change-Id: I04c1182829fc4acf610d079249264ba9faa438bf
Richard Huang [Tue, 19 May 2020 12:43:33 +0000 (13:43 +0100)]
Remove some public Setter/Getter APIs from Dali::Actor
Change-Id: Ibe93035af4c549162d57761ec38d44f107dcb41d
Seoyeon Kim [Mon, 18 May 2020 04:52:55 +0000 (13:52 +0900)]
Add internal tag to VectorAlgorithms
- To hide VectorAlgorithms template for app developers,
added @cond internal tag to it.
Change-Id: I151c749d91cb8c06a1eddb84a62bf69bd8fa1f8c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Victor Cebollada [Fri, 15 May 2020 05:51:40 +0000 (06:51 +0100)]
DALi Version 1.9.12
Change-Id: If55a53797074567399b2d30e2c1e09c8a9cc7ab3
Heeyong Song [Mon, 11 May 2020 08:30:55 +0000 (17:30 +0900)]
Use discard queue to delete Scenes
The RenderManager uses Scenes. So they should be deleted in the next frame.
Change-Id: Ic8002039ae304d0485f312df31e800af17bfe19c
Richard Huang [Thu, 7 May 2020 11:15:54 +0000 (12:15 +0100)]
DALi Version 1.9.11
Change-Id: I2d5ea5dd71ee8e88517229a9da55e7d643d21c46
Adeel Kazmi [Mon, 4 May 2020 19:27:50 +0000 (19:27 +0000)]
Merge "Libraries & RPM renamed to provide DALi 2" into devel/master
György Straub [Fri, 1 May 2020 11:00:41 +0000 (12:00 +0100)]
DALi Version 1.9.10
Change-Id: I4adc9bdf3ce7c3e5948f048457c42c2282367a4b
Heeyong Song [Wed, 29 Apr 2020 08:22:32 +0000 (17:22 +0900)]
Restore public API change
Change-Id: I8d6d98b0dfc3e1391caafad51aa2391da71e4ff7
Adeel Kazmi [Mon, 27 Apr 2020 16:18:54 +0000 (17:18 +0100)]
Libraries & RPM renamed to provide DALi 2
Change-Id: Ibf45581c84c66d7cdb175e60fdee38d03f79f906
greynaga [Fri, 24 Apr 2020 15:00:30 +0000 (16:00 +0100)]
DALi Version 1.9.9
Change-Id: Ibcfb8f6cd748e243f824ceca526994029e7d0577
Adeel Kazmi [Wed, 22 Apr 2020 09:03:45 +0000 (09:03 +0000)]
Merge "add DALI_CORE_API" into devel/master
Joogab Yun [Wed, 22 Apr 2020 03:29:32 +0000 (12:29 +0900)]
add DALI_CORE_API
Change-Id: If3f1fc28d2d49af0bf84b75db3716de5ed060dc9
Seungho, Baek [Tue, 17 Mar 2020 08:09:40 +0000 (17:09 +0900)]
Using Depth and Stencil buffer & texture
- Add DEPTH_UNSIGNED_INT and DEPTH_FLOAT for depth
- Add DEPTH_STENCIL for depth and stencil
- Add AttachDepthTexture and AttachDepthStencilTexture to use Depth/Stencil buffer of FBO as a input
Change-Id: Ia7483e2e7b81de170143585eed99cabf65c89c00
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Adeel Kazmi [Fri, 17 Apr 2020 10:50:59 +0000 (10:50 +0000)]
Merge "Fix VCPKG CMake build issue." into devel/master
Cheng-Shiun Tsai [Fri, 17 Apr 2020 09:06:49 +0000 (10:06 +0100)]
DALi Version 1.9.8
Change-Id: I8290d6e236d472430d79df5821d1991789f11d6d
Victor Cebollada [Thu, 16 Apr 2020 15:59:59 +0000 (16:59 +0100)]
Fix VCPKG CMake build issue.
Change-Id: Id19f3a4c18e86f1a83c102432aa1db5c87142877
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 15 Apr 2020 16:19:53 +0000 (16:19 +0000)]
Merge "Update dali_env script to install required libraries" into devel/master
Richard Huang [Wed, 15 Apr 2020 15:52:09 +0000 (16:52 +0100)]
Update dali_env script to install required libraries
Change-Id: I4d005a95c776b900061339ca555cc5d8ef97282e
Victor Cebollada [Thu, 30 Jan 2020 07:23:31 +0000 (07:23 +0000)]
CMake for MS Windows command line
Change-Id: I6c1a60460fb9c19620e1e2dd7ac8258692b52649
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Anton Obzhirov [Thu, 9 Apr 2020 14:48:03 +0000 (15:48 +0100)]
DALi Version 1.9.7
Change-Id: Iae6e17dfe622444a7a9c71d7fb83ce319457420e
Heeyong Song [Fri, 3 Apr 2020 08:35:11 +0000 (08:35 +0000)]
Merge "Set the alpha to 1 when Vector3 is used for the COLOR property" into devel/master
Adeel Kazmi [Fri, 3 Apr 2020 07:38:09 +0000 (08:38 +0100)]
DALi Version 1.9.6
Change-Id: I80a4b63ad67d613db3b910e294e3cea935bfd3e4
Heeyong Song [Thu, 2 Apr 2020 05:32:16 +0000 (14:32 +0900)]
Set the alpha to 1 when Vector3 is used for the COLOR property
Change-Id: I8e82fcfff16a68098ffaac822fda8a32ad7d752c
Heeyong Song [Wed, 1 Apr 2020 09:27:50 +0000 (09:27 +0000)]
Merge "Update the prefered size in OnNotifyDefaultPropertyAnimation" into devel/master
Adeel Kazmi [Mon, 30 Mar 2020 14:40:58 +0000 (14:40 +0000)]
Merge "Remove RenderSurface from Core" into devel/master
Víctor Cebollada [Mon, 30 Mar 2020 10:02:36 +0000 (10:02 +0000)]
Merge "Fix MSVC warning." into devel/master
adam.b [Fri, 27 Mar 2020 13:28:39 +0000 (13:28 +0000)]
DALi Version 1.9.5
Change-Id: Ie86367c31969d191b2ec75619671902dd6b0aee1
Richard Huang [Thu, 20 Feb 2020 10:55:01 +0000 (10:55 +0000)]
Remove RenderSurface from Core
Change-Id: I416d7b5613634b6d32f9531c5ad15ba3ca62a5d2
Victor Cebollada [Thu, 6 Feb 2020 11:45:33 +0000 (11:45 +0000)]
Fix MSVC warning.
* warning C4804: '+=': unsafe use of type 'bool' in operation
Change-Id: I7e190bc9655377d3c45364ac75e60f9650b3ab47
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Heeyong Song [Thu, 19 Mar 2020 03:59:11 +0000 (12:59 +0900)]
Update the prefered size in OnNotifyDefaultPropertyAnimation
Change-Id: I0e04ca2b93920f0c2ca123ab44c1b9ea33187426
Heeyong Song [Thu, 19 Mar 2020 05:38:23 +0000 (14:38 +0900)]
Add a test case for RenderTask
Change-Id: Ia31772f8f512e52d3030a46861c4c3292485d876
Adeel Kazmi [Fri, 20 Mar 2020 18:21:39 +0000 (18:21 +0000)]
Merge "Implementation of reflection feature" into devel/master
adam.b [Fri, 7 Feb 2020 17:49:41 +0000 (17:49 +0000)]
Implementation of reflection feature
Change-Id: I63e4e1d46acb7af7bd382d7e1c6f0b5e615a99db
Victor Cebollada [Fri, 20 Mar 2020 07:50:45 +0000 (07:50 +0000)]
DALi Version 1.9.4
Change-Id: If4141f9330826d3742d5460c3b8109118420b8ac
Heeyong Song [Thu, 19 Mar 2020 00:31:20 +0000 (00:31 +0000)]
Merge "Fix a crash of the RenderTask" into devel/master
Richard Huang [Fri, 13 Mar 2020 12:15:17 +0000 (12:15 +0000)]
DALi Version 1.9.3
Change-Id: I57fdcb6443d7d1c5fd431a3a54fc0c2b62523131
Heeyong Song [Thu, 12 Mar 2020 07:38:45 +0000 (16:38 +0900)]
Fix a crash of the RenderTask
If a source actor or a camera actor of the RenderTask are destoryed, then ensure they are appropriately updated
Change-Id: Ifb9db5d14dde2a648df5d9d4bb9e322369c20b5a
greynaga [Fri, 6 Mar 2020 12:02:09 +0000 (12:02 +0000)]
DALi Version 1.9.2
Change-Id: Ifdb5096d58d8c174ce6e059d253ae81c75b81100
György Straub [Fri, 28 Feb 2020 09:09:06 +0000 (09:09 +0000)]
DALi Version 1.9.1
Change-Id: Idc217f5981075e71d5550f927bff9b8ff1dc94d6
Paul Wisbey [Mon, 17 Feb 2020 16:28:52 +0000 (16:28 +0000)]
Moved SingletonService into dali-core
Change-Id: I72649695560fa6acafbdeb5f48df61c7d4c75509
Cheng-Shiun Tsai [Fri, 21 Feb 2020 14:12:22 +0000 (14:12 +0000)]
Use stack variable instead of global when computing matrix
This is to solve a synchronization problem with multiple DALi instances
Change-Id: I146880175b6e6b5644b232c17a3a1fc51103fc53
Cheng-Shiun Tsai [Fri, 21 Feb 2020 16:24:36 +0000 (16:24 +0000)]
DALi Version 1.9.0
Change-Id: I3a6358a20c4f205f709974fa16392d0599e0be84
György Straub [Tue, 18 Feb 2020 09:13:36 +0000 (09:13 +0000)]
Improved correctness of Program::GetActiveSamplerUniforms().
Problems:
- The current implementation picks up samplers that are declared as other
than uniforms (e.g. function arguments etc.), then, failing to find a
location associated with the same name, issues warnings about them.
- Tabs are ignored when tokenizing the shader source;
Solution: find declarations starting with "uniform" and ending with
a semicolon, then tokenize on whitespace (only), looking for the name
following a sampler* type declaration.
This also eliminates the need to tokenize the whole shader source.
- Also made some global const c-strings const pointers too;
Change-Id: Ibaa026d2e7873c28142300c149e6295f3cdbf7c5
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Adeel Kazmi [Fri, 14 Feb 2020 07:30:05 +0000 (07:30 +0000)]
DALi Version 1.5.0
Change-Id: I96797e30b26fb8aecee6c7c50dd1994190060f31
Adeel Kazmi [Thu, 13 Feb 2020 14:50:52 +0000 (14:50 +0000)]
(patch-coverage.pl) Ignore header files that yield no coverage
Change-Id: I5488a6c1d9f52db6f0d4ee7ee285cb6679c759fb
Wonsik Jung [Thu, 13 Feb 2020 01:30:27 +0000 (01:30 +0000)]
Merge "Fix property notificaition's bug for SIZE" into devel/master
Adeel Kazmi [Tue, 11 Feb 2020 12:47:03 +0000 (12:47 +0000)]
Remove Unused Retention policy
Change-Id: I544a3dfb9773be32e1b63e766a3bf063d98c0e4d
Wonsik Jung [Tue, 24 Dec 2019 11:25:25 +0000 (20:25 +0900)]
Fix property notificaition's bug for SIZE
When the property of SIZE is changed by swapping width and height in Vector3.
property notification signal does not occur.
Because vector's length are compared.
To fix, this patch has the comparing previous and current raw data itself.
Change-Id: Idbf0029653a73c10971e751b71366811661c73b7
Adeel Kazmi [Fri, 7 Feb 2020 19:49:14 +0000 (19:49 +0000)]
Merge "Few warnings removed (MSVC)." into devel/master
Anton Obzhirov [Thu, 6 Feb 2020 14:30:15 +0000 (14:30 +0000)]
DALi Version 1.4.57
Change-Id: I3521203dca8ec221eb16b80d9e17eb720ed1332e
Victor Cebollada [Thu, 6 Feb 2020 09:29:07 +0000 (09:29 +0000)]
Few warnings removed (MSVC).
* Specific pragma warnings for GNU
* Wrong struct/class forward declarations
Change-Id: Ia797176a955ca698266ffcb9b60ac05c1cdc91b2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 5 Feb 2020 12:28:32 +0000 (12:28 +0000)]
Merge "Add methods to set variables for Pinch and Rotation gesture processing" into devel/master
Heeyong Song [Wed, 5 Feb 2020 02:00:08 +0000 (11:00 +0900)]
Add a test case for RenderTask::SetClearEnabled()
Change-Id: I446cb60e16b57a1f579bee7a516e5bcfb645980a
Jiyun Yang [Tue, 21 Jan 2020 11:00:47 +0000 (20:00 +0900)]
Add methods to set variables for Pinch and Rotation gesture processing
- Set the minimum touch events required before a pinch can be started
- Set the minimum touch events required after a pinch started
- Set the minimum touch events required before a rotation can be started
- Set the minimum touch events required after a rotation started
Change-Id: Ib9e268d2508e9b529bf219ac6662b9d82da52092
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Heeyong Song [Fri, 31 Jan 2020 05:39:34 +0000 (14:39 +0900)]
Fix a bug that RenderTask::SetClearEnabled(false) doesn't work
Change-Id: I38f37263b1a763125e82a4d90f4df9f8ce9fd742
adam.b [Fri, 31 Jan 2020 11:12:43 +0000 (11:12 +0000)]
DALi Version 1.4.56
Change-Id: Iaa7565748cdf703c35cd6d5f65609ec457f0a215
Adeel Kazmi [Fri, 24 Jan 2020 14:17:44 +0000 (14:17 +0000)]
Merge "DALi Version 1.4.55" into devel/master
Victor Cebollada [Fri, 24 Jan 2020 13:49:17 +0000 (13:49 +0000)]
DALi Version 1.4.55
Change-Id: I69a4feffa3fc58bb37d50934979e8d8526e7e4c0
Adeel Kazmi [Fri, 24 Jan 2020 11:27:15 +0000 (11:27 +0000)]
Merge "Only change the resize policy to fixed if we haven't set the resize policy before" into devel/master
Adeel Kazmi [Fri, 24 Jan 2020 08:14:27 +0000 (08:14 +0000)]
Move Added FrameBuffer API to Devel API
Change-Id: Ida5d7776f40bcfd4c0fbf1ee79964fc5b0f2082a
Adeel Kazmi [Thu, 23 Jan 2020 17:28:44 +0000 (17:28 +0000)]
Only change the resize policy to fixed if we haven't set the resize policy before
Change-Id: I0322a8b50a22a5f5b2dcf13da763f66ee6ae979a
Adeel Kazmi [Thu, 23 Jan 2020 17:00:01 +0000 (17:00 +0000)]
Merge "Added support for Multiple Render Targets, to Dali::FrameBuffer." into devel/master
Adeel Kazmi [Thu, 23 Jan 2020 16:52:30 +0000 (16:52 +0000)]
Merge "VCPKG - CMakeLists.txt updated to build for vcpkg." into devel/master
György Straub [Wed, 15 Jan 2020 16:08:20 +0000 (16:08 +0000)]
Added support for Multiple Render Targets, to Dali::FrameBuffer.
- A maximum of 8 colour attachment are currently supported (as the minimum
required by the OpenGL standard);
- Repeated calls to AttachColorTexture() adds subsequent color attachments;
- Added a GetColorAttachment() overload that takes an index; an empty handle
is returned when an invalid index was provided;
- An error is logged if the maximum is exceeded;
Change-Id: I0b4cc593ab5e40b17dc427956cd78950ab49e5ae
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Adeel Kazmi [Thu, 23 Jan 2020 14:30:28 +0000 (14:30 +0000)]
Merge "Change setting background color for Scene." into devel/master
Victor Cebollada [Wed, 11 Dec 2019 14:55:23 +0000 (14:55 +0000)]
VCPKG - CMakeLists.txt updated to build for vcpkg.
Change-Id: Iec9b2b83eacd7eadd5539712925452d4255e9047
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 21 Jan 2020 14:17:53 +0000 (14:17 +0000)]
Merge "MS Windows - Fix compile errors when debug is enabled." into devel/master
Adeel Kazmi [Mon, 20 Jan 2020 17:06:55 +0000 (17:06 +0000)]
Merge "Set ResizePolicy::FIXED even though the size is 0" into devel/master
Victor Cebollada [Fri, 17 Jan 2020 07:36:58 +0000 (07:36 +0000)]
MS Windows - Fix compile errors when debug is enabled.
* Builds with VCPKG
Change-Id: I209c6e4d4ec470595dc75d60965cd3ca76ecc394
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Anton Obzhirov [Fri, 10 Jan 2020 14:20:51 +0000 (14:20 +0000)]
Change setting background color for Scene.
Sets clear color to the default render task of the scene
instead of setting background color via frame buffer property.
Fixes problem when the scene surface is replaced and the background color
information is lost when new frame buffer is created.
Change-Id: I036837f790d1db0540baf82ff9305811d05ffa51
JIYUN YANG [Mon, 20 Jan 2020 08:28:19 +0000 (08:28 +0000)]
Merge "Add an environment variable for long press gesture" into devel/master
Heeyong Song [Tue, 31 Dec 2019 06:38:10 +0000 (15:38 +0900)]
Set ResizePolicy::FIXED even though the size is 0
Change-Id: Ic059465bc7d86faf5d8be9c9af439326bf9d8450
György Straub [Fri, 17 Jan 2020 08:48:20 +0000 (08:48 +0000)]
DALi Version 1.4.54
Change-Id: I389625836917a7982cb3345ba3a1e210e7c4a5e1