summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 02:43:52 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-19 22:01:52 +0200
commitb14a85fd6c4e291752b8b53aa871e207f972eea3 (patch)
tree991a62616f20141906a6aa2f97ef0a17332e6f96
parente0ce78e170caa267fef7206b56e009688e9d1565 (diff)
HACK: remove broken APIdevs/bu5hm4n/eo_file_updates
cannot correctly work
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c8
-rw-r--r--src/lib/efl/Efl.h25
-rw-r--r--src/lib/efl/interfaces/efl_gfx_path.c10
-rw-r--r--src/lib/efl/interfaces/efl_gfx_path.eo18
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo1
5 files changed, 41 insertions, 21 deletions
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index d8d804db22..b63fc69216 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -271,7 +271,7 @@ typedef struct _Line
271 double y2; 271 double y2;
272}Line; 272}Line;
273 273
274static void 274static void
275_line_value_set(Line *l, double x1, double y1, double x2, double y2) 275_line_value_set(Line *l, double x1, double y1, double x2, double y2)
276{ 276{
277 l->x1 = x1; 277 l->x1 = x1;
@@ -281,7 +281,7 @@ _line_value_set(Line *l, double x1, double y1, double x2, double y2)
281} 281}
282 282
283// approximate sqrt(x*x + y*y) using alpha max plus beta min algorithm. 283// approximate sqrt(x*x + y*y) using alpha max plus beta min algorithm.
284// With alpha = 1, beta = 3/8, giving results with the largest error less 284// With alpha = 1, beta = 3/8, giving results with the largest error less
285// than 7% compared to the exact value. 285// than 7% compared to the exact value.
286static double 286static double
287_line_length(Line *l) 287_line_length(Line *l)
@@ -339,7 +339,7 @@ _dasher_line_to(Dash_Stroker *dasher, double x, double y)
339 _outline_line_to(dasher->outline, x, y); 339 _outline_line_to(dasher->outline, x, y);
340 } 340 }
341 } 341 }
342 else 342 else
343 { 343 {
344 while (line_len > dasher->cur_dash_length) 344 while (line_len > dasher->cur_dash_length)
345 { 345 {
@@ -404,7 +404,7 @@ _dasher_cubic_to(Dash_Stroker *dasher, double cx1 , double cy1, double cx2, doub
404 _outline_cubic_to(dasher->outline, cx1, cy1, cx2, cy2, x, y); 404 _outline_cubic_to(dasher->outline, cx1, cy1, cx2, cy2, x, y);
405 } 405 }
406 } 406 }
407 else 407 else
408 { 408 {
409 while (bez_len > dasher->cur_dash_length) 409 while (bez_len > dasher->cur_dash_length)
410 { 410 {
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 021bc5eb37..5edb18ebe3 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -163,6 +163,31 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
163#include "interfaces/efl_gfx_stack.eo.h" 163#include "interfaces/efl_gfx_stack.eo.h"
164#include "interfaces/efl_gfx_fill.eo.h" 164#include "interfaces/efl_gfx_fill.eo.h"
165#include "interfaces/efl_gfx_view.eo.h" 165#include "interfaces/efl_gfx_view.eo.h"
166
167/**
168 * @brief Set the list of commands and points to be used to create the content
169 * of path.
170 *
171 * @param[in] obj The object.
172 * @param[in] op Command list
173 * @param[in] points Point list
174 *
175 * @ingroup Efl_Gfx_Path
176 */
177EOAPI void efl_gfx_path_set(Eo *obj, const Efl_Gfx_Path_Command_Type *op, const double *points);
178
179/**
180 * @brief Set the list of commands and points to be used to create the content
181 * of path.
182 *
183 * @param[in] obj The object.
184 * @param[out] op Command list
185 * @param[out] points Point list
186 *
187 * @ingroup Efl_Gfx_Path
188 */
189EOAPI void efl_gfx_path_get(const Eo *obj, const Efl_Gfx_Path_Command_Type **op, const double **points);
190
166#include "interfaces/efl_gfx_path.eo.h" 191#include "interfaces/efl_gfx_path.eo.h"
167#include "interfaces/efl_gfx_shape.eo.h" 192#include "interfaces/efl_gfx_shape.eo.h"
168#include "interfaces/efl_gfx_gradient.eo.h" 193#include "interfaces/efl_gfx_gradient.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx_path.c b/src/lib/efl/interfaces/efl_gfx_path.c
index 9852de1498..9458cfe3bb 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.c
+++ b/src/lib/efl/interfaces/efl_gfx_path.c
@@ -1375,7 +1375,7 @@ _next_command(char *path, char *cmd, double *arr, int *count)
1375 path++; 1375 path++;
1376 *count = _number_count(*cmd); 1376 *count = _number_count(*cmd);
1377 } 1377 }
1378 else 1378 else
1379 { 1379 {
1380 if (*cmd == 'm') 1380 if (*cmd == 'm')
1381 *cmd = 'l'; 1381 *cmd = 'l';
@@ -1542,4 +1542,12 @@ _efl_gfx_path_efl_object_destructor(Eo *obj, Efl_Gfx_Path_Data *pd)
1542 efl_destructor(efl_super(obj, EFL_GFX_PATH_MIXIN)); 1542 efl_destructor(efl_super(obj, EFL_GFX_PATH_MIXIN));
1543} 1543}
1544 1544
1545
1546EOAPI EFL_VOID_FUNC_BODYV(efl_gfx_path_set, EFL_FUNC_CALL(op, points), const Efl_Gfx_Path_Command_Type *op, const double *points);
1547EOAPI EFL_VOID_FUNC_BODYV_CONST(efl_gfx_path_get, EFL_FUNC_CALL(op, points), const Efl_Gfx_Path_Command_Type **op, const double **points);
1548
1549#define EFL_GFX_PATH_EXTRA_OPS \
1550 EFL_OBJECT_OP_FUNC(efl_gfx_path_set, _efl_gfx_path_path_set), \
1551 EFL_OBJECT_OP_FUNC(efl_gfx_path_get, _efl_gfx_path_path_get),
1552
1545#include "interfaces/efl_gfx_path.eo.c" 1553#include "interfaces/efl_gfx_path.eo.c"
diff --git a/src/lib/efl/interfaces/efl_gfx_path.eo b/src/lib/efl/interfaces/efl_gfx_path.eo
index 42a44607ac..ffcdc15503 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.eo
+++ b/src/lib/efl/interfaces/efl_gfx_path.eo
@@ -1,23 +1,9 @@
1import eina_types; 1import eina_types;
2import efl_gfx_types;
3 2
4mixin @beta Efl.Gfx.Path requires Efl.Object 3mixin @beta Efl.Gfx.Path requires Efl.Object
5{ 4{
6 [[EFL graphics path object interface]] 5 [[EFL graphics path object interface]]
7 methods { 6 methods {
8 @property path {
9 [[Set the list of commands and points to be used to create the
10 content of path.
11 ]]
12 set {
13 }
14 get {
15 }
16 values {
17 op: ptr(const(Efl.Gfx.Path_Command_Type)); [[Command list]]
18 points: ptr(const(double)); [[Point list]]
19 }
20 }
21 @property length { 7 @property length {
22 [[Path length property]] 8 [[Path length property]]
23 get { 9 get {
@@ -65,7 +51,7 @@ mixin @beta Efl.Gfx.Path requires Efl.Object
65 ]] 51 ]]
66 } 52 }
67 append_move_to { 53 append_move_to {
68 [[Moves the current point to the given point, 54 [[Moves the current point to the given point,
69 implicitly starting a new subpath and closing the previous one. 55 implicitly starting a new subpath and closing the previous one.
70 56
71 See also @.append_close. 57 See also @.append_close.
@@ -140,7 +126,7 @@ mixin @beta Efl.Gfx.Path requires Efl.Object
140 } 126 }
141 append_arc_to { 127 append_arc_to {
142 [[Append an arc that connects from the current point int the point list 128 [[Append an arc that connects from the current point int the point list
143 to the given point (x,y). The arc is defined by the given radius in 129 to the given point (x,y). The arc is defined by the given radius in
144 x-direction (rx) and radius in y direction (ry). 130 x-direction (rx) and radius in y direction (ry).
145 131
146 Use this api if you know the end point's of the arc otherwise use 132 Use this api if you know the end point's of the arc otherwise use
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index 69d36483df..aaf5c36696 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -1,4 +1,5 @@
1import eina_types; 1import eina_types;
2import efl_gfx_types;
2 3
3abstract @beta Efl.Canvas.Vg.Node extends Efl.Object 4abstract @beta Efl.Canvas.Vg.Node extends Efl.Object
4 implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path 5 implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path