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

Change-Id: I0afefed2baecd7f95423a28544151c92e640d183

diff --git a/dali-csharp-binder/dali-adaptor/window-data-wrap.cpp b/dali-csharp-binder/dali-adaptor/window-data-wrap.cpp
index 6bcd353..b1921a2 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/window-data-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/window-data-wrap.cpp
@@ -197,6 +197,50 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WindowData_GetTransparency(void* nuiWind
   return result;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WindowData_SetFrontBufferRendering(void* nuiWindowData, bool nuiEnable)
+{
+  Dali::WindowData* pWindowData;
+
+  pWindowData = (Dali::WindowData*)nuiWindowData;
+  if(!pWindowData)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::WindowData", 0);
+    return;
+  }
+
+  {
+    try
+    {
+      pWindowData->SetFrontBufferRendering(nuiEnable);
+    }
+    CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_WindowData_GetFrontBufferRendering(void* nuiWindowData)
+{
+  Dali::WindowData* pWindowData;
+  bool              result;
+
+  pWindowData = (Dali::WindowData*)nuiWindowData;
+  if(!pWindowData)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::WindowData", 0);
+    return 0;
+  }
+
+  {
+    try
+    {
+      result = (bool)pWindowData->GetFrontBufferRendering();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/dali-adaptor/window-wrap.cpp b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
index 03483b4..0e7ac82 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/window-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
@@ -369,6 +369,51 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_3(void * jarg1, char
 }
 
 
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Window_New__WithWindowData(char* nuiName, char* nuiClassName, void* nuiWindowData)
+{
+  void*             jresult;
+  std::string*      name      = 0;
+  std::string*      className = 0;
+  Dali::WindowData* pWindowData;
+  Dali::Window      result;
+
+  if(!nuiName)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "String NUI Name is NULL", 0);
+    return 0;
+  }
+  std::string name_str(nuiName);
+  name = &name_str;
+
+  if(!nuiClassName)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "String NUI Class Name is NULL", 0);
+    return 0;
+  }
+  std::string className_str(nuiClassName);
+  className = &className_str;
+
+  pWindowData = (Dali::WindowData*)nuiWindowData;
+  if(!pWindowData)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::WindowData", 0);
+    return 0;
+  }
+
+  {
+    try
+    {
+      result = Dali::Window::New((std::string const&)*name, (std::string const&)*className, *pWindowData);
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = new Dali::Window((const Dali::Window&)result);
+
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Window__SWIG_0() {
   void * jresult ;
   Dali::Window *result = 0 ;

diff --git a/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
index 8522918..9981584 100644 (file)
--- a/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/model-node-wrap.cpp
@@ -254,6 +254,45 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Node_FindChildModelNodeByName(voi
   return new Dali::Scene3D::ModelNode((const Dali::Scene3D::ModelNode&)result);
 }
 
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Model_Node_GetChildModelNodeCount(void* csModelNode)
+{
+  Dali::Scene3D::ModelNode* modelNode = (Dali::Scene3D::ModelNode*)csModelNode;
+
+  if(!modelNode)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::ModelNode", 0);
+    return 0;
+  }
+  {
+    try
+    {
+      return modelNode->GetChildCount();
+    }
+    CALL_CATCH_EXCEPTION(0);
+  }
+}
+
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Node_GetChildModelNodeAt(void* csModelNode, uint32_t index)
+{
+  Dali::Scene3D::ModelNode* modelNode = (Dali::Scene3D::ModelNode*)csModelNode;
+  Dali::Scene3D::ModelNode result;
+
+  if(!modelNode)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::ModelNode", 0);
+    return nullptr;
+  }
+  {
+    try
+    {
+      Dali::Actor actor = modelNode->GetChildAt(index);
+      result = Dali::Scene3D::ModelNode::DownCast(actor);
+    }
+    CALL_CATCH_EXCEPTION(nullptr);
+  }
+  return new Dali::Scene3D::ModelNode((const Dali::Scene3D::ModelNode&)result);
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp b/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
index d94b492..34518cd 100644 (file)
--- a/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
+++ b/dali-csharp-binder/dali-scene3d/model-primitive-wrap.cpp
@@ -188,6 +188,26 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Model_Primitive_SetMaterial(void* csMode
    CALL_CATCH_EXCEPTION();
 }
 
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Model_Primitive_GetMaterial(void* csModelPrimitive)
+{
+  Dali::Scene3D::ModelPrimitive* modelPrimitive = (Dali::Scene3D::ModelPrimitive*)csModelPrimitive;
+  Dali::Scene3D::Material result;
+
+  if(!modelPrimitive)
+  {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Scene3D::ModelPrimitive", 0);
+    return nullptr;
+  }
+  {
+    try
+    {
+      result = modelPrimitive->GetMaterial();
+    }
+    CALL_CATCH_EXCEPTION(nullptr);
+  }
+  return new Dali::Scene3D::Material((const Dali::Scene3D::Material&)result);
+}
+
 
 #ifdef __cplusplus
 }

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