X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=7143a4130aaccadaa905fa55eaceebf664785f6a;hb=67928190c66b05bd48b6b515278e930974d25cd2;hp=490737d5322737ab15cc839270bf38e236b1f65c;hpb=4b8aac300ee193cfa12011dfe0238cfe7d7ffce7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/entity.h b/entity.h index 490737d..7143a41 100644 --- a/entity.h +++ b/entity.h @@ -16,22 +16,49 @@ 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; +typedef struct ent_swspreview ent_swspreview; +typedef struct ent_worldinfo ent_worldinfo; +typedef struct ent_ccmd ent_ccmd; 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_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, + k_ent_swspreview = 14, + k_ent_menuitem = 15, + k_ent_worldinfo = 16, + k_ent_ccmd = 17 }; -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, @@ -64,14 +91,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 */ + target, + key; v3f dimensions, co[2]; @@ -85,12 +112,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{ @@ -122,11 +150,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{ @@ -162,7 +192,7 @@ struct ent_volume{ m4x3f to_world, to_local; u32 type; - ent_index target; + u32 target; union{ volume_trigger trigger; @@ -176,10 +206,185 @@ struct ent_audio{ clip_start, clip_count; float volume, crossfade; - u32 channel_behaviour, + u32 behaviour, group, probability_curve, max_channels; }; +struct ent_marker{ + mdl_transform transform; + u32 pstr_alias; +}; + +enum skateshop_type{ + k_skateshop_type_boardshop, + k_skateshop_type_charshop, + k_skateshop_type_worldshop +}; + +struct ent_skateshop{ + mdl_transform transform; + u32 type, id_camera; + + union{ + struct{ + u32 id_display, + id_info, + id_rack; + } + boards; + + struct{ + u32 id_display, + id_info; + } + character; + + struct{ + u32 id_display, + id_info; + } + worlds; + }; +}; + +struct ent_swspreview{ + u32 id_camera, id_display, id_display1; +}; + +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; +}; + +enum ent_menuitem_type{ + k_ent_menuitem_type_visual = 0, + k_ent_menuitem_type_event_button = 1, + k_ent_menuitem_type_page_button = 2, + k_ent_menuitem_type_toggle = 3, + k_ent_menuitem_type_slider = 4, + k_ent_menuitem_type_page = 5 +}; + +typedef struct ent_menuitem ent_menuitem; +struct ent_menuitem{ + u32 type, groups, + id_links[4]; /* ent_menuitem */ + f32 factive, fvisible; + + mdl_transform transform; + u32 submesh_start, submesh_count; + + union{ u64 _u64; /* force storage for 64bit pointers */ + i32 *pi32; + f32 *pf32; + void *pvoid; + }; + + union{ + struct{ + u32 id_min, /* ent_marker */ + id_max, /* . */ + id_handle, /* ent_menuitem */ + pstr_data; + } + slider; + + struct{ + u32 pstr; + } + button; + + struct{ + u32 id_check, /* ent_menuitem */ + pstr_data; + v3f offset; /* relative to parent */ + } + checkmark; + + struct{ + u32 pstr_name, + id_entrypoint, /* ent_menuitem */ + id_viewpoint; /* ent_camera */ + } + page; + }; +}; + +struct ent_worldinfo{ + u32 pstr_name, pstr_author, pstr_desc; + f32 timezone; +}; + +VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl, + mdl_array_ptr *arr, const char *alias ) +{ + for( u32 i=0; ipstr_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; +}; + +struct ent_ccmd{ + u32 pstr_command; +}; + +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 */