luc/sweet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delete duplication of vec_new in header

Browse Source
This commit is contained in:
Luc 2018-04-24 13:40:40 +02:00
parent 3eedcceb09
commit 0e24b6b03f
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sweet_math_short.c
View File

@ -1,13 +1,5 @@
#include "sweet_math.h" #include "sweet_math.h"
vec2 vec2_new_2f(float x, float y)
{
vec2 v;
v.x = x;
v.y = y;
return v;
}
vec2 vec2_new_v3(vec3 w) vec2 vec2_new_v3(vec3 w)
{ {
vec2 v; vec2 v;
@ -16,15 +8,6 @@ vec2 vec2_new_v3(vec3 w)
return v; return v;
} }
vec3 vec3_new_3f(float x, float y, float z)
{
vec3 v;
v.x = x;
v.y = y;
v.z = z;
return v;
}
vec3 vec3_new_v2_1f(vec2 w, float z) vec3 vec3_new_v2_1f(vec2 w, float z)
{ {
vec3 v; vec3 v;
@ -43,16 +26,6 @@ vec3 vec3_new_v4(vec4 w)
return v; return v;
} }
vec4 vec4_new_4f(float x, float y, float z, float w)
{
vec4 v;
v.x = x;
v.y = y;
v.z = z;
v.w = w;
return v;
}
vec4 vec4_new_v2_2f(vec2 u, float z, float w) vec4 vec4_new_v2_2f(vec2 u, float z, float w)
{ {
vec4 v; vec4 v;

12
sweet_math_short.h
View File

@ -25,16 +25,13 @@
#define VEC3_BUILDER(_1, _2, _3, NAME, ...) NAME #define VEC3_BUILDER(_1, _2, _3, NAME, ...) NAME
#define VEC4_BUILDER(_1, _2, _3, _4, NAME, ...) NAME #define VEC4_BUILDER(_1, _2, _3, _4, NAME, ...) NAME
#define vec2_new(...) VEC2_BUILDER(__VA_ARGS__, vec2_new_2f, vec2_new_v3)(__VA_ARGS__) #define vec2_new(...) VEC2_BUILDER(__VA_ARGS__, sweet_vector_new2, vec2_new_v3)(__VA_ARGS__)
#define vec3_new(...) VEC3_BUILDER(__VA_ARGS__, vec3_new_3f, vec3_new_v2_1f, vec3_new_v4)(__VA_ARGS__) #define vec3_new(...) VEC3_BUILDER(__VA_ARGS__, sweet_vector_new3, vec3_new_v2_1f, vec3_new_v4)(__VA_ARGS__)
#define vec4_new(...) VEC4_BUILDER(__VA_ARGS__, vec4_new_4f, vec4_new_v2_2f, vec4_new_v3_1f, vec4_new_v4)(__VA_ARGS__) #define vec4_new(...) VEC4_BUILDER(__VA_ARGS__, sweet_vector_new4, vec4_new_v2_2f, vec4_new_v3_1f, vec4_new_v4)(__VA_ARGS__)
vec2 vec2_new_2f(float x, float y);
vec2 vec2_new_v3(vec3 w); vec2 vec2_new_v3(vec3 w);
vec3 vec3_new_3f(float x, float y, float z);
vec3 vec3_new_v2_1f(vec2 w, float z); vec3 vec3_new_v2_1f(vec2 w, float z);
vec3 vec3_new_v4(vec4 w); vec3 vec3_new_v4(vec4 w);
vec4 vec4_new_4f(float x, float y, float z, float w);
vec4 vec4_new_v2_2f(vec2 u, float z, float w); vec4 vec4_new_v2_2f(vec2 u, float z, float w);
vec4 vec4_new_v3_1f(vec3 u, float w); vec4 vec4_new_v3_1f(vec3 u, float w);
vec4 vec4_new_v4 (vec4 v); vec4 vec4_new_v4 (vec4 v);
@ -50,9 +47,6 @@ vec4 vec4_new_v4 (vec4 v);
#define nearest sweet_math_nearest #define nearest sweet_math_nearest
#define quadratic_polynomial sweet_math_quadratic_polynomial #define quadratic_polynomial sweet_math_quadratic_polynomial
#define cubic_polynomial sweet_math_cubic_polynomial #define cubic_polynomial sweet_math_cubic_polynomial
#define vec2_new sweet_vector_new2
#define vec3_new sweet_vector_new3
#define vec4_new sweet_vector_new4
#define vec2_norm sweet_vector_norm2 #define vec2_norm sweet_vector_norm2
#define vec3_norm sweet_vector_norm3 #define vec3_norm sweet_vector_norm3
#define vec4_norm sweet_vector_norm4 #define vec4_norm sweet_vector_norm4