diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-20 18:22:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-20 18:27:06 +0300 |
| commit | 482c4d099ae88bea018712b92b2990617ef006f8 (patch) | |
| tree | cdc6dd9d345da7a6edb2106ecb63d314d14b7a61 /source/blender/blenlib/BLI_utildefines.h | |
| parent | b0dee09a6d5531fb3bc7bbb00069c75e18dfbd1d (diff) | |
Cleanup: remove all BLI_utiledefines' ugly vectorial macros.
Not only were those often making doublons with already existing
BLI_math's stuff, but they were also used to hide implicit type
conversions...
As usual this adds some more exotic inlined vector functions (one of
the rare cases where I really miss C++ and its templates... ;) ).
Diffstat (limited to 'source/blender/blenlib/BLI_utildefines.h')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index f81bfc2f853..0e08b637c15 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -224,45 +224,6 @@ extern "C" { b = tmp; \ } (void)0 -#define VECCOPY(v1, v2) { \ - *(v1) = *(v2); \ - *(v1 + 1) = *(v2 + 1); \ - *(v1 + 2) = *(v2 + 2); \ -} (void)0 -#define VECCOPY2D(v1, v2) { \ - *(v1) = *(v2); \ - *(v1 + 1) = *(v2 + 1); \ -} (void)0 -#define VECADD(v1, v2, v3) { \ - *(v1) = *(v2) + *(v3); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2); \ -} (void)0 -#define VECSUB(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2); \ -} (void)0 -#define VECSUB2D(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ -} (void)0 -#define VECADDFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) + *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ -} (void)0 -#define VECMADD(v1, v2, v3, v4) { \ - *(v1) = *(v2) + *(v3) * (*(v4)); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (*(v4 + 1)); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (*(v4 + 2)); \ -} (void)0 -#define VECSUBFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) - *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac); \ -} (void)0 - /* some misc stuff.... */ /* avoid multiple access for supported compilers */ |