X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=9bfd04aab3cb7da7328cc0e86c5f4591f3574a02;hb=6b9993651343af73bd48e2213910bbaadb41edaf;hp=9af8e79a5a8a27adb8e61397134414b32aeaae38;hpb=a1056ed8198f0f5be0e0f341da8bd49aa6c47198;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 9af8e79..9bfd04a 100644
--- a/entity.h
+++ b/entity.h
@@ -10,6 +10,38 @@ typedef struct ent_route_node ent_route_node;
 typedef struct ent_path_index ent_path_index;
 typedef struct ent_checkpoint ent_checkpoint;
 typedef struct ent_route ent_route;
+typedef struct ent_water ent_water;
+typedef struct ent_audio_clip ent_audio_clip;
+typedef struct volume_particles volume_particles;
+typedef struct volume_trigger volume_trigger;
+typedef struct ent_volume ent_volume;
+typedef struct ent_audio ent_audio;
+typedef struct ent_index ent_index;
+typedef struct ent_marker ent_marker;
+typedef struct ent_font ent_font;
+typedef struct ent_font_variant ent_font_variant;
+typedef struct ent_glyph ent_glyph;
+
+enum entity_alias{
+   k_ent_gate = 1,
+   k_ent_spawn = 2,
+   k_ent_route_node = 3,
+   k_ent_route = 4,
+   k_ent_water = 5,
+   k_ent_volume = 6,
+   k_ent_audio = 7,
+   k_ent_marker = 8
+};
+
+struct ent_index{
+   u32 type,
+       index;
+};
+
+enum entity_function{
+   k_ent_function_trigger,
+   k_ent_function_particle_spawn
+};
 
 struct ent_spawn{
    mdl_transform transform;
@@ -37,15 +69,14 @@ struct ent_light{
 enum gate_type{
    k_gate_type_unlinked = 0,
    k_gate_type_teleport = 1,
-   k_gate_type_nonlocal = 2
+   k_gate_type_nonlocal_unlinked = 2,
+   k_gate_type_nonlocel = 3
 };
 
 struct ent_gate{
    u32 type,
        target;
 
-   /* TODO: World index */
-
    v3f dimensions,
        co[2];
 
@@ -58,12 +89,13 @@ struct ent_gate{
       u32 timing_version;
 
       struct{
-         u8 ref_count, ref_total;
+         u8 ref_count;
       };
    };
 
    double timing_time;
    u16 routes[4];       /* routes that pass through this gate */
+   u8 route_count;
 };
 
 struct ent_route_node{
@@ -82,7 +114,12 @@ struct ent_checkpoint{
 };
 
 struct ent_route{
-   mdl_transform transform;
+
+   union{
+      mdl_transform transform;
+      u32 official_track_id;
+   };
+
    u32 pstr_name;
    u16 checkpoints_start,
        checkpoints_count;
@@ -90,11 +127,117 @@ struct ent_route{
    v4f colour;
 
    /* runtime */
-   u32 active_checkpoint;
+   u16 active_checkpoint, 
+       valid_checkpoints;
+
    float factive;
    m4x3f board_transform;
    mdl_submesh sm;
-   double latest_pass;
+   double timing_base;
+};
+
+struct ent_water{
+   mdl_transform transform;
+   float max_dist;
+   u32 reserved0, reserved1;
+};
+
+struct ent_audio_clip{
+   union{
+      mdl_file file;
+      audio_clip clip;
+   };
+
+   float probability;
+};
+
+struct volume_particles{
+   u32 blank, blank2;
+};
+
+struct volume_trigger{
+   u32 event, blank;
+};
+
+enum volume_subtype{
+   k_volume_subtype_trigger,
+   k_volume_subtype_particle
+};
+
+struct ent_volume{
+   mdl_transform transform;
+   m4x3f to_world, to_local;
+   u32 type;
+
+   ent_index target;
+
+   union{
+      volume_trigger trigger;
+      volume_particles particles;
+   };
+};
+
+struct ent_audio{
+   mdl_transform transform;
+   u32 flags,
+       clip_start,
+       clip_count;
+   float volume, crossfade;
+   u32 behaviour,
+       group,
+       probability_curve,
+       max_channels;
+};
+
+struct ent_marker{
+   mdl_transform transform;
+   u32 pstr_alias;
+};
+
+VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
+                                       mdl_array_ptr *arr, const char *alias )
+{
+   for( u32 i=0; i<mdl_arrcount(arr); i++ ){
+      ent_marker *marker = mdl_arritm( arr, i );
+
+      if( !strcmp( mdl_pstr( mdl, marker->pstr_alias ), alias ) ){
+         return marker;
+      }
+   }
+
+   return NULL;
+}
+
+enum channel_behaviour{
+   k_channel_behaviour_unlimited = 0,
+   k_channel_behaviour_discard_if_full = 1,
+   k_channel_behaviour_crossfade_if_full = 2
+};
+
+enum probability_curve{
+   k_probability_curve_constant = 0,
+   k_probability_curve_wildlife_day = 1,
+   k_probability_curve_wildlife_night = 2
+};
+
+struct ent_font{
+   u32 alias,
+       variant_start,
+       variant_count,
+       glyph_start,
+       glyph_count,
+       glyph_utf32_base;
+};
+
+struct ent_font_variant{
+   u32 name,
+       material_id;
+};
+
+struct ent_glyph{
+   v2f size;
+   u32 indice_start,
+       indice_count;
 };
 
 #endif /* ENTITY_H */