projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor (reduction)
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_gate.c
diff --git
a/world_gate.c
b/world_gate.c
index b4760b46389d6cbd1299fbe288f85db1874a20be..b236bc9bd1f3934c2a180edc44099f73dc3c79bd 100644
(file)
--- a/
world_gate.c
+++ b/
world_gate.c
@@
-20,7
+20,7
@@
/*
* Update the transform matrices for gate
*/
/*
* Update the transform matrices for gate
*/
-
VG_STATIC
void gate_transform_update( ent_gate *gate ){
+
static
void gate_transform_update( ent_gate *gate ){
if( gate->flags & k_ent_gate_flip ){
v4f qflip;
q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
if( gate->flags & k_ent_gate_flip ){
v4f qflip;
q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
@@
-39,7
+39,7
@@
VG_STATIC void gate_transform_update( ent_gate *gate ){
m4x3_mul( recv_to_world, to_local, gate->transport );
}
m4x3_mul( recv_to_world, to_local, gate->transport );
}
-
VG_STATIC
void world_gates_init(void)
+
static
void world_gates_init(void)
{
vg_info( "world_gates_init\n" );
{
vg_info( "world_gates_init\n" );
@@
-68,7
+68,7
@@
VG_STATIC void world_gates_init(void)
mdl_close( &mgate );
}
mdl_close( &mgate );
}
-
VG_STATIC
void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
+
static
void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
m4x3_copy( gate->to_world, mmdl );
if( !(gate->flags & k_ent_gate_custom_mesh) ){
m4x3_copy( gate->to_world, mmdl );
if( !(gate->flags & k_ent_gate_custom_mesh) ){
@@
-80,7
+80,7
@@
VG_STATIC void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
/*
* Render the view through a gate
*/
/*
* Render the view through a gate
*/
-
VG_STATIC
int render_gate( world_instance *world, world_instance *world_inside,
+
static
int render_gate( world_instance *world, world_instance *world_inside,
ent_gate *gate, camera *cam, int layer_depth )
{
v3f viewdir, gatedir;
ent_gate *gate, camera *cam, int layer_depth )
{
v3f viewdir, gatedir;
@@
-203,7
+203,7
@@
VG_STATIC int render_gate( world_instance *world, world_instance *world_inside,
* Intersect the plane of a gate with a line segment, plane coordinate result
* stored in 'where'
*/
* Intersect the plane of a gate with a line segment, plane coordinate result
* stored in 'where'
*/
-
VG_STATIC
int gate_intersect_plane( ent_gate *gate,
+
static
int gate_intersect_plane( ent_gate *gate,
v3f pos, v3f last, v2f where )
{
v4f surface;
v3f pos, v3f last, v2f where )
{
v4f surface;
@@
-247,7
+247,7
@@
VG_STATIC int gate_intersect_plane( ent_gate *gate,
/*
* Intersect specific gate
*/
/*
* Intersect specific gate
*/
-
VG_STATIC
int gate_intersect( ent_gate *gate, v3f pos, v3f last )
+
static
int gate_intersect( ent_gate *gate, v3f pos, v3f last )
{
v2f xy;
{
v2f xy;
@@
-264,7
+264,7
@@
VG_STATIC int gate_intersect( ent_gate *gate, v3f pos, v3f last )
/*
* Intersect all gates in the world
*/
/*
* Intersect all gates in the world
*/
-
VG_STATIC
ent_gate *world_intersect_gates( world_instance *world,
+
static
ent_gate *world_intersect_gates( world_instance *world,
v3f pos, v3f last ){
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, i );
v3f pos, v3f last ){
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, i );
@@
-289,7
+289,7
@@
VG_STATIC ent_gate *world_intersect_gates( world_instance *world,
/*
* detatches any nonlocal gates
*/
/*
* detatches any nonlocal gates
*/
-
VG_STATIC
void world_unlink_nonlocal( world_instance *world ){
+
static
void world_unlink_nonlocal( world_instance *world ){
for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, j );
for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
ent_gate *gate = mdl_arritm( &world->ent_gate, j );
@@
-302,7
+302,7
@@
VG_STATIC void world_unlink_nonlocal( world_instance *world ){
/*
* attatches nonlocal gates, to be called from main thread ONLY!
*/
/*
* attatches nonlocal gates, to be called from main thread ONLY!
*/
-
VG_STATIC
void world_link_nonlocal_async( void *payload, u32 size ){
+
static
void world_link_nonlocal_async( void *payload, u32 size ){
world_instance *world = payload;
u32 world_id = world - world_static.instances;
world_instance *world = payload;
u32 world_id = world - world_static.instances;
@@
-368,7
+368,7
@@
VG_STATIC void world_link_nonlocal_async( void *payload, u32 size ){
}
}
}
}
-
VG_STATIC
void ent_gate_call( world_instance *world, ent_call *call ){
+
static
void ent_gate_call( world_instance *world, ent_call *call ){
u32 index = mdl_entity_id_id( call->id );
ent_gate *gate = mdl_arritm( &world->ent_gate, index );
u32 index = mdl_entity_id_id( call->id );
ent_gate *gate = mdl_arritm( &world->ent_gate, index );