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

Change-Id: I9ac82dffe7fc9463b4d96c58be2adc8dba27db9f

diff --git a/dali-csharp-binder/src/dali-wrap.cpp b/dali-csharp-binder/src/dali-wrap.cpp
index 2cb7e03..03c4f06 100755 (executable)
--- a/dali-csharp-binder/src/dali-wrap.cpp
+++ b/dali-csharp-binder/src/dali-wrap.cpp
@@ -354,6 +354,7 @@ void SWIG_CSharpException(int code, const char *msg) {
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/actors/camera-actor-devel.h>
 #include <dali/devel-api/animation/key-frames-devel.h>
 #include <dali/devel-api/common/stage-devel.h>
 #include <dali/devel-api/events/key-event-devel.h>
@@ -3051,138 +3052,6 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Any_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any_AnyContainerBase(void * jarg1, void * jarg2, void * jarg3) {
-  void * jresult ;
-  std::type_info *arg1 = 0 ;
-  Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
-  Dali::Any::DeleteFunc arg3 = (Dali::Any::DeleteFunc) 0 ;
-  Dali::Any::AnyContainerBase *result = 0 ;
-
-  arg1 = (std::type_info *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
-    return 0;
-  }
-  arg2 = (Dali::Any::CloneFunc)jarg2;
-  arg3 = (Dali::Any::DeleteFunc)jarg3;
-  {
-    try {
-      result = (Dali::Any::AnyContainerBase *)new Dali::Any::AnyContainerBase((std::type_info const &)*arg1,arg2,arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_GetType(void * jarg1) {
-  void * jresult ;
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  std::type_info *result = 0 ;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  {
-    try {
-      result = (std::type_info *) &((Dali::Any::AnyContainerBase const *)arg1)->GetType();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mType_get(void * jarg1) {
-  void * jresult ;
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  ::std::type_info *result = 0 ;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  result = (::std::type_info *) &(::std::type_info const &) ((arg1)->mType);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set(void * jarg1, void * jarg2) {
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  arg2 = (Dali::Any::CloneFunc)jarg2;
-  if (arg1) (arg1)->mCloneFunc = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get(void * jarg1) {
-  void * jresult ;
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  Dali::Any::CloneFunc result;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  result = (Dali::Any::CloneFunc) ((arg1)->mCloneFunc);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set(void * jarg1, void * jarg2) {
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  Dali::Any::DeleteFunc arg2 = (Dali::Any::DeleteFunc) 0 ;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  arg2 = (Dali::Any::DeleteFunc)jarg2;
-  if (arg1) (arg1)->mDeleteFunc = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(void * jarg1) {
-  void * jresult ;
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-  Dali::Any::DeleteFunc result;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  result = (Dali::Any::DeleteFunc) ((arg1)->mDeleteFunc);
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Any_AnyContainerBase(void * jarg1) {
-  Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
-
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_mContainer_set(void * jarg1, void * jarg2) {
-  Dali::Any *arg1 = (Dali::Any *) 0 ;
-  Dali::Any::AnyContainerBase *arg2 = (Dali::Any::AnyContainerBase *) 0 ;
-
-  arg1 = (Dali::Any *)jarg1;
-  arg2 = (Dali::Any::AnyContainerBase *)jarg2;
-  if (arg1) (arg1)->mContainer = arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_mContainer_get(void * jarg1) {
-  void * jresult ;
-  Dali::Any *arg1 = (Dali::Any *) 0 ;
-  Dali::Any::AnyContainerBase *result = 0 ;
-
-  arg1 = (Dali::Any *)jarg1;
-  result = (Dali::Any::AnyContainerBase *) ((arg1)->mContainer);
-  jresult = (void *)result;
-  return jresult;
-}
-
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliAssertMessage(char * jarg1, char * jarg2) {
   char *arg1 = (char *) 0 ;
@@ -7974,6 +7843,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_2(void * jarg1,
   Dali::Vector4 result;
 
   arg1 = (Dali::Matrix *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix const & type is null", 0);
+    return 0;
+  }
   arg2 = (Dali::Vector4 *)jarg2;
   if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector4 const & type is null", 0);
@@ -7990,6 +7863,61 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_2(void * jarg1,
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_3(void * nuiMatrixLhs, void * nuiMatrixRhs) {
+  void * jresult ;
+  Dali::Matrix *lhsPtr = (Dali::Matrix *) 0 ;
+  Dali::Matrix *rhsPtr = (Dali::Matrix *) 0 ;
+  Dali::Matrix result(false);
+
+  lhsPtr = (Dali::Matrix *)nuiMatrixLhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = ((Dali::Matrix const *)lhsPtr)->operator *((Dali::Matrix const &)*rhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Matrix((const Dali::Matrix &)result);
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_4(void * nuiMatrixLhs, void * nuiMatrixRhs) {
+  // Faster mulitply operation without memcpy
+
+  Dali::Matrix *jresult = (Dali::Matrix *)0;
+  Dali::Matrix *lhsPtr  = (Dali::Matrix *)0;
+  Dali::Matrix *rhsPtr  = (Dali::Matrix *)0;
+
+  lhsPtr = (Dali::Matrix *)nuiMatrixLhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  rhsPtr = (Dali::Matrix *)nuiMatrixRhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      jresult = new Dali::Matrix(false);
+      Dali::Matrix::Multiply((Dali::Matrix &)*jresult,(Dali::Matrix const &)*rhsPtr,(Dali::Quaternion const &)*lhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Matrix_EqualTo(void * jarg1, void * jarg2) {
   bool jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
@@ -8526,6 +8454,88 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Multiply(void * jarg1, void * ja
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_1(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Matrix3 *arg1 = 0 ;
+  Dali::Vector3 *arg2 = 0 ;
+  Dali::Vector3 result;
+
+  arg1 = (Dali::Matrix3 *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  arg2 = (Dali::Vector3 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector3 const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = ((Dali::Matrix3 const *)arg1)->operator *((Dali::Vector3 const &)*arg2);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Vector3((const Dali::Vector3 &)result);
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_2(void * nuiMatrix3Lhs, void * nuiMatrix3Rhs) {
+  void * jresult ;
+  Dali::Matrix3 *lhsPtr = 0 ;
+  Dali::Matrix3 *rhsPtr = 0 ;
+  Dali::Matrix3 result;
+
+  lhsPtr = (Dali::Matrix3 *)nuiMatrix3Lhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  rhsPtr = (Dali::Matrix3 *)nuiMatrix3Rhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      result = ((Dali::Matrix3 const *)lhsPtr)->operator *((Dali::Matrix3 const &)*rhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Matrix3((const Dali::Matrix3 &)result);
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Multiply__SWIG_3(void * nuiMatrix3Lhs, void * nuiMatrix3Rhs) {
+  // Faster mulitply operation without memcpy
+
+  Dali::Matrix3 *jresult = 0;
+  Dali::Matrix3 *lhsPtr  = 0;
+  Dali::Matrix3 *rhsPtr  = 0;
+
+  lhsPtr = (Dali::Matrix3 *)nuiMatrix3Lhs;
+  if (!lhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "lhs Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  rhsPtr = (Dali::Matrix3 *)nuiMatrix3Rhs;
+  if (!rhsPtr) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "rhs Dali::Matrix3 const & type is null", 0);
+    return 0;
+  }
+  {
+    try {
+      jresult = new Dali::Matrix3();
+      Dali::Matrix3::Multiply((Dali::Matrix3 &)*jresult,(Dali::Matrix3 const &)*rhsPtr,(Dali::Matrix3 const &)*lhsPtr);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return jresult;
+}
+
+
 SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Range(float jarg1, float jarg2) {
   float jresult ;
   float arg1 ;
@@ -29349,6 +29359,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_INVERT_Y_AXIS_get()
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_DIRECTION_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::DevelCameraActor::Property::PROJECTION_DIRECTION;
+  jresult = (int)result;
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor_Property() {
   void * jresult ;
   Dali::CameraActor::Property *result = 0 ;
@@ -48134,7 +48154,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_0() {
 
   {
     try {
-      result = Dali::Toolkit::TextLabel::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS);
+      result = Dali::Toolkit::TextLabel::New();
     } CALL_CATCH_EXCEPTION(0);
   }
 
@@ -48156,7 +48176,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_1(char * jarg1) {
   arg1 = &arg1_str;
   {
     try {
-      result = Dali::Toolkit::TextLabel::New(Dali::Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, (std::string const &)*arg1);
+      result = Dali::Toolkit::TextLabel::New((std::string const &)*arg1);
     } CALL_CATCH_EXCEPTION(0);
   }
 

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