X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=d56d70271d043a7b239b64df174f2fc6b29a33b3;hb=456d49acc5e8a2601b8a86317af78355324d8971;hp=25fd63ff55a85134ea295c5ed4c2b95b92a32b52;hpb=1b522daa02f28128498b04def4d60b63e590d1f3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 25fd63f..d56d702 100644
--- a/entity.h
+++ b/entity.h
@@ -16,11 +16,13 @@ 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_none        = 0,
@@ -34,7 +36,9 @@ enum entity_alias{
    k_ent_marker      = 8,
    k_ent_font        = 9,
    k_ent_font_variant= 10,
-   k_ent_traffic     = 11
+   k_ent_traffic     = 11,
+   k_ent_skateshop   = 12,
+   k_ent_camera      = 13
 };
 
 static u32 mdl_entity_id_type( u32 entity_id )
@@ -47,10 +51,10 @@ static u32 mdl_entity_id_id( u32 entity_id )
    return entity_id & 0x0000ffff;
 }
 
-struct ent_index{
-   u32 type,
-       index;
-};
+static u32 mdl_entity_id( u32 type, u32 index )
+{
+   return (type & 0xfffff)<<16 | (index & 0xfffff);
+}
 
 enum entity_function{
    k_ent_function_trigger,
@@ -183,7 +187,7 @@ struct ent_volume{
    m4x3f to_world, to_local;
    u32 type;
 
-   ent_index target;
+   u32 target;
 
    union{
       volume_trigger trigger;
@@ -208,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 )
 {
@@ -254,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 */