projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of harrygodden.com:/home/fishladder into master
[fishladder.git]
/
vg
/
vg_m.h
diff --git
a/vg/vg_m.h
b/vg/vg_m.h
index dd7f49b6d4cf7571862ee6c01df317701beda59f..6276edb814bdb23bb0b83e036698ebf4b9d9513a 100644
(file)
--- a/
vg/vg_m.h
+++ b/
vg/vg_m.h
@@
-55,11
+55,21
@@
static inline void v2i_copy( v2i a, v2i b )
b[0] = a[0]; b[1] = a[1];
}
b[0] = a[0]; b[1] = a[1];
}
+static inline int v2i_eq( v2i a, v2i b )
+{
+ return ((a[0] == b[0]) && (a[1] == b[1]));
+}
+
static inline void v2i_add( v2i a, v2i b, v2i d )
{
d[0] = a[0]+b[0]; d[1] = a[1]+b[1];
}
static inline void v2i_add( v2i a, v2i b, v2i d )
{
d[0] = a[0]+b[0]; d[1] = a[1]+b[1];
}
+static inline void v2i_sub( v2i a, v2i b, v2i d )
+{
+ d[0] = a[0]-b[0]; d[1] = a[1]-b[1];
+}
+
static inline void v2_minv( v2f a, v2f b, v2f dest )
{
dest[0] = vg_minf(a[0], b[0]);
static inline void v2_minv( v2f a, v2f b, v2f dest )
{
dest[0] = vg_minf(a[0], b[0]);
@@
-222,7
+232,7
@@
static inline void v3_normalize( v3f a )
v3_muls( a, 1.f / v3_length( a ), a );
}
v3_muls( a, 1.f / v3_length( a ), a );
}
-static inline float
csr
_lerpf( float a, float b, float t )
+static inline float
vg
_lerpf( float a, float b, float t )
{
return a + t*(b-a);
}
{
return a + t*(b-a);
}