nonlocal stuff again

[carveJwlIkooP6JGAAIwe30JlM.git] / entity.h

diff --git a/entity.h b/entity.h
index e437d3d77810f059bfc8dd22f5a488ed464df4a9..9bfd04aab3cb7da7328cc0e86c5f4591f3574a02 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -18,6 +18,9 @@ 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,
@@ -66,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];
 
@@ -87,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{
@@ -124,11 +127,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,6 +194,20 @@ struct ent_marker{
    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,
@@ -201,18 +220,24 @@ enum probability_curve{
    k_probability_curve_wildlife_night = 2
 };
 
-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 );
+struct ent_font{
+   u32 alias,
+       variant_start,
+       variant_count,
+       glyph_start,
+       glyph_count,
+       glyph_utf32_base;
+};
 
-      if( !strcmp( mdl_pstr( mdl, marker->pstr_alias ), alias ) ){
-         return marker;
-      }
-   }
+struct ent_font_variant{
+   u32 name,
+       material_id;
+};
 
-   return NULL;
-}
+struct ent_glyph{
+   v2f size;
+   u32 indice_start,
+       indice_count;
+};
 
 #endif /* ENTITY_H */