X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=model.h;h=59b75beeb797e89aab8356eeedc5002cc77fa079;hb=c2d67378dd5c82de50b8fbbbe222ec6be2da4eee;hp=21a4e2fe2e75a4a8917d4f6af09aee44574419f4;hpb=d045af680c6b8ca267a7aded69e2e510e659d2ab;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/model.h b/model.h
index 21a4e2f..59b75be 100644
--- a/model.h
+++ b/model.h
@@ -10,6 +10,8 @@ typedef struct mdl_submesh mdl_submesh;
 typedef struct mdl_material mdl_material;
 typedef struct mdl_node mdl_node;
 typedef struct mdl_header mdl_header;
+typedef struct mdl_animation mdl_animation;
+typedef struct mdl_keyframe mdl_keyframe;
 
 #define MDL_SIZE_MAX          0x1000000
 #define MDL_VERT_MAX          1000000
@@ -59,10 +61,27 @@ struct mdl_node
        submesh_count,
        classtype,
        offset,
-       children,
+       parent,
        pstr_name;
 };
 
+struct mdl_keyframe
+{
+   v3f co;
+   v4f q;
+   v3f s;
+};
+
+struct mdl_animation
+{
+   u32 pstr_name,
+       length;
+
+   float rate;
+
+   u32 offset;
+};
+
 struct mdl_header
 {
    u32 identifier, version, file_length;
@@ -72,8 +91,8 @@ struct mdl_header
        submesh_count, submesh_offset,
        material_count, material_offset,
        node_count, node_offset,
-       strings_offset, entdata_offset,
-       anim_count, anim_offset;
+       anim_count, anim_offset,
+       strings_offset, entdata_offset, animdata_offset;
 };
 
 /* 
@@ -123,19 +142,28 @@ struct classtype_route_node
 
 struct classtype_route
 {
-   u32 pstr_name;
    u32 id_start;
    v3f colour;
 };
 
 struct classtype_bone
 {
-   u32 deform;
+   u32 deform,
+       ik_target,
+       ik_pole,
+       collider,
+       use_limits;
+
+   v3f angle_limits[2];
+   boxf hitbox;
 };
 
 struct classtype_skeleton
 {
-   u32 anim_start,
+   u32 channels,
+       ik_count,
+       collider_count,
+       anim_start,
        anim_count;
 };
 
@@ -156,7 +184,8 @@ struct glmesh
    u32 indice_count;
 };
 
-static void mesh_upload( glmesh *mesh,
+__attribute__((warn_unused_result))
+static int mesh_upload( glmesh *mesh,
       mdl_vert *verts, u32 vert_count,
       u32 *indices, u32 indice_count )
 {
@@ -204,9 +233,13 @@ static void mesh_upload( glmesh *mesh,
          stride, (void *)offsetof(mdl_vert, groups) );
    glEnableVertexAttribArray( 5 );
 
-   
-   VG_CHECK_GL();
+   if( VG_CHECK_GL_ERR() )
+   {
+      return 0;
+   }
+
    mesh->indice_count = indice_count;
+   return 1;
 }
 
 static void mesh_bind( glmesh *mesh )
@@ -423,6 +456,11 @@ static mdl_material *mdl_material_from_id( mdl_header *mdl, u32 id )
    return ((mdl_material *)mdl_baseptr(mdl,mdl->material_offset)) + id;
 }
 
+static mdl_animation *mdl_animation_from_id( mdl_header *mdl, u32 id )
+{
+   return ((mdl_animation *)mdl_baseptr(mdl,mdl->anim_offset)) + id;
+}
+
 static void mdl_node_transform( mdl_node *pnode, m4x3f transform )
 {
    q_m3x3( pnode->q, transform );
@@ -432,13 +470,15 @@ static void mdl_node_transform( mdl_node *pnode, m4x3f transform )
    v3_copy( pnode->co, transform[3] );
 }
 
-static void mdl_unpack_submesh( mdl_header *mdl, glmesh *mesh, mdl_submesh *sm )
+__attribute__((warn_unused_result))
+static int mdl_unpack_submesh( mdl_header *mdl, glmesh *mesh, mdl_submesh *sm )
 {
-   mesh_upload( mesh, mdl_submesh_vertices( mdl, sm ), sm->vertex_count,
-                      mdl_submesh_indices( mdl, sm ), sm->indice_count );
+   return mesh_upload( mesh, mdl_submesh_vertices( mdl, sm ), sm->vertex_count,
+                             mdl_submesh_indices( mdl, sm ), sm->indice_count );
 }
 
-static void mdl_unpack_glmesh( mdl_header *mdl, glmesh *mesh )
+__attribute__((warn_unused_result))
+static int mdl_unpack_glmesh( mdl_header *mdl, glmesh *mesh )
 {
    u32 offset = mdl_submesh_from_id( mdl, 0 )->vertex_count;
 
@@ -456,8 +496,8 @@ static void mdl_unpack_glmesh( mdl_header *mdl, glmesh *mesh )
    mdl_vert *vertex_base = mdl_baseptr( mdl, mdl->vertex_offset );
    u32 *indice_base = mdl_baseptr( mdl, mdl->indice_offset );
 
-   mesh_upload( mesh, vertex_base, mdl->vertex_count,
-                      indice_base, mdl->indice_count ); 
+   return mesh_upload( mesh, vertex_base, mdl->vertex_count,
+                       indice_base, mdl->indice_count ); 
 }
 
 static void mdl_draw_submesh( mdl_submesh *sm )
@@ -470,6 +510,11 @@ static void *mdl_get_entdata( mdl_header *mdl, mdl_node *pnode )
    return mdl_baseptr( mdl, mdl->entdata_offset ) + pnode->offset;
 }
 
+static mdl_keyframe *mdl_get_animdata( mdl_header *mdl, mdl_animation *anim )
+{
+   return mdl_baseptr( mdl, mdl->animdata_offset ) + anim->offset;
+}
+
 static void mdl_link_materials( mdl_header *root, mdl_header *child )
 {
    u32 lookup[MDL_MATERIAL_MAX];