enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Eina: Move vector2 to eina_inline_vector.x 

For consistency.

Also, include inside Eina.h
Thanks @vtorri for the remark.
This commit is contained in:
Jean-Philippe Andre 2016-01-07 18:58:54 +09:00
parent dd05e72ab0
commit d488926cb6
4 changed files with 175 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile_Eina.am
View File

@ -95,6 +95,7 @@ lib/eina/eina_evlog.h \
lib/eina/eina_util.h \
lib/eina/eina_quaternion.h \
lib/eina/eina_vector.h \
lib/eina/eina_inline_vector.x \
lib/eina/eina_bezier.h
lib_eina_libeina_la_SOURCES = \

1
src/lib/eina/Eina.h
View File

@ -263,6 +263,7 @@ extern "C" {
#include <eina_cow.h>
#include <eina_thread_queue.h>
#include <eina_matrix.h>
#include <eina_vector.h>
#include <eina_crc.h>
#include <eina_evlog.h>
#include <eina_util.h>

154
src/lib/eina/eina_inline_vector.x Normal file
View File

@ -0,0 +1,154 @@
/* EINA - EFL data type library
* Copyright (C) 2016 Cedric Bail
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library;
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EINA_INLINE_VECTOR_X_
#define EINA_INLINE_VECTOR_X_
static inline void
eina_vector2_set(Eina_Vector2 *dst, double x, double y)
{
dst->x = x;
dst->y = y;
}
static inline void
eina_vector2_array_set(Eina_Vector2 *dst, const double *v)
{
dst->x = v[0];
dst->y = v[1];
}
static inline void
eina_vector2_copy(Eina_Vector2 *dst, const Eina_Vector2 *src)
{
dst->x = src->x;
dst->y = src->y;
}
static inline void
eina_vector2_negate(Eina_Vector2 *out, const Eina_Vector2 *v)
{
out->x = -v->x;
out->y = -v->y;
}
static inline void
eina_vector2_add(Eina_Vector2 *out, const Eina_Vector2 *a,
const Eina_Vector2 *b)
{
out->x = a->x + b->x;
out->y = a->y + b->y;
}
static inline void
eina_vector2_subtract(Eina_Vector2 *out, const Eina_Vector2 *a,
const Eina_Vector2 *b)
{
out->x = a->x - b->x;
out->y = a->y - b->y;
}
static inline void
eina_vector2_scale(Eina_Vector2 *out, const Eina_Vector2 *v, double scale)
{
out->x = scale * v->x;
out->y = scale * v->y;
}
static inline double
eina_vector2_dot_product(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
return (a->x * b->x) + (a->y * b->y);
}
static inline double
eina_vector2_length_get(const Eina_Vector2 *v)
{
return sqrt((v->x * v->x) + (v->y * v->y));
}
static inline double
eina_vector2_length_square_get(const Eina_Vector2 *v)
{
return (v->x * v->x) + (v->y * v->y);
}
static inline double
eina_vector2_distance_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
Eina_Vector2 v;
eina_vector2_subtract(&v, a, b);
return eina_vector2_length_get(&v);
}
static inline double
eina_vector2_distance_square_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
Eina_Vector2 v;
eina_vector2_subtract(&v, a, b);
return eina_vector2_length_square_get(&v);
}
static inline void
eina_vector2_normalize(Eina_Vector2 *out, const Eina_Vector2 *v)
{
/* Assume "v" is not a zero vector */
eina_vector2_scale(out, v, 1.0 / eina_vector2_length_get(v));
}
static inline void
eina_vector2_transform(Eina_Vector2 *out, const Eina_Matrix2 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
tmp.x = (m->xx * v->x) + (m->yx * v->y);
tmp.y = (m->xy * v->x) + (m->yy * v->y);
eina_vector2_copy(out, &tmp);
}
static inline void
eina_vector2_homogeneous_position_transform(Eina_Vector2 *out,
const Eina_Matrix3 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
tmp.x = (m->xx * v->x) + (m->yx * v->y) + m->zx;
tmp.y = (m->xy * v->x) + (m->yy * v->y) + m->zy;
eina_vector2_scale(out, &tmp, 1.0 / ((m->xz * v->x) + (m->yz * v->y) + m->zz));
}
static inline void
eina_vector2_homogeneous_direction_transform(Eina_Vector2 *out,
const Eina_Matrix3 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
tmp.x = (m->xx * v->x) + (m->yx * v->y);
tmp.y = (m->xy * v->x) + (m->yy * v->y);
eina_vector2_copy(out, &tmp);
}
#endif

134
src/lib/eina/eina_vector.h
View File

@ -1,5 +1,5 @@
/* EINA - EFL data type library
* Copyright (C) 2015 Cedric Bail
* Copyright (C) 2016 Cedric Bail
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -52,12 +52,7 @@ struct _Eina_Vector2
*
* @since 1.17
*/
static inline void
eina_vector2_set(Eina_Vector2 *dst, double x, double y)
{
dst->x = x;
dst->y = y;
}
static inline void eina_vector2_set(Eina_Vector2 *dst, double x, double y);
/**
* @brief Set array to vector.
@ -69,12 +64,7 @@ eina_vector2_set(Eina_Vector2 *dst, double x, double y)
*
* @since 1.17
*/
static inline void
eina_vector2_array_set(Eina_Vector2 *dst, const double *v)
{
dst->x = v[0];
dst->y = v[1];
}
static inline void eina_vector2_array_set(Eina_Vector2 *dst, const double *v);
/**
* @brief Copy vector.
@ -84,12 +74,7 @@ eina_vector2_array_set(Eina_Vector2 *dst, const double *v)
*
* @since 1.17
*/
static inline void
eina_vector2_copy(Eina_Vector2 *dst, const Eina_Vector2 *src)
{
dst->x = src->x;
dst->y = src->y;
}
static inline void eina_vector2_copy(Eina_Vector2 *dst, const Eina_Vector2 *src);
/**
* @brief Make negative vector.
@ -99,12 +84,7 @@ eina_vector2_copy(Eina_Vector2 *dst, const Eina_Vector2 *src)
*
* @since 1.17
*/
static inline void
eina_vector2_negate(Eina_Vector2 *out, const Eina_Vector2 *v)
{
out->x = -v->x;
out->y = -v->y;
}
static inline void eina_vector2_negate(Eina_Vector2 *out, const Eina_Vector2 *v);
/**
* @brief Add two vectors.
@ -115,13 +95,7 @@ eina_vector2_negate(Eina_Vector2 *out, const Eina_Vector2 *v)
*
* @since 1.17
*/
static inline void
eina_vector2_add(Eina_Vector2 *out, const Eina_Vector2 *a,
const Eina_Vector2 *b)
{
out->x = a->x + b->x;
out->y = a->y + b->y;
}
static inline void eina_vector2_add(Eina_Vector2 *out, const Eina_Vector2 *a, const Eina_Vector2 *b);
/**
* @brief Subtract two vectors
@ -132,13 +106,7 @@ eina_vector2_add(Eina_Vector2 *out, const Eina_Vector2 *a,
*
* @since 1.17
*/
static inline void
eina_vector2_subtract(Eina_Vector2 *out, const Eina_Vector2 *a,
const Eina_Vector2 *b)
{
out->x = a->x - b->x;
out->y = a->y - b->y;
}
static inline void eina_vector2_subtract(Eina_Vector2 *out, const Eina_Vector2 *a, const Eina_Vector2 *b);
/**
* @brief Scale vector.
@ -149,12 +117,7 @@ eina_vector2_subtract(Eina_Vector2 *out, const Eina_Vector2 *a,
*
* @since 1.17
*/
static inline void
eina_vector2_scale(Eina_Vector2 *out, const Eina_Vector2 *v, double scale)
{
out->x = scale * v->x;
out->y = scale * v->y;
}
static inline void eina_vector2_scale(Eina_Vector2 *out, const Eina_Vector2 *v, double scale);
/**
* @brief Return the dot product of the two vectors.
@ -165,11 +128,7 @@ eina_vector2_scale(Eina_Vector2 *out, const Eina_Vector2 *v, double scale)
*
* @since 1.17
*/
static inline double
eina_vector2_dot_product(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
return (a->x * b->x) + (a->y * b->y);
}
static inline double eina_vector2_dot_product(const Eina_Vector2 *a, const Eina_Vector2 *b);
/**
* @brief Return the length of the given vector.
@ -179,11 +138,7 @@ eina_vector2_dot_product(const Eina_Vector2 *a, const Eina_Vector2 *b)
*
* @since 1.17
*/
static inline double
eina_vector2_length_get(const Eina_Vector2 *v)
{
return sqrt((v->x * v->x) + (v->y * v->y));
}
static inline double eina_vector2_length_get(const Eina_Vector2 *v);
/**
* @brief Return the length in square of the given vector.
@ -193,11 +148,7 @@ eina_vector2_length_get(const Eina_Vector2 *v)
*
* @since 1.17
*/
static inline double
eina_vector2_length_square_get(const Eina_Vector2 *v)
{
return (v->x * v->x) + (v->y * v->y);
}
static inline double eina_vector2_length_square_get(const Eina_Vector2 *v);
/**
* @brief Return the distance between of two vectors.
@ -208,14 +159,7 @@ eina_vector2_length_square_get(const Eina_Vector2 *v)
*
* @since 1.17
*/
static inline double
eina_vector2_distance_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
Eina_Vector2 v;
eina_vector2_subtract(&v, a, b);
return eina_vector2_length_get(&v);
}
static inline double eina_vector2_distance_get(const Eina_Vector2 *a, const Eina_Vector2 *b);
/**
* @brief Return the distance in square between of two vectors.
@ -226,14 +170,7 @@ eina_vector2_distance_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
*
* @since 1.17
*/
static inline double
eina_vector2_distance_square_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
{
Eina_Vector2 v;
eina_vector2_subtract(&v, a, b);
return eina_vector2_length_square_get(&v);
}
static inline double eina_vector2_distance_square_get(const Eina_Vector2 *a, const Eina_Vector2 *b);
/**
* @brief normalize vector.
@ -243,12 +180,7 @@ eina_vector2_distance_square_get(const Eina_Vector2 *a, const Eina_Vector2 *b)
*
* @since 1.17
*/
static inline void
eina_vector2_normalize(Eina_Vector2 *out, const Eina_Vector2 *v)
{
/* Assume "v" is not a zero vector */
eina_vector2_scale(out, v, 1.0 / eina_vector2_length_get(v));
}
static inline void eina_vector2_normalize(Eina_Vector2 *out, const Eina_Vector2 *v);
/**
* @brief Transform vector.
@ -259,17 +191,7 @@ eina_vector2_normalize(Eina_Vector2 *out, const Eina_Vector2 *v)
*
* @since 1.17
*/
static inline void
eina_vector2_transform(Eina_Vector2 *out, const Eina_Matrix2 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
tmp.x = (m->xx * v->x) + (m->yx * v->y);
tmp.y = (m->xy * v->x) + (m->yy * v->y);
eina_vector2_copy(out, &tmp);
}
static inline void eina_vector2_transform(Eina_Vector2 *out, const Eina_Matrix2 *m, const Eina_Vector2 *v);
/**
* @brief Homogeneous position transform vector.
@ -280,18 +202,7 @@ eina_vector2_transform(Eina_Vector2 *out, const Eina_Matrix2 *m,
*
* @since 1.17
*/
static inline void
eina_vector2_homogeneous_position_transform(Eina_Vector2 *out,
const Eina_Matrix3 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
tmp.x = (m->xx * v->x) + (m->yx * v->y) + m->zx;
tmp.y = (m->xy * v->x) + (m->yy * v->y) + m->zy;
eina_vector2_scale(out, &tmp, 1.0 / ((m->xz * v->x) + (m->yz * v->y) + m->zz));
}
static inline void eina_vector2_homogeneous_position_transform(Eina_Vector2 *out, const Eina_Matrix3 *m, const Eina_Vector2 *v);
/**
* @brief Homogeneous direction ransform vector.
@ -302,17 +213,10 @@ eina_vector2_homogeneous_position_transform(Eina_Vector2 *out,
*
* @since 1.17
*/
static inline void
eina_vector2_homogeneous_direction_transform(Eina_Vector2 *out,
const Eina_Matrix3 *m,
const Eina_Vector2 *v)
{
Eina_Vector2 tmp;
static inline void eina_vector2_homogeneous_direction_transform(Eina_Vector2 *out, const Eina_Matrix3 *m, const Eina_Vector2 *v);
tmp.x = (m->xx * v->x) + (m->yx * v->y);
tmp.y = (m->xy * v->x) + (m->yy * v->y);
/** @} */
eina_vector2_copy(out, &tmp);
}
#include "eina_inline_vector.x"
#endif