From: Xiaohui Fang Date: Wed, 23 Apr 2025 08:31:06 +0000 (+0800) Subject: Add new APIs so that NUI can get/set Vector without alloc ptr X-Git-Tag: dali_2.4.17~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6390ba0647c98f452878d2648c5369ab40bccfb0;p=platform%2Fcore%2Fuifw%2Fdali-csharp-binder.git Add new APIs so that NUI can get/set Vector without alloc ptr Change-Id: I1871333d8fb289a5bf2b55f106981d646eb3be0a --- diff --git a/dali-csharp-binder/common/dali-wrap.cpp b/dali-csharp-binder/common/dali-wrap.cpp index e28c3cfa..284178b9 100644 --- a/dali-csharp-binder/common/dali-wrap.cpp +++ b/dali-csharp-binder/common/dali-wrap.cpp @@ -17008,6 +17008,18 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddPoint(void * jarg1, void * jarg2 } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddPoint_3FloatValues(void * jarg1, float x, float y, float z) { + Dali::Path *arg1 = (Dali::Path *) 0 ; + + arg1 = (Dali::Path *)jarg1; + { + try { + const Dali::Vector3 point(x, y, z); + (arg1)->AddPoint(point); + } CALL_CATCH_EXCEPTION(); + } + +} SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddControlPoint(void * jarg1, void * jarg2) { Dali::Path *arg1 = (Dali::Path *) 0 ; diff --git a/dali-csharp-binder/dali-core/actor-wrap.cpp b/dali-csharp-binder/dali-core/actor-wrap.cpp index 40c4edf7..5fc2402a 100644 --- a/dali-csharp-binder/dali-core/actor-wrap.cpp +++ b/dali-csharp-binder/dali-core/actor-wrap.cpp @@ -1081,6 +1081,26 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetParentOrigin(void* jarg1, void* } } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetParentOrigin_3FloatValues(void* jarg1, float x, float y, float z) +{ + Dali::Actor* arg1 = (Dali::Actor*)0; + + if(!jarg1) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!"); + return; + } + + arg1 = (Dali::Actor*)jarg1; + { + try + { + const Dali::Vector3 vector3(x, y, z); + (arg1)->SetProperty(Actor::Property::PARENT_ORIGIN, vector3); + } + CALL_CATCH_EXCEPTION(); + } +} SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint(void* jarg1, void* jarg2) { @@ -1109,6 +1129,26 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint(void* jarg1, void* } } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint_3FloatValues(void* jarg1, float x, float y, float z) +{ + Dali::Actor* arg1 = (Dali::Actor*)0; + + if(!jarg1) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!"); + return; + } + + arg1 = (Dali::Actor*)jarg1; + { + try + { + const Dali::Vector3 vector(x, y, z); + (arg1)->SetProperty(Actor::Property::ANCHOR_POINT, vector); + } + CALL_CATCH_EXCEPTION(); + } +} SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_0(void* jarg1, float jarg2, float jarg3) { @@ -2212,6 +2252,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColor(void* jarg1, void* jarg2) } } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColor_4FloatValues(void* jarg1, float r, float g, float b, float a) +{ + Dali::Actor* arg1 = (Dali::Actor*)0; + + if(!jarg1) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!"); + return; + } + + arg1 = (Dali::Actor*)jarg1; + + { + try + { + const Dali::Vector4 color(r, g, b, a); + (arg1)->SetProperty(Actor::Property::COLOR, color); + } + CALL_CATCH_EXCEPTION(); + } +} SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColorMode(void* jarg1, int jarg2) { diff --git a/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp b/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp index efed8853..bbec6b86 100755 --- a/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp +++ b/dali-csharp-binder/dali-core/internal-property-get-set-wrap.cpp @@ -63,6 +63,26 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetProperty2FloatValues(void *actor, int propertyType, float x, float y) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector2 vector2(x, y); + pActor->SetProperty((Dali::Property::Index)propertyType, vector2); + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetPropertyVector3(void *actor, int propertyType, void *vector3) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -88,6 +108,26 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetProperty3FloatValues(void *actor, int propertyType, float x, float y, float z) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector3 vector3(x, y, z); + pActor->SetProperty((Dali::Property::Index)propertyType, vector3); + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetPropertyVector4(void *actor, int propertyType, void *vector4) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -113,6 +153,26 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetProperty4FloatValues(void *actor, int propertyType, float x, float y, float z, float w) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector4 vector4(x, y, z, w); + pActor->SetProperty((Dali::Property::Index)propertyType, vector4); + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalSetPropertyVector2ActualVector3(void *actor, int propertyType, void *vector2) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -316,6 +376,40 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingProperty2FloatValues(void *actor, int propertyType, float* x, float* y) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector2 result; + result = ((Dali::Handle const *)pActor)->GetProperty((Dali::Property::Index)propertyType); + *x = result.x; + *y = result.y; + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingPropertyVector3(void *actor, int propertyType, void *retrievingVector3) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -345,6 +439,47 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingProperty3FloatValues(void *actor, int propertyType, float* x, float* y, float* z) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!z) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "z is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector3 result; + result = ((Dali::Handle const *)pActor)->GetProperty((Dali::Property::Index)propertyType); + *x = result.x; + *y = result.y; + *z = result.z; + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingPropertyVector4(void *actor, int propertyType, void *retrievingVector4) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -375,6 +510,54 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingProperty4FloatValues(void *actor, int propertyType, float* x, float* y, float* z, float* w) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!z) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "z is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!w) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "w is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector4 result; + result = ((Dali::Handle const *)pActor)->GetProperty((Dali::Property::Index)propertyType); + *x = result.x; + *y = result.y; + *z = result.z; + *w = result.w; + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingPropertyVector2ActualVector3(void *actor, int propertyType, void *retrievingVector2) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -569,6 +752,47 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_RetrieveCurrentProperty3FloatValues(void *actor, int propertyType, float* x, float* y, float* z) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!z) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "z is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector3 result; + result = ((Dali::Handle const *)pActor)->GetCurrentProperty((Dali::Property::Index)propertyType); + *x = result.x; + *y = result.y; + *z = result.z; + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_RetrieveCurrentPropertyVector2ActualVector3(void *actor, int propertyType, void *retrievingVector2) { Dali::Handle *pActor = (Dali::Handle *)actor; @@ -656,6 +880,53 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_RetrieveCurrentProperty4FloatValues(void *actor, int propertyType, float* x, float* y, float* z, float* w) + { + Dali::Handle *pActor = (Dali::Handle *)actor; + + if (!pActor) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "actor is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!z) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "z is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!w) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "w is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Vector4 result; + result = ((Dali::Handle const *)pActor)->GetCurrentProperty((Dali::Property::Index)propertyType); + *x = result.x; + *y = result.y; + *z = result.z; + *w = result.w; + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } #ifdef __cplusplus } #endif diff --git a/dali-csharp-binder/dali-toolkit/internal-visual-property-get-set-wrap.cpp b/dali-csharp-binder/dali-toolkit/internal-visual-property-get-set-wrap.cpp index 4c1414e0..ace73558 100755 --- a/dali-csharp-binder/dali-toolkit/internal-visual-property-get-set-wrap.cpp +++ b/dali-csharp-binder/dali-toolkit/internal-visual-property-get-set-wrap.cpp @@ -373,6 +373,65 @@ extern "C" return (int)InternalPropertyReturnType::NO_ERROR; } + + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_InternalRetrievingVisualProperty4FloatValues(void *view, int visualIndex, int visualPropertyIndex, float* x, float* y, float* z, float* w) + { + Dali::Toolkit::Control *pControl = (Dali::Toolkit::Control *)view; + + if (!pControl) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "view is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!x) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "x is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!y) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "y is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!z) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "z is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + if (!w) + { + SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "w is null!"); + return (int)InternalPropertyReturnType::ERROR_UNKNOWN; + } + + try + { + Dali::Toolkit::Internal::Control& internalControl = Dali::Toolkit::Internal::GetImplementation(*pControl); + Dali::Toolkit::Visual::Base visualBase = Dali::Toolkit::DevelControl::GetVisual(internalControl, visualIndex); + if(visualBase) + { + Dali::Property::Map tempMap; + visualBase.CreatePropertyMap(tempMap); + Dali::Property::Value* retValuePtr = tempMap.Find(visualPropertyIndex); + if(retValuePtr) + { + Dali::Vector4 result; + result = retValuePtr->Get(); + *x = result.x; + *y = result.y; + *z = result.z; + *w = result.w; + } + } + } + CALL_CATCH_EXCEPTION((int)InternalPropertyReturnType::ERROR_UNKNOWN); + + return (int)InternalPropertyReturnType::NO_ERROR; + } #ifdef __cplusplus } #endif