[dali_2.3.9] Merge branch 'devel/master'

Change-Id: I98314106f4a0690ab6e0fa3aca9631026ef08739

diff --git a/dali-csharp-binder/common/dali-wrap.cpp b/dali-csharp-binder/common/dali-wrap.cpp
index 5dfb663..b912bf4 100644 (file)
--- a/dali-csharp-binder/common/dali-wrap.cpp
+++ b/dali-csharp-binder/common/dali-wrap.cpp
@@ -25050,7 +25050,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_AddFrameCallback(
   arg1 = (Dali::Stage *)jarg1;
   arg3 = (Dali::Actor *)jarg3;
 
-  DevelStage::AddFrameCallback( *arg1, *arg2, *arg3 );
+  if(arg3 == nullptr)
+  {
+    DevelStage::AddFrameCallback( *arg1, *arg2, Dali::Actor() );
+  }
+  else
+  {
+    DevelStage::AddFrameCallback( *arg1, *arg2, *arg3 );
+  }
   return;
 }
 

diff --git a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
index 3d3eeef..3bc43b2 100644 (file)
--- a/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/dali-toolkit-wrap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15470,6 +15470,23 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_GetPositionAndSiz
   return proxy->GetPositionAndSize(id, *vector3_pos, *vector3_size);
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_GetWorldPositionScaleAndSize(void * updateProxy, unsigned int id, void* position, void* scale, void* size) {
+  Dali::UpdateProxy *proxy = (Dali::UpdateProxy*)updateProxy;
+  Dali::Vector3* vector3_pos = (Dali::Vector3 *)position;
+  Dali::Vector3* vector3_scale = (Dali::Vector3 *)scale;
+  Dali::Vector3* vector3_size = (Dali::Vector3 *)size;
+  return proxy->GetWorldPositionScaleAndSize(id, *vector3_pos, *vector3_scale, *vector3_size);
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_GetWorldTransformAndSize(void * updateProxy, unsigned int id, void* position, void* scale, void* orientation, void* size) {
+  Dali::UpdateProxy *proxy = (Dali::UpdateProxy*)updateProxy;
+  Dali::Vector3* vector3_pos = (Dali::Vector3 *)position;
+  Dali::Vector3* vector3_scale = (Dali::Vector3 *)scale;
+  Dali::Quaternion* quaternion_orientation = (Dali::Quaternion *)orientation;
+  Dali::Vector3* vector3_size = (Dali::Vector3 *)size;
+  return proxy->GetWorldTransformAndSize(id, *vector3_pos, *vector3_scale, *quaternion_orientation, *vector3_size);
+}
+
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_GetScale(void * updateProxy, unsigned int id, void* scale) {
   Dali::UpdateProxy *proxy = (Dali::UpdateProxy*)updateProxy;
   Dali::Vector3* vector3 = (Dali::Vector3 *)scale;
@@ -15506,7 +15523,6 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_FrameCallbackInterface_BakeColor(void *
   return proxy->BakeColor(id, *vector4);
 }
 
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetCustomAlgorithm(void * jarg1, void * jarg2) {
   KeyboardFocusManager arg1 ;
   Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *arg2 = 0 ;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 472545c..80fa9c3 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.3.8
+Version: 2.3.9
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT