Separate Model3dView from dali-wrap and name changed

Change-Id: I45257b8b5ed56a71ec9cf176842b311e903f75d3
Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index a84d7c0..261006a 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -47,6 +47,7 @@ dali_csharp_binder_common_src_files = \
   ${dali_csharp_binder_dir}/src/atspi-wrap.cpp \
   ${dali_csharp_binder_dir}/src/rotation-wrap.cpp \
   ${dali_csharp_binder_dir}/src/input-options-wrap.cpp \
+  ${dali_csharp_binder_dir}/src/model3d-view-wrap.cpp \
   ${dali_csharp_binder_dir}/src/native-image-queue-wrap.cpp
 
 # added for key grab binding only for tizen

diff --git a/dali-csharp-binder/src/dali-wrap.cpp b/dali-csharp-binder/src/dali-wrap.cpp
index f3bf43e..c483ccb 100755 (executable)
--- a/dali-csharp-binder/src/dali-wrap.cpp
+++ b/dali-csharp-binder/src/dali-wrap.cpp
@@ -40830,269 +40830,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_GEOMETRY_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::GEOMETRY_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_MATERIAL_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::MATERIAL_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_IMAGES_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::IMAGES_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_ILLUMINATION_TYPE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::ILLUMINATION_TYPE;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE0_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::TEXTURE0_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE1_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::TEXTURE1_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE2_URL_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::TEXTURE2_URL;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_LIGHT_POSITION_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::Model3dView::Property::LIGHT_POSITION;
-  jresult = (int)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView_Property() {
-  void * jresult ;
-  Dali::Toolkit::Model3dView::Property *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Model3dView::Property *)new Dali::Toolkit::Model3dView::Property();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView_Property(void * jarg1) {
-  Dali::Toolkit::Model3dView::Property *arg1 = (Dali::Toolkit::Model3dView::Property *) 0 ;
-
-  arg1 = (Dali::Toolkit::Model3dView::Property *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::Model3dView result;
-
-  {
-    try {
-      result = Dali::Toolkit::Model3dView::New();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_1(char * jarg1, char * jarg2, char * jarg3) {
-  void * jresult ;
-  std::string *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  std::string *arg3 = 0 ;
-  Dali::Toolkit::Model3dView result;
-
-  if (!jarg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg1_str(jarg1);
-  arg1 = &arg1_str;
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str;
-  if (!jarg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg3_str(jarg3);
-  arg3 = &arg3_str;
-  {
-    try {
-      result = Dali::Toolkit::Model3dView::New((std::string const &)*arg1,(std::string const &)*arg2,(std::string const &)*arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
-
-  //argout typemap for const std::string&
-
-
-  //argout typemap for const std::string&
-
-
-  //argout typemap for const std::string&
-
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_0() {
-  void * jresult ;
-  Dali::Toolkit::Model3dView *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Toolkit::Model3dView *)new Dali::Toolkit::Model3dView();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView(void * jarg1) {
-  Dali::Toolkit::Model3dView *arg1 = (Dali::Toolkit::Model3dView *) 0 ;
-
-  arg1 = (Dali::Toolkit::Model3dView *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_1(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Model3dView *arg1 = 0 ;
-  Dali::Toolkit::Model3dView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Model3dView *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Model3dView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Model3dView *)new Dali::Toolkit::Model3dView((Dali::Toolkit::Model3dView const &)*arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_Assign(void * jarg1, void * jarg2) {
-  void * jresult ;
-  Dali::Toolkit::Model3dView *arg1 = (Dali::Toolkit::Model3dView *) 0 ;
-  Dali::Toolkit::Model3dView *arg2 = 0 ;
-  Dali::Toolkit::Model3dView *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Model3dView *)jarg1;
-  arg2 = (Dali::Toolkit::Model3dView *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Model3dView const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Model3dView *) &(arg1)->operator =((Dali::Toolkit::Model3dView const &)*arg2);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_DownCast(void * jarg1) {
-  void * jresult ;
-  Dali::BaseHandle arg1 ;
-  Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::Model3dView result;
-
-  argp1 = (Dali::BaseHandle *)jarg1;
-  if (!argp1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try {
-      result = Dali::Toolkit::Model3dView::DownCast(arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
-  return jresult;
-}
-
-
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_SCROLL_DIRECTION_get() {
   int jresult ;
   int result;

diff --git a/dali-csharp-binder/src/model3d-view-wrap.cpp b/dali-csharp-binder/src/model3d-view-wrap.cpp
new file mode 100755 (executable)
index 0000000..012b556
--- /dev/null
+++ b/dali-csharp-binder/src/model3d-view-wrap.cpp
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <string.h>
+#include "common.h"
+#include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_GEOMETRY_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::GEOMETRY_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_MATERIAL_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::MATERIAL_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_IMAGES_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::IMAGES_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_ILLUMINATION_TYPE_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::ILLUMINATION_TYPE;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE0_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::TEXTURE0_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE1_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::TEXTURE1_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE2_URL_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::TEXTURE2_URL;
+  }
+
+  SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_LIGHT_POSITION_get()
+  {
+    return (int)Dali::Toolkit::Model3dView::Property::LIGHT_POSITION;
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_Model3dView_Property()
+  {
+    void *jresult;
+    Dali::Toolkit::Model3dView::Property *result = 0;
+
+    {
+      try
+      {
+        result = (Dali::Toolkit::Model3dView::Property *)new Dali::Toolkit::Model3dView::Property();
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    jresult = (void *)result;
+    return jresult;
+  }
+
+  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView_Property(void *csProperty)
+  {
+    Dali::Toolkit::Model3dView::Property *property = (Dali::Toolkit::Model3dView::Property *)csProperty;
+
+    {
+      try
+      {
+        delete property;
+      }
+      CALL_CATCH_EXCEPTION();
+    }
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_0()
+  {
+    Dali::Toolkit::Model3dView result;
+
+    {
+      try
+      {
+        result = Dali::Toolkit::Model3dView::New();
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_1(char *csModelUrl, char *csMaterialUrl, char *csTextureDirectoryUrl)
+  {
+    Dali::Toolkit::Model3dView result;
+
+    if (!csModelUrl)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+      return 0;
+    }
+    std::string modelUrl(csModelUrl);
+
+    if (!csMaterialUrl)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+      return 0;
+    }
+    std::string materialUrl(csMaterialUrl);
+
+    if (!csTextureDirectoryUrl)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+      return 0;
+    }
+    std::string textureDirectoryUrl(csTextureDirectoryUrl);
+
+    {
+      try
+      {
+        result = Dali::Toolkit::Model3dView::New(modelUrl, materialUrl, textureDirectoryUrl);
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_0()
+  {
+    Dali::Toolkit::Model3dView *result = 0;
+
+    {
+      try
+      {
+        result = (Dali::Toolkit::Model3dView *)new Dali::Toolkit::Model3dView();
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return (void *)result;
+  }
+
+  SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView(void *csModel3dView)
+  {
+    Dali::Toolkit::Model3dView *model3dView = (Dali::Toolkit::Model3dView *)csModel3dView;
+    {
+      try
+      {
+        delete model3dView;
+      }
+      CALL_CATCH_EXCEPTION();
+    }
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_1(void *csModel3dView)
+  {
+    Dali::Toolkit::Model3dView *model3dView = (Dali::Toolkit::Model3dView *)csModel3dView;
+    Dali::Toolkit::Model3dView *result = 0;
+
+    if (!model3dView)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Model3dView const & type is null", 0);
+      return 0;
+    }
+    {
+      try
+      {
+        result = (Dali::Toolkit::Model3dView *)new Dali::Toolkit::Model3dView((Dali::Toolkit::Model3dView const &)*model3dView);
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return (void *)result;
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Model3dView_Assign(void *csDestination, void *csSource)
+  {
+    Dali::Toolkit::Model3dView *destination = (Dali::Toolkit::Model3dView *)csDestination;
+    Dali::Toolkit::Model3dView *source = (Dali::Toolkit::Model3dView *)csSource;
+    Dali::Toolkit::Model3dView *result = 0;
+
+    if (!source)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Model3dView const & type is null", 0);
+      return 0;
+    }
+    {
+      try
+      {
+        result = (Dali::Toolkit::Model3dView *)&(destination)->operator=((Dali::Toolkit::Model3dView const &)*source);
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return (void *)result;
+  }
+
+  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Model3dView_DownCast(void *csHandle)
+  {
+    Dali::BaseHandle *handle = (Dali::BaseHandle *)csHandle;;
+    Dali::Toolkit::Model3dView result;
+
+    if (!handle)
+    {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+      return 0;
+    }
+    {
+      try
+      {
+        result = Dali::Toolkit::Model3dView::DownCast(*handle);
+      }
+      CALL_CATCH_EXCEPTION(0);
+    }
+
+    return new Dali::Toolkit::Model3dView((const Dali::Toolkit::Model3dView &)result);
+  }
+
+#ifdef __cplusplus
+}
+#endif