X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=1c11f38ce3ec3544d7c82ac935df6f71c09463ca;hb=78cc452a8343821ba47c0905d755657847dafd25;hp=56938ce0ce25ca87485d57b3378067e81445b60b;hpb=a99e5f5d5c16a3e865796a96ad648e3c570d32ac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/entity.h b/entity.h index 56938ce..1c11f38 100644 --- a/entity.h +++ b/entity.h @@ -24,6 +24,15 @@ 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; +typedef struct ent_objective ent_objective; +typedef struct ent_challenge ent_challenge; +typedef struct ent_relay ent_relay; +typedef struct ent_cubemap ent_cubemap; +typedef struct ent_miniworld ent_miniworld; +typedef struct ent_prop ent_prop; +typedef struct ent_region ent_region; enum entity_alias{ k_ent_none = 0, @@ -40,27 +49,36 @@ enum entity_alias{ k_ent_traffic = 11, k_ent_skateshop = 12, k_ent_camera = 13, - k_ent_swspreview = 14 + k_ent_swspreview = 14, + k_ent_menuitem = 15, + k_ent_worldinfo = 16, + k_ent_ccmd = 17, + k_ent_objective = 18, + k_ent_challenge = 19, + k_ent_relay = 20, + k_ent_cubemap = 21, + k_ent_miniworld = 22, + k_ent_prop = 23, + k_ent_list = 24, + k_ent_region = 25 }; -static u32 mdl_entity_id_type( u32 entity_id ) -{ - return (entity_id & 0xffff0000) >> 16; +static u32 mdl_entity_id_type( u32 entity_id ){ + return (entity_id & 0x0fff0000) >> 16; } -static u32 mdl_entity_id_id( u32 entity_id ) -{ +static u32 mdl_entity_id_id( u32 entity_id ){ return entity_id & 0x0000ffff; } -static u32 mdl_entity_id( u32 type, u32 index ) -{ +static u32 mdl_entity_id( u32 type, u32 index ){ return (type & 0xfffff)<<16 | (index & 0xfffff); } enum entity_function{ k_ent_function_trigger, - k_ent_function_particle_spawn + k_ent_function_particle_spawn, + k_ent_function_trigger_leave }; struct ent_spawn{ @@ -86,16 +104,32 @@ struct ent_light{ v2f angle_sin_cos; }; +/* v101 */ +#if 0 enum gate_type{ k_gate_type_unlinked = 0, k_gate_type_teleport = 1, k_gate_type_nonlocal_unlinked = 2, k_gate_type_nonlocel = 3 }; +#endif + +/* v102+ */ +enum ent_gate_flag{ + k_ent_gate_linked = 0x1, /* this is a working portal */ + k_ent_gate_nonlocal = 0x2, /* use the key string to link this portal. + NOTE: if set, it adds the flip flag. */ + k_ent_gate_flip = 0x4, /* flip direction 180* for exiting portal */ + k_ent_gate_custom_mesh = 0x8, /* use a custom submesh instead of default */ + k_ent_gate_locked = 0x10,/* has to be unlocked to be useful */ + + k_ent_gate_clean_pass = 0x20,/* player didn't rewind while getting here */ +}; struct ent_gate{ - u32 type, - target; + u32 flags, + target, + key; v3f dimensions, co[2]; @@ -116,6 +150,9 @@ struct ent_gate{ double timing_time; u16 routes[4]; /* routes that pass through this gate */ u8 route_count; + + /* v102+ */ + u32 submesh_start, submesh_count; }; struct ent_route_node{ @@ -131,14 +168,25 @@ struct ent_checkpoint{ u16 gate_index, path_start, path_count; + + /* EXTENSION */ + f32 best_time; }; -struct ent_route{ +enum ent_route_flag { + k_ent_route_flag_achieve_silver = 0x1, + k_ent_route_flag_achieve_gold = 0x2, + + k_ent_route_flag_out_of_zone = 0x10, + k_ent_region_flag_hasname = 0x20 +}; +struct ent_route{ union{ mdl_transform transform; - u32 official_track_id; - }; + u32 official_track_id; /* TODO: remove this */ + } + anon; u32 pstr_name; u16 checkpoints_start, @@ -150,10 +198,19 @@ struct ent_route{ u16 active_checkpoint, valid_checkpoints; - float factive; + f32 factive; m4x3f board_transform; mdl_submesh sm; - double timing_base; + f64 timing_base; + + u32 id_camera; /* v103+ */ + + /* v104+, but always accessible */ + u32 flags; + f64 best_laptime; + f32 ui_stopper, ui_residual; + + ui_px ui_first_block_width, ui_residual_block_w; }; struct ent_water{ @@ -166,7 +223,7 @@ struct ent_audio_clip{ union{ mdl_file file; audio_clip clip; - }; + }_; float probability; }; @@ -176,21 +233,20 @@ struct volume_particles{ }; struct volume_trigger{ - u32 event, blank; + u32 event, event_leave; }; -enum volume_subtype{ - k_volume_subtype_trigger, - k_volume_subtype_particle +enum ent_volume_flag { + k_ent_volume_flag_particles = 0x1, + k_ent_volume_flag_disabled = 0x2 }; struct ent_volume{ mdl_transform transform; m4x3f to_world, to_local; - u32 type; + u32 flags; u32 target; - union{ volume_trigger trigger; volume_particles particles; @@ -214,12 +270,43 @@ struct ent_marker{ u32 pstr_alias; }; +enum skateshop_type{ + k_skateshop_type_boardshop = 0, + k_skateshop_type_charshop = 1, + k_skateshop_type_worldshop = 2, + k_skateshop_type_DELETED = 3, + k_skateshop_type_server = 4 +}; + struct ent_skateshop{ mdl_transform transform; - u32 id_display, - id_info, - id_rack, - id_camera; + 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{ + u32 id_lever; + } + server; + }; }; struct ent_swspreview{ @@ -242,7 +329,88 @@ struct ent_camera{ float fov; }; -VG_STATIC ent_marker *ent_find_marker( mdl_context *mdl, +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, + k_ent_menuitem_type_binding = 6, + k_ent_menuitem_type_visual_nocol = 7, + k_ent_menuitem_type_disabled = 90 +}; + +enum ent_menuitem_stack_behaviour{ + k_ent_menuitem_stack_append = 0, + k_ent_menuitem_stack_replace = 1 +}; + +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 pstr_name; + } + visual; + + struct{ + u32 id_min, /* ent_marker */ + id_max, /* . */ + id_handle, /* ent_menuitem */ + pstr_data; + } + slider; + + struct{ + u32 pstr, + stack_behaviour; + } + 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{ + u32 pstr_bind, + font_variant; + } + binding; + }; +}; + +struct ent_worldinfo{ + u32 pstr_name, pstr_author, pstr_desc; + f32 timezone; + u32 pstr_skybox; + u32 flags; +}; + +static ent_marker *ent_find_marker( mdl_context *mdl, mdl_array_ptr *arr, const char *alias ) { for( u32 i=0; i