X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=d56d70271d043a7b239b64df174f2fc6b29a33b3;hb=223e75026f958029f9664380ed20a5daa3ee2ae7;hp=143ad0da8428d3e49d9525ef2a30bcf8db613ae7;hpb=d6171f1c56789b2ca79efa3313fbbf74a13bda7a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 143ad0d..d56d702 100644
--- a/entity.h
+++ b/entity.h
@@ -16,27 +16,45 @@ 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_traffic ent_traffic;
 typedef struct ent_font ent_font;
 typedef struct ent_font_variant ent_font_variant;
 typedef struct ent_glyph ent_glyph;
+typedef struct ent_skateshop ent_skateshop;
+typedef struct ent_camera ent_camera;
 
 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,
+   k_ent_skateshop   = 12,
+   k_ent_camera      = 13
 };
 
-struct ent_index{
-   u32 type,
-       index;
-};
+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;
+}
+
+static u32 mdl_entity_id( u32 type, u32 index )
+{
+   return (type & 0xfffff)<<16 | (index & 0xfffff);
+}
 
 enum entity_function{
    k_ent_function_trigger,
@@ -69,15 +87,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];
 
@@ -170,7 +187,7 @@ struct ent_volume{
    m4x3f to_world, to_local;
    u32 type;
 
-   ent_index target;
+   u32 target;
 
    union{
       volume_trigger trigger;
@@ -195,6 +212,30 @@ struct ent_marker{
    u32 pstr_alias;
 };
 
+struct ent_skateshop{
+   mdl_transform transform;
+   u32 id_display,
+       id_info,
+       id_rack,
+       id_camera;
+};
+
+struct ent_traffic{
+   mdl_transform transform;
+   u32 submesh_start,
+       submesh_count,
+       start_node,
+       node_count;
+   float speed,
+         t;
+   u32 index;     /* into the path */
+};
+
+struct ent_camera{
+   mdl_transform transform;
+   float fov;
+};
+
 VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl,
                                        mdl_array_ptr *arr, const char *alias )
 {
@@ -241,4 +282,15 @@ struct ent_glyph{
        indice_count;
 };
 
+
+typedef struct ent_call ent_call;
+struct ent_call{
+   u32 id, function;
+   void *data;
+};
+
+#include "world.h"
+
+VG_STATIC void entity_call( world_instance *world, ent_call *call );
+
 #endif /* ENTITY_H */