projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
medium sized dollop
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_model.h
diff --git
a/player_model.h
b/player_model.h
index a2379fca6e3db158655a83e2bd53de5663afd2b5..e0693b16433aad19987cf4b81ade116c0d6269e4 100644
(file)
--- a/
player_model.h
+++ b/
player_model.h
@@
-11,17
+11,25
@@
vg_tex2d tex_characters = { .path = "textures/ch_gradient.qoi" };
vg_tex2d tex_characters = { .path = "textures/ch_gradient.qoi" };
-static
void player_model_register
(void)
+static
int player_model_init
(void)
{
shader_viewchar_register();
{
shader_viewchar_register();
+
+ if( vg_acquire_thread_sync(1) )
+ {
+ vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 );
+ vg_release_thread_sync(1);
+ return 1;
+ }
+ else
+ return 0;
}
}
-static void player_model_
init(void
)
+static void player_model_
free(void *_
)
{
{
- vg_tex2d_
init
( (vg_tex2d *[]){ &tex_characters }, 1 );
+ vg_tex2d_
free
( (vg_tex2d *[]){ &tex_characters }, 1 );
}
}
-
/*
* Load model from file (.mdl)
*/
/*
* Load model from file (.mdl)
*/
@@
-37,7
+45,9
@@
static int player_load_model( const char *name )
struct player_model *mdl = &player.mdl;
struct player_model *mdl = &player.mdl;
- mdl_unpack_glmesh( src, &mdl->mesh );
+ if( !mdl_unpack_glmesh( src, &mdl->mesh ) )
+ goto il_free_err;
+
skeleton_setup( &mdl->sk, src );
/*
skeleton_setup( &mdl->sk, src );
/*