X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_model.h;h=cab438e9d7c24afebffb36045a8486e0d5c441c1;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=a2379fca6e3db158655a83e2bd53de5663afd2b5;hpb=2ca677a0ec9d00db46a8b97bec30dbea8280a79b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_model.h b/player_model.h
index a2379fc..cab438e 100644
--- a/player_model.h
+++ b/player_model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 (C) Mount0 Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
 #ifndef CHARACTER_H 
@@ -11,34 +11,51 @@
 
 vg_tex2d tex_characters = { .path = "textures/ch_gradient.qoi" };
 
-static void player_model_register(void)
+VG_STATIC void player_model_init(void)
 {
    shader_viewchar_register();
-}
-
-static void player_model_init(void)
-{
-   vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 );
-}
-
-
-/*
- * Load model from file (.mdl)
- */
-static int player_load_model( const char *name )
-{
-   char buf[64];
+   vg_acquire_thread_sync();
+   {
+      vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 );
+   }
+   vg_release_thread_sync();
 
-   snprintf( buf, sizeof(buf)-1, "models/%s.mdl", name );
-   mdl_header *src = mdl_load( buf );
+   /* load in reference player model, with animations and such */
+   mdl_open( &player.mdl.meta, "models/ch_new.mdl" );
+   mdl_load_metadata( &player.mdl.meta, vg_mem.rtmemory );
+   mdl_load_anim_data( &player.mdl.meta, vg_mem.rtmemory );
 
-   if( !src )
-      return 0;
+   vg_linear_clear( vg_mem.scratch );
+   mdl_load_mesh_data( &player.mdl.meta, vg_mem.scratch );
+   mdl_close( &player.mdl.meta );
 
-   struct player_model *mdl = &player.mdl;
+   /* 
+    * load in other player models. This may need to be more sophisticated in
+    * the futre if we have more of these guys
+    */
+   mdl_context ctx_outlaw,
+               ctx_jordan;
+
+   mdl_open( &ctx_outlaw, "models/ch_outlaw.mdl" );
+   mdl_load_metadata( &ctx_outlaw, vg_mem.scratch );
+   mdl_load_mesh_data( &ctx_outlaw, vg_mem.scratch );
+   mdl_close( &ctx_outlaw );
+
+   mdl_open( &ctx_jordan, "models/ch_jordan.mdl" );
+   mdl_load_metadata( &ctx_jordan, vg_mem.scratch );
+   mdl_load_mesh_data( &ctx_jordan, vg_mem.scratch );
+   mdl_close( &ctx_jordan );
    
-   mdl_unpack_glmesh( src, &mdl->mesh );
-   skeleton_setup( &mdl->sk, src );
+   vg_acquire_thread_sync();
+   {
+      mdl_unpack_glmesh( &player.mdl.meta, &player.mdl.player_meshes[0] );
+      mdl_unpack_glmesh( &ctx_outlaw, &player.mdl.player_meshes[1] );
+      mdl_unpack_glmesh( &ctx_jordan, &player.mdl.player_meshes[2] );
+   }
+   vg_release_thread_sync();
+
+   skeleton_setup( &player.mdl.sk, vg_mem.rtmemory, &player.mdl.meta );
+   player_init_ragdoll();
 
    /* 
     * Link animations
@@ -49,29 +66,29 @@ static int player_load_model( const char *name )
       struct skeleton_anim **anim;
    }
    anims[] = {
-      { "pose_stand",   &mdl->anim_stand },
-      { "pose_highg",   &mdl->anim_highg },
-      { "pose_slide",   &mdl->anim_slide },
-      { "pose_air",     &mdl->anim_air   },
-      { "push",         &mdl->anim_push  },
-      { "push_reverse", &mdl->anim_push_reverse },
-      { "ollie",        &mdl->anim_ollie },
-      { "ollie_reverse",&mdl->anim_ollie_reverse },
-      { "grabs",        &mdl->anim_grabs },
-      { "walk",         &mdl->anim_walk  },
-      { "run",          &mdl->anim_run   },
-      { "idle_cycle",   &mdl->anim_idle  }
+      { "pose_stand",   &player.mdl.anim_stand },
+      { "pose_highg",   &player.mdl.anim_highg },
+      { "pose_slide",   &player.mdl.anim_slide },
+      { "pose_air",     &player.mdl.anim_air   },
+      { "push",         &player.mdl.anim_push  },
+      { "push_reverse", &player.mdl.anim_push_reverse },
+      { "ollie",        &player.mdl.anim_ollie },
+      { "ollie_reverse",&player.mdl.anim_ollie_reverse },
+      { "grabs",        &player.mdl.anim_grabs },
+      { "walk",         &player.mdl.anim_walk  },
+      { "run",          &player.mdl.anim_run   },
+      { "idle_cycle",   &player.mdl.anim_idle  },
+      { "jump",         &player.mdl.anim_jump  }
    };
    
    for( int i=0; i<vg_list_size(anims); i++ )
    {
-      *anims[i].anim = skeleton_get_anim( &mdl->sk, anims[i].name );
+      *anims[i].anim = skeleton_get_anim( &player.mdl.sk, anims[i].name );
       
       if( !(*anims[i].anim) )
       {
-         vg_error( "Animation '%s' is missing from character '%s'\n",
-                     anims[i].name, name );
-         goto il_free_err;
+         vg_error( "Animation '%s' is missing\n", anims[i].name );
+         vg_fatal_exit_loop( "Invalid character file" );
       }
    }
 
@@ -84,33 +101,24 @@ static int player_load_model( const char *name )
       u32 *bone_id;
    }
    bones[] = {
-      { "hips",      &mdl->id_hip },
-      { "hand.IK.L", &mdl->id_ik_hand_l },
-      { "hand.IK.R", &mdl->id_ik_hand_r },
-      { "elbow.L",   &mdl->id_ik_elbow_l },
-      { "elbow.R",   &mdl->id_ik_elbow_r },
-      { "head",      &mdl->id_head }
+      { "hips",      &player.mdl.id_hip },
+      { "hand.IK.L", &player.mdl.id_ik_hand_l },
+      { "hand.IK.R", &player.mdl.id_ik_hand_r },
+      { "elbow.L",   &player.mdl.id_ik_elbow_l },
+      { "elbow.R",   &player.mdl.id_ik_elbow_r },
+      { "head",      &player.mdl.id_head }
    };
 
    for( int i=0; i<vg_list_size(bones); i++ )
    {
-      *bones[i].bone_id = skeleton_bone_id( &mdl->sk, bones[i].name );
+      *bones[i].bone_id = skeleton_bone_id( &player.mdl.sk, bones[i].name );
 
       if( !(*bones[i].bone_id) )
       {
-         vg_error( "Required bone '%s' is missing from character '%s'\n",
-                     bones[i].name, name );
-         goto il_free_err;
+         vg_error( "Required bone '%s' is missing\n", bones[i].name );
+         vg_fatal_exit_loop( "Invalid character file" );
       }
    }
-
-   player_init_ragdoll( src );
-   free( src );
-   return 1;
-
-il_free_err:
-   free( src );
-   return 0;
 }
 
 #endif