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

diff --git a/model.h b/model.h
index ad9dfeb..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
@@ -25,8 +27,10 @@ struct mdl_vert
 {
    v3f co,
        norm;
-   v4f colour;
    v2f uv;
+   u8  colour[4];
+   u16 weights[4];
+   u8  groups[4];
 };
 
 struct mdl_submesh
@@ -52,13 +56,32 @@ struct mdl_node
    v3f s;
    
    union{ u32 submesh_start, sub_uid; };
+
    u32 
        submesh_count,
        classtype,
        offset,
+       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;
@@ -68,7 +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,
+       strings_offset, entdata_offset, animdata_offset;
 };
 
 /* 
@@ -118,11 +142,36 @@ struct classtype_route_node
 
 struct classtype_route
 {
-   u32 pstr_name;
    u32 id_start;
    v3f colour;
 };
 
+struct classtype_bone
+{
+   u32 deform,
+       ik_target,
+       ik_pole,
+       collider,
+       use_limits;
+
+   v3f angle_limits[2];
+   boxf hitbox;
+};
+
+struct classtype_skeleton
+{
+   u32 channels,
+       ik_count,
+       collider_count,
+       anim_start,
+       anim_count;
+};
+
+struct classtype_skin
+{
+   u32 skeleton;
+};
+
 #pragma pack(pop)
 
 /*
@@ -135,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 )
 {
@@ -154,23 +204,42 @@ static void mesh_upload( glmesh *mesh,
    glBufferData( GL_ELEMENT_ARRAY_BUFFER, indice_count*sizeof(u32),
          indices, GL_STATIC_DRAW );
    
+   /* 0: coordinates */
    glVertexAttribPointer( 0, 3, GL_FLOAT, GL_FALSE, stride, (void*)0 );
    glEnableVertexAttribArray( 0 );
 
+   /* 1: normal */
    glVertexAttribPointer( 1, 3, GL_FLOAT, GL_FALSE, 
          stride, (void *)offsetof(mdl_vert, norm) );
    glEnableVertexAttribArray( 1 );
 
-   glVertexAttribPointer( 2, 4, GL_FLOAT, GL_FALSE, 
-         stride, (void *)offsetof(mdl_vert, colour) );
+   /* 2: uv */
+   glVertexAttribPointer( 2, 2, GL_FLOAT, GL_FALSE, 
+         stride, (void *)offsetof(mdl_vert, uv) );
    glEnableVertexAttribArray( 2 );
 
-   glVertexAttribPointer( 3, 2, GL_FLOAT, GL_FALSE, 
-         stride, (void *)offsetof(mdl_vert, uv) );
+   /* 3: colour */
+   glVertexAttribPointer( 3, 4, GL_UNSIGNED_BYTE, GL_TRUE, 
+         stride, (void *)offsetof(mdl_vert, colour) );
    glEnableVertexAttribArray( 3 );
-   
-   VG_CHECK_GL();
+
+   /* 4: weights */
+   glVertexAttribPointer( 4, 4, GL_UNSIGNED_SHORT, GL_TRUE, 
+         stride, (void *)offsetof(mdl_vert, weights) );
+   glEnableVertexAttribArray( 4 );
+
+   /* 5: groups */
+   glVertexAttribIPointer( 5, 4, GL_UNSIGNED_BYTE,
+         stride, (void *)offsetof(mdl_vert, groups) );
+   glEnableVertexAttribArray( 5 );
+
+   if( VG_CHECK_GL_ERR() )
+   {
+      return 0;
+   }
+
    mesh->indice_count = indice_count;
+   return 1;
 }
 
 static void mesh_bind( glmesh *mesh )
@@ -387,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 );
@@ -396,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;
 
@@ -420,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 )
@@ -434,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];