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

Change-Id: I1bc82b0a265d782b46ac74d0f8ecd36550ac21ea

diff --git a/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp b/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
index afedb1b..9a592c6 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/clipboard-wrap.cpp
@@ -138,6 +138,22 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clipboard_DataReceivedSignal(void * ar
   return (void *)signal;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clipboard_DataSelectedSignal(void * argClipboard)
+{
+  Dali::Clipboard *clipboard = (Dali::Clipboard *) 0 ;
+  Dali::Clipboard::DataSelectedSignalType *signal = 0 ;
+
+  clipboard = (Dali::Clipboard *)argClipboard;
+  {
+    try
+    {
+      signal = (Dali::Clipboard::DataSelectedSignalType *) &(clipboard)->DataSelectedSignal();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return (void *)signal;
+}
+
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ClipboardSignal_Empty(void * argSignal)
 {
   Dali::Signal<void (Dali::Clipboard)> *signal = (Dali::Signal<void (Dali::Clipboard)> *) 0;

diff --git a/dali-csharp-binder/dali-adaptor/window-wrap.cpp b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
index e2280a9..40d6cf5 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/window-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
@@ -19,6 +19,7 @@
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/devel-api/adaptor-framework/mouse-in-out-event.h>
 #include <dali/devel-api/adaptor-framework/mouse-relative-event.h>
+#include <dali/devel-api/adaptor-framework/pointer-constraints-event.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
@@ -146,8 +147,8 @@ SWIGINTERN void Dali_Signal_Window_MouseRelativeEvent_Signal_Connect(Dali::Signa
 SWIGINTERN void Dali_Signal_Window_MouseRelativeEvent_Signal_Disconnect(Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) > *self, void (*func)(Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &)){
   self->Disconnect( func );
 }
-SWIGINTERN void Dali_Signal_Window_MouseRelativeEvent_Signal_Emit(Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) > *self, Dali::Window arg, Dali::DevelWindow::MouseRelativeEvent const &MouseRelativeEvent){
-  self->Emit( arg, MouseRelativeEvent );
+SWIGINTERN void Dali_Signal_Window_MouseRelativeEvent_Signal_Emit(Dali::Signal< void (Dali::Window, Dali::DevelWindow::MouseRelativeEvent const &) > *self, Dali::Window arg, Dali::DevelWindow::MouseRelativeEvent const &mouseRelativeEvent){
+  self->Emit( arg, mouseRelativeEvent );
 }
 
 /* Move Completed signal */
@@ -184,6 +185,22 @@ SWIGINTERN void Dali_Signal_Window_Resize_Completed_Signal_Emit(Dali::Signal< vo
   self->Emit( window, size );
 }
 
+//pointer constraints
+SWIGINTERN bool Dali_Signal_Window_PointerConstraintsEvent_Signal_Empty(Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > const *self){
+  return self->Empty();
+}
+SWIGINTERN std::size_t Dali_Signal_Window_PointerConstraintsEvent_Signal_GetConnectionCount(Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > const *self){
+return self->GetConnectionCount();
+}
+SWIGINTERN void Dali_Signal_Window_PointerConstraintsEvent_Signal_Connect(Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *self, void (*func)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &)){
+  self->Connect( func );
+}
+SWIGINTERN void Dali_Signal_Window_PointerConstraintsEvent_Signal_Disconnect(Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *self, void (*func)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &)){
+  self->Disconnect( func );
+}
+SWIGINTERN void Dali_Signal_Window_PointerConstraintsEvent_Signal_Emit(Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *self, Dali::Window arg, Dali::DevelWindow::PointerConstraintsEvent const &pointerConstraintsEvent){
+  self->Emit( arg, pointerConstraintsEvent );
+}
 
 #ifdef __cplusplus
 extern "C" {
@@ -2897,6 +2914,24 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetLastTouchEvent(void* winHand
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetLastHoverEvent(void* winHandle)
+{
+  Dali::Window* window = (Dali::Window*)winHandle;
+  void * jresult;
+  Dali::HoverEvent *result = 0;
+  if (!window) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
+    return 0;
+  }
+  {
+    try {
+      result = (Dali::HoverEvent *)&Dali::DevelWindow::GetLastHoverEvent(*window);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+  jresult = (void *)result;
+  return jresult;
+}
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_InternalRetrievingLastKeyEvent(void* winHandle, void* keyHandle)
 {
   Dali::Window* window = (Dali::Window*)winHandle;
@@ -2937,6 +2972,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_InternalRetrievingLastTouchEvent(
   }
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_InternalRetrievingLastHoverEvent(void* winHandle, void* hoverHandle)
+{
+  Dali::Window* window = (Dali::Window*)winHandle;
+  Dali::HoverEvent* hoverEvent = (Dali::HoverEvent*)hoverHandle;
+
+  if (!window) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
+    return;
+  }
+  if (!hoverEvent) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::HoverEvent", 0);
+    return;
+  }
+  {
+    try {
+      (*hoverEvent) = *((Dali::HoverEvent *)&Dali::DevelWindow::GetLastHoverEvent(*window));
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetNeedsRotationCompletedAcknowledgement(void* winHandle, bool needAcknowledgement)
 {
   Dali::Window* window = (Dali::Window*)winHandle;
@@ -3966,6 +4022,249 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Window_KeyboardUnGrab(void * winHandle)
   }
   return result;
 }
+
+/* pointer constraints event */
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal(void* winHandle)
+{
+  void *result;
+  Dali::Window window;
+  Dali::Window *win;
+  Dali::DevelWindow::PointerConstraintsSignalType* pointerConstraintsSignal;
+
+  win = (Dali::Window *)winHandle;
+  if (!win) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
+    return 0;
+  }
+  window = *win;
+  {
+    try {
+      pointerConstraintsSignal = (Dali::DevelWindow::PointerConstraintsSignalType *) &Dali::DevelWindow::PointerConstraintsSignal(window);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  result = (void *)pointerConstraintsSignal;
+  return result;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_Empty(void * jarg1) {
+  unsigned int jresult ;
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *) 0 ;
+  bool result;
+
+  arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  {
+    try {
+      result = (bool)Dali_Signal_Window_PointerConstraintsEvent_Signal_Empty((Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = result;
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_GetConnectionCount(void * jarg1) {
+  unsigned long jresult ;
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *) 0 ;
+  std::size_t result;
+
+  arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  {
+    try {
+      result = Dali_Signal_Window_PointerConstraintsEvent_Signal_GetConnectionCount((Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > const *)arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (unsigned long)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *) 0 ;
+  void (*arg2)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) = (void (*)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &))jarg2;
+  {
+    try {
+      Dali_Signal_Window_PointerConstraintsEvent_Signal_Connect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *) 0 ;
+  void (*arg2)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) = (void (*)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &)) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  arg2 = (void (*)(Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &))jarg2;
+  {
+    try {
+      Dali_Signal_Window_PointerConstraintsEvent_Signal_Disconnect(arg1,arg2);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowPointerConstraintsEventSignal_Emit(void * jarg1, void* jarg2, void* jarg3) {
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  Dali::Window* arg2 = (Dali::Window*)jarg2;
+  Dali::DevelWindow::PointerConstraintsEvent* arg3 = (Dali::DevelWindow::PointerConstraintsEvent*)jarg3;
+
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Signal", 0);
+    return ;
+  }
+
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
+    return ;
+  }
+
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::DevelWindow::PointerConstraintsEvent", 0);
+    return ;
+  }
+
+  {
+    try {
+      Dali_Signal_Window_PointerConstraintsEvent_Signal_Emit(arg1,*arg2,*arg3);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_WindowPointerConstraintsEventSignal() {
+  void * jresult ;
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)new Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) >();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_WindowPointerConstraintsEventSignal(void * jarg1) {
+  Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *) 0 ;
+
+  arg1 = (Dali::Signal< void (Dali::Window, Dali::DevelWindow::PointerConstraintsEvent const &) > *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PointerConstraintsEvent__SWIG_0(int jarg1, int jarg2, bool jarg3, bool jarg4) {
+  void * jresult ;
+  int arg1 ;
+  int arg2 ;
+  bool arg3 ;
+  bool arg4 ;
+
+  Dali::DevelWindow::PointerConstraintsEvent *result = 0;
+
+  arg1 = jarg1;
+  arg2 = jarg2;
+  arg3 = jarg3;
+  arg4 = jarg4;
+  {
+    try {
+      result = (Dali::DevelWindow::PointerConstraintsEvent *)new Dali::DevelWindow::PointerConstraintsEvent(arg1, arg2, arg3, arg4);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PointerConstraintsEvent(void * jarg1) {
+  Dali::DevelWindow::PointerConstraintsEvent *arg1 = (Dali::DevelWindow::PointerConstraintsEvent *) 0 ;
+
+  arg1 = (Dali::DevelWindow::PointerConstraintsEvent *)jarg1;
+  {
+    try {
+      delete arg1;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PointerConstraintsEvent_x_get(void * jarg1) {
+  int jresult ;
+  Dali::DevelWindow::PointerConstraintsEvent *arg1 = (Dali::DevelWindow::PointerConstraintsEvent *) 0 ;
+
+  arg1 = (Dali::DevelWindow::PointerConstraintsEvent *)jarg1;
+  {
+    try {
+      jresult = ((Dali::DevelWindow::PointerConstraintsEvent const *)arg1)->x;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PointerConstraintsEvent_y_get(void * jarg1) {
+  int jresult ;
+  Dali::DevelWindow::PointerConstraintsEvent *arg1 = (Dali::DevelWindow::PointerConstraintsEvent *) 0 ;
+
+  arg1 = (Dali::DevelWindow::PointerConstraintsEvent *)jarg1;
+  {
+    try {
+      jresult = ((Dali::DevelWindow::PointerConstraintsEvent const *)arg1)->y;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PointerConstraintsEvent_locked_get(void * jarg1) {
+  bool jresult = false;
+  Dali::DevelWindow::PointerConstraintsEvent *arg1 = (Dali::DevelWindow::PointerConstraintsEvent *) 0 ;
+
+  arg1 = (Dali::DevelWindow::PointerConstraintsEvent *)jarg1;
+  {
+    try {
+      jresult = ((Dali::DevelWindow::PointerConstraintsEvent const *)arg1)->locked;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_PointerConstraintsEvent_confined_get(void * jarg1) {
+  bool jresult = false;
+  Dali::DevelWindow::PointerConstraintsEvent *arg1 = (Dali::DevelWindow::PointerConstraintsEvent *) 0 ;
+
+  arg1 = (Dali::DevelWindow::PointerConstraintsEvent *)jarg1;
+  {
+    try {
+      jresult = ((Dali::DevelWindow::PointerConstraintsEvent const *)arg1)->confined;
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+
 /* Move Completed signal binding */
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Move_Completed_Signal(void* winHandle)
 {

diff --git a/dali-csharp-binder/dali-toolkit/particle-system-wrap.cpp b/dali-csharp-binder/dali-toolkit/particle-system-wrap.cpp
index ea3b2e1..9c6e9be 100644 (file)
--- a/dali-csharp-binder/dali-toolkit/particle-system-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/particle-system-wrap.cpp
@@ -970,64 +970,107 @@ SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_GetActiveParticleCount(
   }
 }
 
-SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStream(void* csThis, uint32_t streamType, void* defaultValue, uint32_t typeSize)
-{
-  enum class StreamType
-  {
-    FLOAT   = 0,
-    FVEC2   = 1,
-    FVEC3   = 2,
-    FVEC4   = 3,
-    INTEGER = 4,
-    IVEC2   = 5,
-    IVEC3   = 6,
-    IVEC4   = 7,
-  };
-  ParticleEmitter* emitter = (ParticleEmitter*)csThis;
-  uint32_t         result  = 0;
-  if(!emitter)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
-    return 0;
-  }
-  auto list = emitter->GetParticleList();
-  {
-    try
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStreamInt(void* csThis, int defaultValue)
+{
+    ParticleEmitter* emitter = (ParticleEmitter*)csThis;
+    uint32_t         result  = 0;
+    if(!emitter)
+    {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
+        return 0;
+    }
+    auto list = emitter->GetParticleList();
     {
-      switch(StreamType(streamType))
-      {
-        case StreamType::FLOAT: {
-          result = list.AddLocalStream<float>(*reinterpret_cast<float*>(defaultValue));
-          break;
+        try
+        {
+            result = list.AddLocalStream<int>(defaultValue);
         }
-        case StreamType::FVEC2:
-          result = list.AddLocalStream<Dali::Vector2>(*reinterpret_cast<Dali::Vector2*>((Dali::Vector2*)defaultValue));
-          break;
-        case StreamType::FVEC3: {
-          result = list.AddLocalStream<Dali::Vector3>(*reinterpret_cast<Dali::Vector3*>((Dali::Vector3*)defaultValue));
-          break;
+        CALL_CATCH_EXCEPTION(0);
+    }
+    return result;
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStreamFloat(void* csThis, float defaultValue)
+{
+    ParticleEmitter* emitter = (ParticleEmitter*)csThis;
+    uint32_t         result  = 0;
+    if(!emitter)
+    {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
+        return 0;
+    }
+    auto list = emitter->GetParticleList();
+    {
+        try
+        {
+            result = list.AddLocalStream<float>(defaultValue);
         }
-        case StreamType::FVEC4:
-          result = list.AddLocalStream<Dali::Vector4>(*reinterpret_cast<Dali::Vector4*>((Dali::Vector4*)defaultValue));
-          break;
-        case StreamType::INTEGER:
-          result = list.AddLocalStream<int>(*reinterpret_cast<int*>(defaultValue));
-          break;
-        case StreamType::IVEC2:
-          // unsupported
-          break;
-        case StreamType::IVEC3:
-          // unsupported
-          break;
-        case StreamType::IVEC4:
-          // unsupported
-          break;
-      }
+        CALL_CATCH_EXCEPTION(0);
     }
-    CALL_CATCH_EXCEPTION(0);
-  }
+    return result;
+}
 
-  return result;
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStreamVector2(void* csThis, void* defaultValue)
+{
+    ParticleEmitter* emitter = (ParticleEmitter*)csThis;
+    uint32_t         result  = 0;
+    if(!emitter)
+    {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
+        return 0;
+    }
+    auto list = emitter->GetParticleList();
+    {
+        try
+        {
+            void* ptr = (void*)defaultValue;
+            result = list.AddLocalStream<Dali::Vector2>(*reinterpret_cast<Dali::Vector2*>((Dali::Vector2*)ptr));
+        }
+        CALL_CATCH_EXCEPTION(0);
+    }
+    return result;
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStreamVector3(void* csThis, void* defaultValue)
+{
+    ParticleEmitter* emitter = (ParticleEmitter*)csThis;
+    uint32_t         result  = 0;
+    if(!emitter)
+    {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
+        return 0;
+    }
+    auto list = emitter->GetParticleList();
+    {
+        try
+        {
+            void* ptr = (void*)defaultValue;
+            result = list.AddLocalStream<Dali::Vector3>(*reinterpret_cast<Dali::Vector3*>((Dali::Vector3*)ptr));
+        }
+        CALL_CATCH_EXCEPTION(0);
+    }
+    return result;
+}
+
+SWIGEXPORT uint32_t SWIGSTDCALL CSharp_Dali_ParticleList_AddLocalStreamVector4(void* csThis, void* defaultValue)
+{
+    ParticleEmitter* emitter = (ParticleEmitter*)csThis;
+    uint32_t         result  = 0;
+    if(!emitter)
+    {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null ParticleList", 0);
+        return 0;
+    }
+    auto list = emitter->GetParticleList();
+    {
+        try
+        {
+            void* ptr = (void*)defaultValue;
+            result = list.AddLocalStream<Dali::Vector4>(*reinterpret_cast<Dali::Vector4*>((Dali::Vector4*)ptr));
+        }
+        CALL_CATCH_EXCEPTION(0);
+    }
+    return result;
 }
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ParticleList_GetDefaultStreamIndex(void* csThis, uint32_t defaultStream)

diff --git a/dali-csharp-binder/dali-toolkit/visual-actions-wrap.cpp b/dali-csharp-binder/dali-toolkit/visual-actions-wrap.cpp
index 940cdb3..e40b5a9 100644 (file)
--- a/dali-csharp-binder/dali-toolkit/visual-actions-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/visual-actions-wrap.cpp
@@ -102,6 +102,11 @@ extern "C"
   {
     return (int)Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::SET_DYNAMIC_PROPERTY;
   }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_AnimatedVectorImageVisual_Actions_FLUSH_get()
+  {
+    return (int)Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::FLUSH;
+  }
 #ifdef __cplusplus
 }
 #endif

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index d3a4afa..b73f214 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.2.43
+Version: 2.2.44
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT