simplify

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index e437d3d77810f059bfc8dd22f5a488ed464df4a9..7d6fabfbdeaf909e71a12d7abf53a205c4e2a7c8 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -18,18 +18,36 @@ 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_traffic ent_traffic;
+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
+   k_ent_none        = 0,
+   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,
+   k_ent_font        = 9,
+   k_ent_font_variant= 10,
+   k_ent_traffic     = 11
 };
 
+static u32 mdl_entity_id_type( u32 entity_id )
+{
+   return (entity_id & 0xffff0000) >> 16;
+}
+
+static u32 mdl_entity_id_id( u32 entity_id )
+{
+   return entity_id & 0x0000ffff;
+}
+
 struct ent_index{
    u32 type,
        index;
@@ -66,15 +84,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];
 
@@ -87,12 +104,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{
@@ -124,11 +142,13 @@ 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{
@@ -189,16 +209,15 @@ struct ent_marker{
    u32 pstr_alias;
 };
 
-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_traffic{
+   mdl_transform transform;
+   u32 submesh_start,
+       submesh_count,
+       start_node,
+       node_count;
+   float speed,
+         t;
+   u32 index;     /* into the path */
 };
 
 VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
@@ -215,4 +234,36 @@ VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
    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 */