From 028bb38ec5deeb086858ad50b168a27fb160502f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 16 Sep 2016 17:45:41 +0200 Subject: [PATCH] Add vector_4 --- libretro-common/gfx/math/vector_2.c | 21 +++++-- libretro-common/gfx/math/vector_3.c | 32 +++++++---- libretro-common/gfx/math/vector_4.c | 62 +++++++++++++++++++++ libretro-common/include/gfx/math/vector_4.h | 39 +++++++++++++ 4 files changed, 136 insertions(+), 18 deletions(-) create mode 100644 libretro-common/gfx/math/vector_4.c create mode 100644 libretro-common/include/gfx/math/vector_4.h diff --git a/libretro-common/gfx/math/vector_2.c b/libretro-common/gfx/math/vector_2.c index 6719fac93a..b7745e456e 100644 --- a/libretro-common/gfx/math/vector_2.c +++ b/libretro-common/gfx/math/vector_2.c @@ -37,18 +37,27 @@ float vec2_cross(const float *a, const float *b) void vec2_add(float *dst, const float *src) { - dst[0] += src[0]; - dst[1] += src[1]; + unsigned i; + unsigned n = 2; + + for (i = 0; i < n; i++) + dst[i] += src[i]; } void vec2_subtract(float *dst, const float *src) { - dst[0] -= src[0]; - dst[1] -= src[1]; + unsigned i; + unsigned n = 2; + + for (i = 0; i < n; i++) + dst[i] -= src[i]; } void vec2_copy(float *dst, const float *src) { - dst[0] = src[0]; - dst[1] = src[1]; + unsigned i; + unsigned n = 2; + + for (i = 0; i < n; i++) + dst[i] = src[i]; } diff --git a/libretro-common/gfx/math/vector_3.c b/libretro-common/gfx/math/vector_3.c index 1ec04acab7..4f76dde269 100644 --- a/libretro-common/gfx/math/vector_3.c +++ b/libretro-common/gfx/math/vector_3.c @@ -46,30 +46,38 @@ float vec3_length(const float *a) void vec3_add(float *dst, const float *src) { - dst[0] += src[0]; - dst[1] += src[1]; - dst[2] += src[2]; + unsigned i; + unsigned n = 3; + + for (i = 0; i < n; i++) + dst[i] += src[i]; } void vec3_subtract(float *dst, const float *src) { - dst[0] -= src[0]; - dst[1] -= src[1]; - dst[2] -= src[2]; + unsigned i; + unsigned n = 3; + + for (i = 0; i < n; i++) + dst[i] -= src[i]; } void vec3_scale(float *dst, const float scale) { - dst[0] *= scale; - dst[1] *= scale; - dst[2] *= scale; + unsigned i; + unsigned n = 3; + + for (i = 0; i < n; i++) + dst[i] *= scale; } void vec3_copy(float *dst, const float *src) { - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; + unsigned i; + unsigned n = 3; + + for (i = 0; i < n; i++) + dst[i] = src[i]; } void vec3_normalize(float *dst) diff --git a/libretro-common/gfx/math/vector_4.c b/libretro-common/gfx/math/vector_4.c new file mode 100644 index 0000000000..0c2d4d5fcf --- /dev/null +++ b/libretro-common/gfx/math/vector_4.c @@ -0,0 +1,62 @@ +/* Copyright (C) 2010-2016 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (vector_4.c). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +#include + +void vec4_add(float *dst, const float *src) +{ + unsigned i; + unsigned n = 4; + + for (i = 0; i < n; i++) + dst[i] += src[i]; +} + +void vec4_subtract(float *dst, const float *src) +{ + unsigned i; + unsigned n = 4; + + for (i = 0; i < n; i++) + dst[i] -= src[i]; +} + +void vec4_scale(float *dst, const float scale) +{ + unsigned i; + unsigned n = 4; + + for (i = 0; i < n; i++) + dst[i] *= scale; +} + +void vec4_copy(float *dst, const float *src) +{ + unsigned i; + unsigned n = 4; + + for (i = 0; i < n; i++) + dst[i] = src[i]; +} diff --git a/libretro-common/include/gfx/math/vector_4.h b/libretro-common/include/gfx/math/vector_4.h new file mode 100644 index 0000000000..494d8dcebd --- /dev/null +++ b/libretro-common/include/gfx/math/vector_4.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2010-2016 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (vector_4.h). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __LIBRETRO_SDK_GFX_MATH_VECTOR_4_H__ +#define __LIBRETRO_SDK_GFX_MATH_VECTOR_4_H__ + +#include + +typedef float vec4_t[4]; + +void vec4_add(float *dst, const float *src); + +void vec4_subtract(float *dst, const float *src); + +void vec4_scale(float *dst, const float scale); + +void vec4_copy(float *dst, const float *src); + +#endif +