projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix segfault
[carveJwlIkooP6JGAAIwe30JlM.git]
/
scene.h
diff --git
a/scene.h
b/scene.h
index b54587aadf1a1064019bedf7882fd0140eb6b4f7..f448bbc2f8b719c5dd0651d0632408f758df874b 100644
(file)
--- a/
scene.h
+++ b/
scene.h
@@
-41,7
+41,7
@@
struct scene_context
mdl_submesh submesh;
};
mdl_submesh submesh;
};
-
VG_STATIC
u32 scene_mem_required( scene_context *ctx )
+
static
u32 scene_mem_required( scene_context *ctx )
{
u32 vertex_length = vg_align8(ctx->max_vertices * sizeof(scene_vert)),
index_length = vg_align8(ctx->max_indices * sizeof(u32));
{
u32 vertex_length = vg_align8(ctx->max_vertices * sizeof(scene_vert)),
index_length = vg_align8(ctx->max_indices * sizeof(u32));
@@
-49,7
+49,7
@@
VG_STATIC u32 scene_mem_required( scene_context *ctx )
return vertex_length + index_length;
}
return vertex_length + index_length;
}
-VG_STATIC
+static
void scene_init( scene_context *ctx, u32 max_vertices, u32 max_indices )
{
ctx->vertex_count = 0;
void scene_init( scene_context *ctx, u32 max_vertices, u32 max_indices )
{
ctx->vertex_count = 0;
@@
-73,7
+73,7
@@
void scene_supply_buffer( scene_context *ctx, void *buffer )
ctx->arrindices = (u32*)(((u8*)buffer) + vertex_length);
}
ctx->arrindices = (u32*)(((u8*)buffer) + vertex_length);
}
-
VG_STATIC
void scene_vert_pack_norm( scene_vert *vert, v3f norm )
+
static
void scene_vert_pack_norm( scene_vert *vert, v3f norm )
{
v3f n;
v3_muls( norm, 127.0f, n );
{
v3f n;
v3_muls( norm, 127.0f, n );
@@
-88,7
+88,7
@@
VG_STATIC void scene_vert_pack_norm( scene_vert *vert, v3f norm )
/*
* Append a model into the scene with a given transform
*/
/*
* Append a model into the scene with a given transform
*/
-
VG_STATIC
void scene_add_mdl_submesh( scene_context *ctx, mdl_context *mdl,
+
static
void scene_add_mdl_submesh( scene_context *ctx, mdl_context *mdl,
mdl_submesh *sm, m4x3f transform )
{
if( ctx->vertex_count + sm->vertex_count > ctx->max_vertices ){
mdl_submesh *sm, m4x3f transform )
{
if( ctx->vertex_count + sm->vertex_count > ctx->max_vertices ){
@@
-166,7
+166,7
@@
VG_STATIC void scene_add_mdl_submesh( scene_context *ctx, mdl_context *mdl,
/*
* One by one adders for simplified access (mostly procedural stuff)
*/
/*
* One by one adders for simplified access (mostly procedural stuff)
*/
-
VG_STATIC
void scene_push_tri( scene_context *ctx, u32 tri[3] )
+
static
void scene_push_tri( scene_context *ctx, u32 tri[3] )
{
if( ctx->indice_count + 3 > ctx->max_indices )
vg_fatal_error( "Scene indice buffer overflow (%u exceeds %u)\n",
{
if( ctx->indice_count + 3 > ctx->max_indices )
vg_fatal_error( "Scene indice buffer overflow (%u exceeds %u)\n",
@@
-181,7
+181,7
@@
VG_STATIC void scene_push_tri( scene_context *ctx, u32 tri[3] )
ctx->indice_count += 3;
}
ctx->indice_count += 3;
}
-
VG_STATIC
void scene_push_vert( scene_context *ctx, scene_vert *v )
+
static
void scene_push_vert( scene_context *ctx, scene_vert *v )
{
if( ctx->vertex_count + 1 > ctx->max_vertices )
vg_fatal_error( "Scene vertex buffer overflow (%u exceeds %u)\n",
{
if( ctx->vertex_count + 1 > ctx->max_vertices )
vg_fatal_error( "Scene vertex buffer overflow (%u exceeds %u)\n",
@@
-193,7
+193,7
@@
VG_STATIC void scene_push_vert( scene_context *ctx, scene_vert *v )
ctx->vertex_count ++;
}
ctx->vertex_count ++;
}
-
VG_STATIC
void scene_copy_slice( scene_context *ctx, mdl_submesh *sm )
+
static
void scene_copy_slice( scene_context *ctx, mdl_submesh *sm )
{
sm->indice_start = ctx->submesh.indice_start;
sm->indice_count = ctx->indice_count - sm->indice_start;
{
sm->indice_start = ctx->submesh.indice_start;
sm->indice_count = ctx->indice_count - sm->indice_start;
@@
-205,7
+205,7
@@
VG_STATIC void scene_copy_slice( scene_context *ctx, mdl_submesh *sm )
ctx->submesh.vertex_start = ctx->vertex_count;
}
ctx->submesh.vertex_start = ctx->vertex_count;
}
-
VG_STATIC
void scene_set_vertex_flags( scene_context *ctx,
+
static
void scene_set_vertex_flags( scene_context *ctx,
u32 start, u32 count, u16 flags ){
for( u32 i=0; i<count; i++ )
ctx->arrvertices[ start + i ].flags = flags;
u32 start, u32 count, u16 flags ){
for( u32 i=0; i<count; i++ )
ctx->arrvertices[ start + i ].flags = flags;
@@
-216,7
+216,7
@@
struct scene_upload_info{
glmesh *mesh;
};
glmesh *mesh;
};
-
VG_STATIC
void async_scene_upload( void *payload, u32 size )
+
static
void async_scene_upload( void *payload, u32 size )
{
struct scene_upload_info *info = payload;
{
struct scene_upload_info *info = payload;
@@
-265,7
+265,7
@@
VG_STATIC void async_scene_upload( void *payload, u32 size )
vg_info( " verts:%u\n", ctx->vertex_count );
}
vg_info( " verts:%u\n", ctx->vertex_count );
}
-
VG_STATIC
void scene_upload_async( scene_context *ctx, glmesh *mesh )
+
static
void scene_upload_async( scene_context *ctx, glmesh *mesh )
{
vg_async_item *call = vg_async_alloc( sizeof(struct scene_upload_info) );
{
vg_async_item *call = vg_async_alloc( sizeof(struct scene_upload_info) );
@@
-276,7
+276,7
@@
VG_STATIC void scene_upload_async( scene_context *ctx, glmesh *mesh )
vg_async_dispatch( call, async_scene_upload );
}
vg_async_dispatch( call, async_scene_upload );
}
-VG_STATIC
+static
vg_async_item *scene_alloc_async( scene_context *scene, glmesh *mesh,
u32 max_vertices, u32 max_indices )
{
vg_async_item *scene_alloc_async( scene_context *scene, glmesh *mesh,
u32 max_vertices, u32 max_indices )
{
@@
-302,7
+302,7
@@
vg_async_item *scene_alloc_async( scene_context *scene, glmesh *mesh,
* BVH implementation
*/
* BVH implementation
*/
-
VG_STATIC
void scene_bh_expand_bound( void *user, boxf bound, u32 item_index )
+
static
void scene_bh_expand_bound( void *user, boxf bound, u32 item_index )
{
scene_context *s = user;
scene_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
{
scene_context *s = user;
scene_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
@@
-314,7
+314,7
@@
VG_STATIC void scene_bh_expand_bound( void *user, boxf bound, u32 item_index )
box_addpt( bound, pc->co );
}
box_addpt( bound, pc->co );
}
-
VG_STATIC
float scene_bh_centroid( void *user, u32 item_index, int axis )
+
static
float scene_bh_centroid( void *user, u32 item_index, int axis )
{
scene_context *s = user;
scene_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
{
scene_context *s = user;
scene_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
@@
-337,7
+337,7
@@
VG_STATIC float scene_bh_centroid( void *user, u32 item_index, int axis )
#endif
}
#endif
}
-
VG_STATIC
void scene_bh_swap( void *user, u32 ia, u32 ib )
+
static
void scene_bh_swap( void *user, u32 ia, u32 ib )
{
scene_context *s = user;
{
scene_context *s = user;
@@
-358,7
+358,7
@@
VG_STATIC void scene_bh_swap( void *user, u32 ia, u32 ib )
tj[2] = temp[2];
}
tj[2] = temp[2];
}
-
VG_STATIC
void scene_bh_debug( void *user, u32 item_index )
+
static
void scene_bh_debug( void *user, u32 item_index )
{
scene_context *s = user;
u32 idx = item_index*3;
{
scene_context *s = user;
u32 idx = item_index*3;
@@
-371,7
+371,7
@@
VG_STATIC void scene_bh_debug( void *user, u32 item_index )
vg_line( pc->co, pa->co, 0xff0000ff );
}
vg_line( pc->co, pa->co, 0xff0000ff );
}
-
VG_STATIC
void scene_bh_closest( void *user, u32 index, v3f point, v3f closest )
+
static
void scene_bh_closest( void *user, u32 index, v3f point, v3f closest )
{
scene_context *s = user;
{
scene_context *s = user;
@@
-383,7
+383,7
@@
VG_STATIC void scene_bh_closest( void *user, u32 index, v3f point, v3f closest )
closest_on_triangle_1( point, positions, closest );
}
closest_on_triangle_1( point, positions, closest );
}
-
VG_STATIC
bh_system bh_system_scene =
+
static
bh_system bh_system_scene =
{
.expand_bound = scene_bh_expand_bound,
.item_centroid = scene_bh_centroid,
{
.expand_bound = scene_bh_expand_bound,
.item_centroid = scene_bh_centroid,
@@
-395,7
+395,7
@@
VG_STATIC bh_system bh_system_scene =
/*
* An extra step is added onto the end to calculate the hit normal
*/
/*
* An extra step is added onto the end to calculate the hit normal
*/
-
VG_STATIC
int scene_raycast( scene_context *s, bh_tree *bh,
+
static
int scene_raycast( scene_context *s, bh_tree *bh,
v3f co, v3f dir, ray_hit *hit, u16 ignore )
{
hit->tri = NULL;
v3f co, v3f dir, ray_hit *hit, u16 ignore )
{
hit->tri = NULL;
@@
-439,7
+439,7
@@
VG_STATIC int scene_raycast( scene_context *s, bh_tree *bh,
return hit->tri?1:0;
}
return hit->tri?1:0;
}
-
VG_STATIC
bh_tree *scene_bh_create( void *lin_alloc, scene_context *s )
+
static
bh_tree *scene_bh_create( void *lin_alloc, scene_context *s )
{
u32 triangle_count = s->indice_count / 3;
return bh_create( lin_alloc, &bh_system_scene, s, triangle_count, 2 );
{
u32 triangle_count = s->indice_count / 3;
return bh_create( lin_alloc, &bh_system_scene, s, triangle_count, 2 );