projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add missed parameter documentation" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-swig
/
SWIG
/
dali-operator.i
diff --git
a/plugins/dali-swig/SWIG/dali-operator.i
b/plugins/dali-swig/SWIG/dali-operator.i
index
9554651
..
f6bbe4d
100644
(file)
--- a/
plugins/dali-swig/SWIG/dali-operator.i
+++ b/
plugins/dali-swig/SWIG/dali-operator.i
@@
-38,7
+38,7
@@
public static Vector2 operator+(Vector2 arg1, Vector2 arg2) {
return arg1.Add(arg2);
}
public static Vector2 operator+(Vector2 arg1, Vector2 arg2) {
return arg1.Add(arg2);
}
-
+
public static Vector2 operator-(Vector2 arg1, Vector2 arg2) {
return arg1.Subtract(arg2);
}
public static Vector2 operator-(Vector2 arg1, Vector2 arg2) {
return arg1.Subtract(arg2);
}
@@
-70,13
+70,20
@@
return ValueOfIndex(index);
}
}
return ValueOfIndex(index);
}
}
+
+ public static Vector2 GetVector2FromPtr(global::System.IntPtr cPtr) {
+ Vector2 ret = new Vector2(cPtr, false);
+ if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+ return ret;
+ }
+
%}
%typemap(cscode) Dali::Vector3 %{
public static Vector3 operator+(Vector3 arg1, Vector3 arg2) {
return arg1.Add(arg2);
}
%}
%typemap(cscode) Dali::Vector3 %{
public static Vector3 operator+(Vector3 arg1, Vector3 arg2) {
return arg1.Add(arg2);
}
-
+
public static Vector3 operator-(Vector3 arg1, Vector3 arg2) {
return arg1.Subtract(arg2);
}
public static Vector3 operator-(Vector3 arg1, Vector3 arg2) {
return arg1.Subtract(arg2);
}
@@
-108,13
+115,20
@@
return ValueOfIndex(index);
}
}
return ValueOfIndex(index);
}
}
+
+ public static Vector3 GetVector3FromPtr(global::System.IntPtr cPtr) {
+ Vector3 ret = new Vector3(cPtr, false);
+ if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+ return ret;
+ }
+
%}
%typemap(cscode) Dali::Vector4 %{
public static Vector4 operator+(Vector4 arg1, Vector4 arg2) {
return arg1.Add(arg2);
}
%}
%typemap(cscode) Dali::Vector4 %{
public static Vector4 operator+(Vector4 arg1, Vector4 arg2) {
return arg1.Add(arg2);
}
-
+
public static Vector4 operator-(Vector4 arg1, Vector4 arg2) {
return arg1.Subtract(arg2);
}
public static Vector4 operator-(Vector4 arg1, Vector4 arg2) {
return arg1.Subtract(arg2);
}
@@
-146,6
+160,13
@@
return ValueOfIndex(index);
}
}
return ValueOfIndex(index);
}
}
+
+ public static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr) {
+ Vector4 ret = new Vector4(cPtr, false);
+ if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+ return ret;
+ }
+
%}
%typemap(cscode) Dali::Matrix %{
%}
%typemap(cscode) Dali::Matrix %{
@@
-158,7
+179,7
@@
public static Quaternion operator+(Quaternion arg1, Quaternion arg2) {
return arg1.Add(arg2);
}
public static Quaternion operator+(Quaternion arg1, Quaternion arg2) {
return arg1.Add(arg2);
}
-
+
public static Quaternion operator-(Quaternion arg1, Quaternion arg2) {
return arg1.Subtract(arg2);
}
public static Quaternion operator-(Quaternion arg1, Quaternion arg2) {
return arg1.Subtract(arg2);
}
@@
-220,11
+241,10
@@
public static bool operator<(Uint16Pair arg1, Uint16Pair arg2) {
return arg1.LessThan(arg2);
}
public static bool operator<(Uint16Pair arg1, Uint16Pair arg2) {
return arg1.LessThan(arg2);
}
-
+
public static bool operator>(Uint16Pair arg1, Uint16Pair arg2) {
return arg1.GreaterThan(arg2);
}
public static bool operator>(Uint16Pair arg1, Uint16Pair arg2) {
return arg1.GreaterThan(arg2);
}
-
%}
/**
%}
/**