tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c25900428dae1b80cf132ae60008fc09712e62e4
commit c25900428dae1b80cf132ae60008fc09712e62e4
Author: Oleksandr Shcherbina <o.shcherb...@samsung.com>
Date: Fri Jun 19 10:34:48 2015 +0100
evas canvas3d: Correct Eolian namespace
Summary: Proceed fixing T2479
Reviewers: cedric, tasn
Subscribers: cedric, tasn
Maniphest Tasks: T2479
Differential Revision: https://phab.enlightenment.org/D2723
---
src/lib/evas/canvas/evas_canvas3d_camera.eo | 12 ++--
src/lib/evas/canvas/evas_canvas3d_light.eo | 6 +-
src/lib/evas/canvas/evas_canvas3d_material.eo | 16 +++---
src/lib/evas/canvas/evas_canvas3d_mesh.eo | 42 +++++++-------
src/lib/evas/canvas/evas_canvas3d_node.eo | 76 +++++++++++++-------------
src/lib/evas/canvas/evas_canvas3d_object.eo | 18 +++---
src/lib/evas/canvas/evas_canvas3d_primitive.eo | 10 ++--
src/lib/evas/canvas/evas_canvas3d_scene.eo | 32 +++++------
src/lib/evas/canvas/evas_canvas3d_texture.eo | 22 ++++----
src/lib/evas/canvas/evas_image.eo | 2 +-
10 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo
b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 8510a44..9fc5874 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Camera (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Camera_Data;
@@ -110,9 +110,9 @@ class Evas_Canvas3D_Camera (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
return: bool;
params {
- @in camera_node: Evas_Canvas3D_Node *;
- @in node: Evas_Canvas3D_Node *;
- @in key: Evas_Canvas3D_Frustum_Mode;
+ @in camera_node: Evas.Canvas3D.Node *;
+ @in node: Evas.Canvas3D.Node *;
+ @in key: Evas.Canvas3D.Frustum_Mode;
}
}
}
@@ -120,8 +120,8 @@ class Evas_Canvas3D_Camera (Evas_Canvas3D_Object,
Evas.Common_Interface)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo
b/src/lib/evas/canvas/evas_canvas3d_light.eo
index 169113f..54221e0 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Light (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Light_Data;
@@ -347,8 +347,8 @@ class Evas_Canvas3D_Light (Evas_Canvas3D_Object,
Evas.Common_Interface)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo
b/src/lib/evas/canvas/evas_canvas3d_material.eo
index f465a1b..c79205c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Material (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Material_Data;
@@ -24,7 +24,7 @@ class Evas_Canvas3D_Material (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @in attrib: Evas_Canvas3D_Material_Attrib; /*@ Material attribute
ID. */
+ @in attrib: Evas.Canvas3D.Material_Attrib; /*@ Material attribute
ID. */
@in r: Evas_Real; /*@ Red component of the color. */
@in g: Evas_Real; /*@ Green component of the color. */
@in b: Evas_Real; /*@ Blue component of the color. */
@@ -41,7 +41,7 @@ class Evas_Canvas3D_Material (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Material
*/
params {
- @in attrib: Evas_Canvas3D_Material_Attrib; /*@ Material attribute
ID. */
+ @in attrib: Evas.Canvas3D.Material_Attrib; /*@ Material attribute
ID. */
@out r: Evas_Real; /*@ Pointer to receive red component of the
color. */
@out g: Evas_Real; /*@ Pointer to receive green component of the
color. */
@out b: Evas_Real; /*@ Pointer to receive blue component of the
color. */
@@ -74,7 +74,7 @@ class Evas_Canvas3D_Material (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
keys {
- attrib: Evas_Canvas3D_Material_Attrib; /*@ Material attribute ID.
*/
+ attrib: Evas.Canvas3D.Material_Attrib; /*@ Material attribute ID.
*/
}
values {
enable: bool; /*@ Whether to enable the attribute (@c EINA_TRUE),
or not (@c EINA_FALSE). */
@@ -136,18 +136,18 @@ class Evas_Canvas3D_Material (Evas_Canvas3D_Object,
Evas.Common_Interface)
}
keys {
- attrib: Evas_Canvas3D_Material_Attrib; /*@ Material attribute ID.
*/
+ attrib: Evas.Canvas3D.Material_Attrib; /*@ Material attribute ID.
*/
}
values {
- texture: Evas_Canvas3D_Texture *;
+ texture: Evas.Canvas3D.Texture *;
}
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index cd7010d..b418e6a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object, Evas.Common_Interface,
Efl.File)
+class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface,
Efl.File)
{
legacy_prefix: null;
data: Evas_Canvas3D_Mesh_Data;
@@ -23,7 +23,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
params {
@in frame: int; /*@ The number of the key frame. */
- @in attrib: Evas_Canvas3D_Vertex_Attrib; /*@ Vertex attribute ID.
*/
+ @in attrib: Evas.Canvas3D.Vertex_Attrib; /*@ Vertex attribute ID.
*/
@in stride: int; /*@ Stride to go to the next vertex (in bytes). */
@in data: const(void)*; /*@ Pointer to the vertex data buffer. */
}
@@ -45,7 +45,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
params {
@in frame: int; /*@ The number of the key frame. */
- @in attrib: Evas_Canvas3D_Vertex_Attrib; /*@ Vertex attribute ID.
*/
+ @in attrib: Evas.Canvas3D.Vertex_Attrib; /*@ Vertex attribute ID.
*/
@in stride: int; /*@ Stride to go to the next vertex (in bytes). */
@in data: const(void)*; /*@ Pointer to the vertex data buffer. */
}
@@ -70,7 +70,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
return: void *;
params {
@in frame: int; /*@ The number of the key frame. */
- @in attrib: Evas_Canvas3D_Vertex_Attrib; /*@ Vertex attribute ID.
*/
+ @in attrib: Evas.Canvas3D.Vertex_Attrib; /*@ Vertex attribute ID.
*/
}
}
@@ -85,7 +85,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
params {
@in frame: int; /*@ The number of the key frame. */
- @in attrib: Evas_Canvas3D_Vertex_Attrib; /*@ Vertex attribute ID.
*/
+ @in attrib: Evas.Canvas3D.Vertex_Attrib; /*@ Vertex attribute ID.
*/
}
}
@@ -106,7 +106,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
return: int;
params {
@in frame: int; /*@ The number of the key frame. */
- @in attrib: Evas_Canvas3D_Vertex_Attrib; /*@ Vertex attribute ID.
*/
+ @in attrib: Evas.Canvas3D.Vertex_Attrib; /*@ Vertex attribute ID.
*/
}
}
@@ -125,7 +125,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
@ingroup Evas_Canvas3D_Mesh
*/
params {
- @in format: Evas_Canvas3D_Index_Format; /*@ Vertex index data
format. */
+ @in format: Evas.Canvas3D.Index_Format; /*@ Vertex index data
format. */
@in count: int; /*@ Vertex index count. */
@in indices: const(void)*; /*@ Pointer to the index data. */
}
@@ -144,7 +144,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
@ingroup Evas_Canvas3D_Mesh
*/
params {
- @in format: Evas_Canvas3D_Index_Format; /*@ Vertex index data
format. */
+ @in format: Evas.Canvas3D.Index_Format; /*@ Vertex index data
format. */
@in count: int; /*@ Vertex index count. */
@in indices: const(void)*; /*@ Pointer to the index data. */
}
@@ -167,7 +167,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
@ingroup Evas_Canvas3D_Mesh
*/
- return: Evas_Canvas3D_Index_Format;
+ return: Evas.Canvas3D.Index_Format;
}
index_count_get @const {
@@ -276,8 +276,8 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
@ingroup Evas_Canvas3D_Mesh
*/
params {
- @in sfactor: Evas_Canvas3D_Blend_Func; /*@ Specifies how the red,
green, blue, and alpha source blending factors are computed.*/
- @in dfactor: Evas_Canvas3D_Blend_Func; /*@ Specifies how the red,
green, blue, and alpha destination blending factors are computed.*/
+ @in sfactor: Evas.Canvas3D.Blend_Func; /*@ Specifies how the red,
green, blue, and alpha source blending factors are computed.*/
+ @in dfactor: Evas.Canvas3D.Blend_Func; /*@ Specifies how the red,
green, blue, and alpha destination blending factors are computed.*/
}
}
blending_func_get {
@@ -287,8 +287,8 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
@ingroup Evas_Canvas3D_Mesh
*/
params {
- @out sfactor: Evas_Canvas3D_Blend_Func; /*@ Pointer to receive
source blendin factors key.*/
- @out dfactor: Evas_Canvas3D_Blend_Func; /*@ Pointer to receive
destination blendin factors key.*/
+ @out sfactor: Evas.Canvas3D.Blend_Func; /*@ Pointer to receive
source blendin factors key.*/
+ @out dfactor: Evas.Canvas3D.Blend_Func; /*@ Pointer to receive
destination blendin factors key.*/
}
}
from_primitive_set {
@@ -298,7 +298,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
params {
@in frame: int; /*@ Specifies data of which frame of given mesh
will be set.*/
- @in primitive: Evas_Canvas3D_Primitive *; /*@ Specifies which data
will be set.*/
+ @in primitive: Evas.Canvas3D.Primitive *; /*@ Specifies which data
will be set.*/
}
}
@property shade_mode {
@@ -321,7 +321,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
}
values {
- mode: Evas_Canvas3D_Shade_Mode; /*@ The shade mode.*/
+ mode: Evas.Canvas3D.Shade_Mode; /*@ The shade mode.*/
}
}
@property color_pick_enable {
@@ -395,7 +395,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
enabled: bool; /*@ Fog enabled status.*/
}
}
-
+
@property alpha_test_enable {
set {
/*@
@@ -440,7 +440,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
}
values {
- comparison_func: Evas_Canvas3D_Comparison; /*@ Specifies the alpha
comparison function.*/
+ comparison_func: Evas.Canvas3D.Comparison; /*@ Specifies the alpha
comparison function.*/
ref_value: Evas_Real; /*@ Specifies the reference value that
incoming alpha values are compared to.*/
}
}
@@ -493,7 +493,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
frame: int; /*@ The number of the key frame.*/
}
values {
- material: Evas_Canvas3D_Material *; /*@ The material to be set to
the key frame.*/
+ material: Evas.Canvas3D.Material *; /*@ The material to be set to
the key frame.*/
}
}
@@ -522,7 +522,7 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
*/
}
values {
- assembly: Evas_Canvas3D_Vertex_Assembly; /*@ Vertex assembly.*/
+ assembly: Evas.Canvas3D.Vertex_Assembly; /*@ Vertex assembly.*/
}
}
@@ -530,8 +530,8 @@ class Evas_Canvas3D_Mesh (Evas_Canvas3D_Object,
Evas.Common_Interface, Efl.File)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
Efl.File.file.set;
Efl.File.mmap.set;
Efl.File.save;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo
b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 1fee5f4..1418224 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Node (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Node_Data;
@@ -7,7 +7,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
/*@ Constructor. */
legacy: null;
params {
- @in type: Evas_Canvas3D_Node_Type;
+ @in type: Evas.Canvas3D.Node_Type;
}
}
type_get @const {
@@ -20,7 +20,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
- return: Evas_Canvas3D_Node_Type ;
+ return: Evas.Canvas3D.Node_Type ;
}
member_add {
/*@
@@ -35,7 +35,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @in member: Evas_Canvas3D_Node *; /*@ Node object to be added. */
+ @in member: Evas.Canvas3D.Node *; /*@ Node object to be added. */
}
}
member_del {
@@ -48,7 +48,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @in member: Evas_Canvas3D_Node *; /*@ Member node to be deleted
from the given node. */
+ @in member: Evas.Canvas3D.Node *; /*@ Member node to be deleted
from the given node. */
}
}
@@ -62,7 +62,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
- return: Evas_Canvas3D_Node *;
+ return: Evas.Canvas3D.Node *;
}
member_list_get @const {
@@ -75,7 +75,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
- return: const(list<Evas_Canvas3D_Node *>)*;
+ return: const(list<Evas.Canvas3D.Node *>)*;
}
position_set {
/*@
@@ -179,10 +179,10 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node_Transform
*/
params {
- @in space: Evas_Canvas3D_Space; /*@ */
- @out x: Evas_Real; /*@ Pointer to receive X coordinate of the
position.*/
- @out y: Evas_Real; /*@ Pointer to receive Y coordinate of the
position.*/
- @out z: Evas_Real; /*@ Pointer to receive Z coordinate of the
position.*/
+ @in space: Evas.Canvas3D.Space; /*@ */
+ @out x: Evas_Real; /*@ Pointer to receive X
coordinate of the position.*/
+ @out y: Evas_Real; /*@ Pointer to receive Y
coordinate of the position.*/
+ @out z: Evas_Real; /*@ Pointer to receive Z
coordinate of the position.*/
}
}
@@ -201,11 +201,11 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node_Transform
*/
params {
- @in space: Evas_Canvas3D_Space; /*@ */
- @out x: Evas_Real; /*@ Pointer to receive X term of the
orientation quaternion.*/
- @out y: Evas_Real; /*@ Pointer to receive Y term of the
orientation quaternion.*/
- @out z: Evas_Real; /*@ Pointer to receive Z term of the
orientation quaternion.*/
- @out w: Evas_Real; /*@ Pointer to receive W term of the
orientation quaternion.*/
+ @in space: Evas.Canvas3D.Space; /*@ */
+ @out x: Evas_Real; /*@ Pointer to receive X term of
the orientation quaternion.*/
+ @out y: Evas_Real; /*@ Pointer to receive Y term of
the orientation quaternion.*/
+ @out z: Evas_Real; /*@ Pointer to receive Z term of
the orientation quaternion.*/
+ @out w: Evas_Real; /*@ Pointer to receive W term of
the orientation quaternion.*/
}
}
@@ -223,10 +223,10 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node_Transform
*/
params {
- @in space: Evas_Canvas3D_Space; /*@ */
- @out x: Evas_Real; /*@ Pointer to receive Scale factor along
X-axis.*/
- @out y: Evas_Real; /*@ Pointer to receive Scale factor along
X-axis.*/
- @out z: Evas_Real; /*@ Pointer to receive Scale factor along
X-axis.*/
+ @in space: Evas.Canvas3D.Space; /*@ */
+ @out x: Evas_Real; /*@ Pointer to receive Scale
factor along X-axis.*/
+ @out y: Evas_Real; /*@ Pointer to receive Scale
factor along X-axis.*/
+ @out z: Evas_Real; /*@ Pointer to receive Scale
factor along X-axis.*/
}
}
@@ -254,14 +254,14 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @in target_space: Evas_Canvas3D_Space; /*@ Space where the target
position belongs to. */
- @in x: Evas_Real; /*@ X coordinate of the target
position. */
- @in y: Evas_Real; /*@ Y coordinate of the target
position. */
- @in z: Evas_Real; /*@ Z coordinate of the target
position. */
- @in up_space: Evas_Canvas3D_Space; /*@ Space where the up
vector belongs to. */
- @in ux: Evas_Real; /*@ X term of the up vector. */
- @in uy: Evas_Real; /*@ Y term of the up vector. */
- @in uz: Evas_Real; /*@ Z term of the up vector. */
+ @in target_space: Evas.Canvas3D.Space; /*@ Space where the target
position belongs to. */
+ @in x: Evas_Real; /*@ X coordinate of the
target position. */
+ @in y: Evas_Real; /*@ Y coordinate of the
target position. */
+ @in z: Evas_Real; /*@ Z coordinate of the
target position. */
+ @in up_space: Evas.Canvas3D.Space; /*@ Space where the up
vector belongs to. */
+ @in ux: Evas_Real; /*@ X term of the up
vector. */
+ @in uy: Evas_Real; /*@ Y term of the up
vector. */
+ @in uz: Evas_Real; /*@ Z term of the up
vector. */
}
}
@@ -280,7 +280,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
params {
- @in mesh: Evas_Canvas3D_Mesh *; /*@ The mesh to be added.*/
+ @in mesh: Evas.Canvas3D.Mesh *; /*@ The mesh to be added.*/
}
}
@@ -299,7 +299,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
params {
- @in mesh: Evas_Canvas3D_Mesh *; /*@ The mesh to be deleted.*/
+ @in mesh: Evas.Canvas3D.Mesh *; /*@ The mesh to be deleted.*/
}
}
@@ -318,7 +318,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Node
*/
- return: const(list<Evas_Canvas3D_Mesh *>)*;
+ return: const(list<Evas.Canvas3D.Mesh *>)*;
}
bounding_box_get{
@@ -494,7 +494,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
}
values {
// FIXME: Evas_Canvas3D_Camera is necessary, but that introduces a
cycle
- camera: Evas_Canvas3D_Object *; /*@ The camera */
+ camera: Evas.Canvas3D.Object *; /*@ The camera */
}
}
@@ -527,7 +527,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- light: Evas_Canvas3D_Light *; /*@ The light */
+ light: Evas.Canvas3D.Light *; /*@ The light */
}
}
@@ -567,7 +567,7 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
keys {
- mesh: Evas_Canvas3D_Mesh *; /*@ The given mesh.*/
+ mesh: Evas.Canvas3D.Mesh *; /*@ The given mesh.*/
}
values {
frame: int; /*@ The animation frame number.*/
@@ -605,10 +605,10 @@ class Evas_Canvas3D_Node (Evas_Canvas3D_Object,
Evas.Common_Interface)
}
implements {
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
- Evas_Canvas3D_Object.callback_register;
- Evas_Canvas3D_Object.callback_unregister;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
+ Evas.Canvas3D.Object.callback_register;
+ Evas.Canvas3D.Object.callback_unregister;
}
constructors {
.constructor;
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo
b/src/lib/evas/canvas/evas_canvas3d_object.eo
index 21634c3..8eb551a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
+class Evas.Canvas3D.Object (Eo.Base, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Object_Data;
@@ -8,15 +8,15 @@ class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
Notify the object regarding its state change.
*/
params {
- @in state: Evas_Canvas3D_State; /*@ State that is changed */
- @in ref: Evas_Canvas3D_Object *; /*@ The Object that caused the
change */
+ @in state: Evas.Canvas3D.State; /*@ State that is changed */
+ @in ref: Evas.Canvas3D.Object *; /*@ The Object that caused the
change */
}
}
type_get @const {
/*@
Returns the type of the object.
*/
- return: Evas_Canvas3D_Object_Type;
+ return: Evas.Canvas3D.Object_Type;
}
type_set {
@@ -24,7 +24,7 @@ class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
Returns the type of the object.
*/
params{
- @in type: Evas_Canvas3D_Object_Type;
+ @in type: Evas.Canvas3D.Object_Type;
}
}
@@ -34,7 +34,7 @@ class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
*/
return: bool;
params {
- @in state: Evas_Canvas3D_State; /*@ State whose status is being
asked */
+ @in state: Evas.Canvas3D.State; /*@ State whose status is being
asked */
}
}
@@ -56,8 +56,8 @@ class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
Update request for the object.
*/
params {
- @in state: Evas_Canvas3D_State; /*@ State that is changed */
- @in ref: Evas_Canvas3D_Object *; /*@ The Object that caused the
change */
+ @in state: Evas.Canvas3D.State; /*@ State that is changed */
+ @in ref: Evas.Canvas3D.Object *; /*@ The Object that caused the
change */
}
}
callback_register {
@@ -66,7 +66,7 @@ class Evas_Canvas3D_Object (Eo.Base, Evas.Common_Interface)
*/
params {
@in event: const(char)*; /*@ Event type */
- @in data: const(void)*; /*@ User data*/
+ @in data: const(void)*; /*@ User data*/
}
}
callback_unregister {
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index f867f4d..fd281f1 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Primitive (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Primitive_Data;
@@ -31,7 +31,7 @@ class Evas_Canvas3D_Primitive (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- form: Evas_Canvas3D_Mesh_Primitive; /*@ Form of primitive.*/
+ form: Evas.Canvas3D.Mesh_Primitive; /*@ Form of primitive.*/
}
}
@property mode {
@@ -62,7 +62,7 @@ class Evas_Canvas3D_Primitive (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- mode: Evas_Canvas3D_Primitive_Mode; /*@ Mode of primitive.*/
+ mode: Evas.Canvas3D.Primitive_Mode; /*@ Mode of primitive.*/
}
}
@property ratio {
@@ -71,7 +71,7 @@ class Evas_Canvas3D_Primitive (Evas_Canvas3D_Object,
Evas.Common_Interface)
*Set the ratio of the given primitive.
*
*Now ratio uses only in torus as the ratio of the
- *major radius and minor radius. For this usage
+ *major radius and minor radius. For this usage
*Avaliable values is from 1.0 to infinity.
*If ratio for torus has a bad value,
*will be used 3.0 as ratio. Like ratio of usual doughnut.
@@ -141,7 +141,7 @@ class Evas_Canvas3D_Primitive (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- surface: Evas_Canvas3D_Surface_Func *; /*@ Pointer to customers
surface function.*/
+ surface: Evas.Canvas3D.Surface_Func *; /*@ Pointer to customers
surface function.*/
}
}
@property tex_scale {
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo
b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 5ce6070..31731f5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Scene (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data: Evas_Canvas3D_Scene_Data;
@@ -14,7 +14,7 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
@in w: int; /*@ Width of the resolution. */
- @in h: int; /*@ Height of the resolution. */
+ @in h: int; /*@ Height of the resolution. */
}
}
@@ -26,7 +26,7 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
@out w: int; /*@ Pointer to receive width of the resolution. */
- @out h: int; /*@ Pointer to receive height of the resolution. */
+ @out h: int; /*@ Pointer to receive height of the resolution. */
}
}
@@ -76,12 +76,12 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
return: bool;
params {
- @in x: Evas_Real; /*@ X coordinate of the picking
position. */
- @in y: Evas_Real; /*@ Y coordinate of the picking
position. */
- @out node: Evas_Canvas3D_Node *; /*@ Pointer to receive the node
contains the picked mesh. */
- @out mesh: Evas_Canvas3D_Mesh *; /*@ Pointer to receive the picked
mesh. */
- @out s: Evas_Real; /*@ Pointer to receive the texture "s"
coordinate. */
- @out t: Evas_Real; /*@ Pointer to receive the texture "t"
coordinate. */
+ @in x: Evas_Real; /*@ X coordinate of the picking
position. */
+ @in y: Evas_Real; /*@ Y coordinate of the picking
position. */
+ @out node: Evas.Canvas3D.Node *; /*@ Pointer to receive the node
contains the picked mesh. */
+ @out mesh: Evas.Canvas3D.Mesh *; /*@ Pointer to receive the picked
mesh. */
+ @out s: Evas_Real; /*@ Pointer to receive the
texture "s" coordinate. */
+ @out t: Evas_Real; /*@ Pointer to receive the
texture "t" coordinate. */
}
}
@@ -91,11 +91,11 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Scene
*/
- return: Evas_Canvas3D_Node *;
+ return: Evas.Canvas3D.Node *;
params {
@in x: Evas_Real; /*@ X coordinate of the picking
position. */
@in y: Evas_Real; /*@ Y coordinate of the picking
position. */
- @in node: Evas_Canvas3D_Node *; /*@ Node for search. */
+ @in node: Evas.Canvas3D.Node *; /*@ Node for search. */
}
}
@@ -105,7 +105,7 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Scene
*/
- return: list<Evas_Canvas3D_Node *> *;
+ return: list<Evas.Canvas3D.Node *> *;
params {
@in x: Evas_Real; /*@ X coordinate of the picking
position. */
@in y: Evas_Real; /*@ Y coordinate of the picking
position. */
@@ -176,7 +176,7 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- node: Evas_Canvas3D_Node *; /*@ A node which will be used as a
root node for the scene. */
+ node: Evas.Canvas3D.Node *; /*@ A node which will be used as a
root node for the scene. */
}
}
@@ -198,14 +198,14 @@ class Evas_Canvas3D_Scene (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
}
values {
- node: Evas_Canvas3D_Node *; /*@ A node which will be used as a
camera node for the scene. */
+ node: Evas.Canvas3D.Node *; /*@ A node which will be used as a
camera node for the scene. */
}
}
}
implements {
Eo.Base.constructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo
b/src/lib/evas/canvas/evas_canvas3d_texture.eo
index 4b88349..22259c3 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo
@@ -1,4 +1,4 @@
-class Evas_Canvas3D_Texture (Evas_Canvas3D_Object, Evas.Common_Interface)
+class Evas.Canvas3D.Texture (Evas.Canvas3D.Object, Evas.Common_Interface)
{
legacy_prefix: null;
data : Evas_Canvas3D_Texture_Data;
@@ -147,8 +147,8 @@ class Evas_Canvas3D_Texture (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Texture
*/
params {
- @in s: Evas_Canvas3D_Wrap_Mode; /*@ Wrap mode for S-axis. */
- @in t: Evas_Canvas3D_Wrap_Mode; /*@ Wrap mode for T-axis. */
+ @in s: Evas.Canvas3D.Wrap_Mode; /*@ Wrap mode for S-axis. */
+ @in t: Evas.Canvas3D.Wrap_Mode; /*@ Wrap mode for T-axis. */
}
}
@@ -162,8 +162,8 @@ class Evas_Canvas3D_Texture (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @out s: Evas_Canvas3D_Wrap_Mode; /*@ Pointer to receive S-axis
wrap mode. */
- @out t: Evas_Canvas3D_Wrap_Mode; /*@ Pointer to receive T-axis
wrap mode. */
+ @out s: Evas.Canvas3D.Wrap_Mode; /*@ Pointer to receive S-axis
wrap mode. */
+ @out t: Evas.Canvas3D.Wrap_Mode; /*@ Pointer to receive T-axis
wrap mode. */
}
}
@@ -177,8 +177,8 @@ class Evas_Canvas3D_Texture (Evas_Canvas3D_Object,
Evas.Common_Interface)
*/
params {
- @in min: Evas_Canvas3D_Texture_Filter; /*@ Minification filter
used when down-scaling. */
- @in mag: Evas_Canvas3D_Texture_Filter; /*@ Magnification filter
used when up-scaling. */
+ @in min: Evas.Canvas3D.Texture_Filter; /*@ Minification filter
used when down-scaling. */
+ @in mag: Evas.Canvas3D.Texture_Filter; /*@ Magnification filter
used when up-scaling. */
}
}
@@ -195,8 +195,8 @@ class Evas_Canvas3D_Texture (Evas_Canvas3D_Object,
Evas.Common_Interface)
@ingroup Evas_Canvas3D_Texture
*/
params {
- @out min: Evas_Canvas3D_Texture_Filter; /*@ Pointer to receive the
minification filter. */
- @out mag: Evas_Canvas3D_Texture_Filter; /*@ Pointer to receive the
magnification filter. */
+ @out min: Evas.Canvas3D.Texture_Filter; /*@ Pointer to receive the
minification filter. */
+ @out mag: Evas.Canvas3D.Texture_Filter; /*@ Pointer to receive the
magnification filter. */
}
}
}
@@ -204,8 +204,8 @@ class Evas_Canvas3D_Texture (Evas_Canvas3D_Object,
Evas.Common_Interface)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Evas_Canvas3D_Object.update_notify;
- Evas_Canvas3D_Object.change_notify;
+ Evas.Canvas3D.Object.update_notify;
+ Evas.Canvas3D.Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_image.eo
b/src/lib/evas/canvas/evas_image.eo
index f3a9ec6..38231e3 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -753,7 +753,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image,
Efl.Gfx.Fill, Efl.Gfx.View)
legacy: null;
}
values {
- scene: Evas_Canvas3D_Scene *; /*@ 3D scene on an image object. */
+ scene: Evas.Canvas3D.Scene *; /*@ 3D scene on an image object. */
}
}
@property filter_program {
--
