projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add jumping
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skeleton.h
diff --git
a/skeleton.h
b/skeleton.h
index d74e6608d0129f796f0eaf0a5a23021046d9dc38..78a0b5604d5fd0facb8b903ece0631d5fcf35a15 100644
(file)
--- a/
skeleton.h
+++ b/
skeleton.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C)
Mount0
Software, Harry Godden - All Rights Reserved
+ * Copyright (C)
2021-2022 Mt.ZERO
Software, Harry Godden - All Rights Reserved
*/
#ifndef SKELETON_H
*/
#ifndef SKELETON_H
@@
-416,8
+416,8
@@
static int skeleton_setup( struct skeleton *skele, mdl_header *mdl )
skele->bone_count = inf->channels;
skele->ik_count = inf->ik_count;
skele->collider_count = inf->collider_count;
skele->bone_count = inf->channels;
skele->ik_count = inf->ik_count;
skele->collider_count = inf->collider_count;
- skele->bones =
m
alloc(sizeof(struct skeleton_bone)*skele->bone_count);
- skele->ik =
m
alloc(sizeof(struct skeleton_ik)*skele->ik_count);
+ skele->bones =
vg_
alloc(sizeof(struct skeleton_bone)*skele->bone_count);
+ skele->ik =
vg_
alloc(sizeof(struct skeleton_ik)*skele->ik_count);
skeleton_root = i;
}
else if( skele->bone_count )
skeleton_root = i;
}
else if( skele->bone_count )
@@
-522,9
+522,9
@@
static int skeleton_setup( struct skeleton *skele, mdl_header *mdl )
skele->bones[0].parent = 0xffffffff;
skele->bones[0].collider = 0;
skele->bones[0].parent = 0xffffffff;
skele->bones[0].collider = 0;
- skele->final_mtx =
m
alloc( sizeof(m4x3f) * skele->bone_count );
+ skele->final_mtx =
vg_
alloc( sizeof(m4x3f) * skele->bone_count );
skele->anim_count = inf->anim_count;
skele->anim_count = inf->anim_count;
- skele->anims =
m
alloc( sizeof(struct skeleton_anim) * inf->anim_count);
+ skele->anims =
vg_
alloc( sizeof(struct skeleton_anim) * inf->anim_count);
for( int i=0; i<inf->anim_count; i++ )
{
for( int i=0; i<inf->anim_count; i++ )
{
@@
-533,11
+533,11
@@
static int skeleton_setup( struct skeleton *skele, mdl_header *mdl )
skele->anims[i].rate = anim->rate;
skele->anims[i].length = anim->length;
skele->anims[i].rate = anim->rate;
skele->anims[i].length = anim->length;
- strncpy( skele->anims[i].name, mdl_pstr(mdl, anim->pstr_name), 3
2
);
+ strncpy( skele->anims[i].name, mdl_pstr(mdl, anim->pstr_name), 3
1
);
u32 total_keyframes = (skele->bone_count-1)*anim->length;
size_t block_size = sizeof(mdl_keyframe) * total_keyframes;
u32 total_keyframes = (skele->bone_count-1)*anim->length;
size_t block_size = sizeof(mdl_keyframe) * total_keyframes;
- mdl_keyframe *dst =
m
alloc( block_size );
+ mdl_keyframe *dst =
vg_
alloc( block_size );
skele->anims[i].anim_data = dst;
memcpy( dst, mdl_get_animdata( mdl, anim ), block_size );
skele->anims[i].anim_data = dst;
memcpy( dst, mdl_get_animdata( mdl, anim ), block_size );
@@
-549,8
+549,8
@@
static int skeleton_setup( struct skeleton *skele, mdl_header *mdl )
return 1;
error_dealloc:
return 1;
error_dealloc:
- free( skele->bones );
- free( skele->ik );
+
vg_
free( skele->bones );
+
vg_
free( skele->ik );
return 0;
}
return 0;
}