projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace VG_STATIC -> static
[vg.git]
/
vg_m.h
diff --git
a/vg_m.h
b/vg_m.h
index 090c4873ed723ad90244e8786842d047fa808a32..c753be797bc9e1da62b96c29ead2e8e800f7f0b9 100644
(file)
--- a/
vg_m.h
+++ b/
vg_m.h
@@
-1589,7
+1589,7
@@
static f32 ray_plane( v4f plane, v3f co, v3f dir ){
* These closest point tests were learned from Real-Time Collision Detection by
* Christer Ericson
*/
* These closest point tests were learned from Real-Time Collision Detection by
* Christer Ericson
*/
-
VG_STATIC
f32 closest_segment_segment( v3f p1, v3f q1, v3f p2, v3f q2,
+
static
f32 closest_segment_segment( v3f p1, v3f q1, v3f p2, v3f q2,
f32 *s, f32 *t, v3f c1, v3f c2)
{
v3f d1,d2,r;
f32 *s, f32 *t, v3f c1, v3f c2)
{
v3f d1,d2,r;
@@
-1666,7
+1666,7
@@
VG_STATIC f32 closest_segment_segment( v3f p1, v3f q1, v3f p2, v3f q2,
return v3_length2( v0 );
}
return v3_length2( v0 );
}
-
VG_STATIC
int point_inside_aabb( boxf box, v3f point )
+
static
int point_inside_aabb( boxf box, v3f point )
{
if((point[0]<=box[1][0]) && (point[1]<=box[1][1]) && (point[2]<=box[1][2]) &&
(point[0]>=box[0][0]) && (point[1]>=box[0][1]) && (point[2]>=box[0][2]) )
{
if((point[0]<=box[1][0]) && (point[1]<=box[1][1]) && (point[2]<=box[1][2]) &&
(point[0]>=box[0][0]) && (point[1]>=box[0][1]) && (point[2]>=box[0][2]) )
@@
-1675,13
+1675,13
@@
VG_STATIC int point_inside_aabb( boxf box, v3f point )
return 0;
}
return 0;
}
-
VG_STATIC
void closest_point_aabb( v3f p, boxf box, v3f dest )
+
static
void closest_point_aabb( v3f p, boxf box, v3f dest )
{
v3_maxv( p, box[0], dest );
v3_minv( dest, box[1], dest );
}
{
v3_maxv( p, box[0], dest );
v3_minv( dest, box[1], dest );
}
-
VG_STATIC
void closest_point_obb( v3f p, boxf box,
+
static
void closest_point_obb( v3f p, boxf box,
m4x3f mtx, m4x3f inv_mtx, v3f dest )
{
v3f local;
m4x3f mtx, m4x3f inv_mtx, v3f dest )
{
v3f local;
@@
-1690,7
+1690,7
@@
VG_STATIC void closest_point_obb( v3f p, boxf box,
m4x3_mulv( mtx, local, dest );
}
m4x3_mulv( mtx, local, dest );
}
-
VG_STATIC
f32 closest_point_segment( v3f a, v3f b, v3f point, v3f dest )
+
static
f32 closest_point_segment( v3f a, v3f b, v3f point, v3f dest )
{
v3f v0, v1;
v3_sub( b, a, v0 );
{
v3f v0, v1;
v3_sub( b, a, v0 );
@@
-1702,7
+1702,7
@@
VG_STATIC f32 closest_point_segment( v3f a, v3f b, v3f point, v3f dest )
return t;
}
return t;
}
-
VG_STATIC
void closest_on_triangle( v3f p, v3f tri[3], v3f dest )
+
static
void closest_on_triangle( v3f p, v3f tri[3], v3f dest )
{
v3f ab, ac, ap;
f32 d1, d2;
{
v3f ab, ac, ap;
f32 d1, d2;
@@
-1798,7
+1798,7
@@
enum contact_type
k_contact_type_edge
};
k_contact_type_edge
};
-
VG_STATIC
enum contact_type closest_on_triangle_1( v3f p, v3f tri[3], v3f dest )
+
static
enum contact_type closest_on_triangle_1( v3f p, v3f tri[3], v3f dest )
{
v3f ab, ac, ap;
f32 d1, d2;
{
v3f ab, ac, ap;
f32 d1, d2;