summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2015-08-24 12:00:57 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2015-08-24 12:00:57 +0200
commit2eb4f2604d1f91d198bf09d185fe455e5156d8ce (patch)
tree47ba5eca2d5802e5d5c2f8d06b6107cc052265ae
parenteb6832f62e82292bf910bbe9e693e8360f3db868 (diff)
evas_3d: fix defines
Summary: evas_3d: removed unnessecary defines Evas_Real was allready defined. The typedefs of the Eo types can be avoided by fixing the include order Reviewers: cedric, stefan_schmidt, tasn Reviewed By: stefan_schmidt, tasn Subscribers: stefan_schmidt, cedric Projects: #efl Maniphest Tasks: T2658 Differential Revision: https://phab.enlightenment.org/D2974
-rw-r--r--src/lib/evas/Evas_Eo.h135
1 files changed, 6 insertions, 129 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 17466bca02..34601088b2 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -333,129 +333,6 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE;
333 */ 333 */
334 334
335/** 335/**
336 * @typedef Evas_Real
337 *
338 * Floating-point data type
339 *
340 * Evas 3D use its own floating-point type. Even though it's a standard IEEE
341 * 754 floating-point type always use Evas_Real for the type safety. Double
342 * precision and fixed-point types will be useful but it's not supported yet.
343 *
344 * @since 1.10
345 * @ingroup Evas_Canvas3D_Types
346 */
347typedef double Evas_Real;
348
349
350/**
351 * @typedef Evas_Canvas3D_Object
352 *
353 * 3D Object object handle
354 *
355 * @since 1.10
356 * @ingroup Evas_Canvas3D_Object
357 */
358typedef Eo Evas_Canvas3D_Object;
359
360#define _EVAS_CANVAS3D_OBJECT_EO_CLASS_TYPE
361
362/**
363 * @typedef Evas_Canvas3D_Scene
364 *
365 * Scene object handle
366 *
367 * @since 1.10
368 * @ingroup Evas_Canvas3D_Scene
369 */
370typedef Eo Evas_Canvas3D_Scene;
371
372#define _EVAS_CANVAS3D_SCENE_EO_CLASS_TYPE
373
374/**
375 * @typedef Evas_Canvas3D_Node
376 *
377 * Node object handle
378 *
379 * @since 1.10
380 * @ingroup Evas_Canvas3D_Node
381 */
382typedef Eo Evas_Canvas3D_Node;
383
384#define _EVAS_CANVAS3D_NODE_EO_CLASS_TYPE
385
386/**
387 * @typedef Evas_Canvas3D_Camera
388 *
389 * Camera object handle
390 *
391 * @since 1.10
392 * @ingroup Evas_Canvas3D_Camera
393 */
394typedef Eo Evas_Canvas3D_Camera;
395
396#define _EVAS_CANVAS3D_CAMERA_EO_CLASS_TYPE
397
398/**
399 * @typedef Evas_Canvas3D_Light
400 *
401 * Light object handle
402 *
403 * @since 1.10
404 * @ingroup Evas_Canvas3D_Light
405 */
406typedef Eo Evas_Canvas3D_Light;
407
408#define _EVAS_CANVAS3D_LIGHT_EO_CLASS_TYPE
409
410/**
411 * @typedef Evas_Canvas3D_Mesh
412 *
413 * Mesh object handle
414 *
415 * @since 1.10
416 * @ingroup Evas_Canvas3D_Mesh
417 */
418typedef Eo Evas_Canvas3D_Mesh;
419
420#define _EVAS_CANVAS3D_MESH_EO_CLASS_TYPE
421
422/**
423 * @typedef Evas_Canvas3D_Texture
424 *
425 * Texture object handle
426 *
427 * @since 1.10
428 * @ingroup Evas_Canvas3D_Texture
429 */
430typedef Eo Evas_Canvas3D_Texture;
431
432#define _EVAS_CANVAS3D_TEXTURE_EO_CLASS_TYPE
433
434/**
435 * @typedef Evas_Canvas3D_Material
436 *
437 * Material object handle
438 *
439 * @since 1.10
440 * @ingroup Evas_Canvas3D_Material
441 */
442typedef Eo Evas_Canvas3D_Material;
443
444#define _EVAS_CANVAS3D_MATERIAL_EO_CLASS_TYPE
445
446/**
447 * @typedef Evas_Canvas3D_Primitive
448 *
449 * Primitive object handle
450 *
451 * @since 1.15
452 * @ingroup Evas_Canvas3D_Primitive
453 */
454typedef Eo Evas_Canvas3D_Primitive;
455
456#define _EVAS_CANVAS3D_PRIMITIVE_EO_CLASS_TYPE
457
458/**
459 * @typedef Evas_Canvas3D_Surface_Func 336 * @typedef Evas_Canvas3D_Surface_Func
460 * 337 *
461 * User-defined parametric surface function. 338 * User-defined parametric surface function.
@@ -470,9 +347,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
470 Evas_Real a, 347 Evas_Real a,
471 Evas_Real b); 348 Evas_Real b);
472 349
473#include "canvas/evas_image.eo.h" 350#include "canvas/evas_canvas3d_object.eo.h"
474
475#include "canvas/evas_canvas3d_camera.eo.h"
476 351
477#include "canvas/evas_canvas3d_texture.eo.h" 352#include "canvas/evas_canvas3d_texture.eo.h"
478 353
@@ -480,15 +355,17 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
480 355
481#include "canvas/evas_canvas3d_light.eo.h" 356#include "canvas/evas_canvas3d_light.eo.h"
482 357
483#include "canvas/evas_canvas3d_mesh.eo.h"
484
485#include "canvas/evas_canvas3d_primitive.eo.h" 358#include "canvas/evas_canvas3d_primitive.eo.h"
486 359
360#include "canvas/evas_canvas3d_mesh.eo.h"
361
487#include "canvas/evas_canvas3d_node.eo.h" 362#include "canvas/evas_canvas3d_node.eo.h"
488 363
364#include "canvas/evas_canvas3d_camera.eo.h"
365
489#include "canvas/evas_canvas3d_scene.eo.h" 366#include "canvas/evas_canvas3d_scene.eo.h"
490 367
491#include "canvas/evas_canvas3d_object.eo.h" 368#include "canvas/evas_image.eo.h"
492 369
493/** 370/**
494 * @ingroup Evas_Object_VG 371 * @ingroup Evas_Object_VG