X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=80f4df7573fc7b62c440b9ba2cd29e4af024ddc4;hb=HEAD;hp=103e1a20635e1f32a91f7f0a4f8cc719350fff4d;hpb=df9f72d2912a5424d37dfdb02f76aba8f1ed4df1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/entity.h b/entity.h index 103e1a2..80f4df7 100644 --- a/entity.h +++ b/entity.h @@ -1,6 +1,7 @@ -#ifndef ENTITY_H -#define ENTITY_H +#pragma once +#include "vg/vg_audio.h" +#include "vg/vg_imgui.h" #include "model.h" typedef struct ent_spawn ent_spawn; @@ -30,6 +31,31 @@ 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; +typedef struct ent_list ent_list; +typedef struct ent_glider ent_glider; +typedef struct ent_npc ent_npc; + +typedef struct ent_call ent_call; +struct ent_call{ + u32 id; + i32 function; + void *data; +}; + +typedef enum entity_call_result entity_call_result; +enum entity_call_result +{ + k_entity_call_result_OK, + k_entity_call_result_unhandled, + k_entity_call_result_invalid +}; + +typedef enum entity_call_result + (*fn_entity_call_handler)( world_instance *, ent_call *); + enum entity_alias{ k_ent_none = 0, @@ -53,24 +79,35 @@ enum entity_alias{ k_ent_objective = 18, k_ent_challenge = 19, k_ent_relay = 20, - k_ent_cubemap = 21 + k_ent_cubemap = 21, + k_ent_miniworld = 22, + k_ent_prop = 23, + k_ent_list = 24, + k_ent_region = 25, + k_ent_glider = 26, + k_ent_npc = 27 }; -static u32 mdl_entity_id_type( u32 entity_id ){ - return (entity_id & 0xffff0000) >> 16; +static inline u32 mdl_entity_id_type( u32 entity_id ) +{ + return (entity_id & 0x0fff0000) >> 16; } -static u32 mdl_entity_id_id( u32 entity_id ){ +static inline u32 mdl_entity_id_id( u32 entity_id ) +{ return entity_id & 0x0000ffff; } -static u32 mdl_entity_id( u32 type, u32 index ){ +static inline u32 mdl_entity_id( u32 type, u32 index ) +{ return (type & 0xfffff)<<16 | (index & 0xfffff); } -enum entity_function{ +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{ @@ -114,6 +151,8 @@ enum ent_gate_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{ @@ -158,12 +197,23 @@ struct ent_checkpoint{ u16 gate_index, path_start, path_count; + + /* EXTENSION */ + f32 best_time; +}; + +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; @@ -177,10 +227,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{ @@ -203,7 +262,7 @@ struct volume_particles{ }; struct volume_trigger{ - u32 event, blank; + i32 event, event_leave; }; enum ent_volume_flag { @@ -241,9 +300,11 @@ struct ent_marker{ }; enum skateshop_type{ - k_skateshop_type_boardshop, - k_skateshop_type_charshop, - k_skateshop_type_worldshop, + 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{ @@ -269,6 +330,11 @@ struct ent_skateshop{ id_info; } worlds; + + struct{ + u32 id_lever; + } + server; }; }; @@ -300,6 +366,7 @@ enum ent_menuitem_type{ 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 }; @@ -368,21 +435,12 @@ struct ent_menuitem{ 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; ipstr_alias ), alias ) ){ - return marker; - } - } - - return NULL; -} +ent_marker *ent_find_marker( mdl_context *mdl, mdl_array_ptr *arr, + const char *alias ); enum channel_behaviour{ k_channel_behaviour_unlimited = 0, @@ -455,8 +513,8 @@ struct ent_objective{ flags, id_next, filter,filter2, - id_win, - win_event; + id_win; + i32 win_event; f32 time_limit; }; @@ -468,17 +526,18 @@ struct ent_challenge{ mdl_transform transform; u32 pstr_alias, flags, - target, - target_event, - reset, - reset_event, - first, + target; + i32 target_event; + u32 reset; + i32 reset_event; + u32 first, camera, status; }; struct ent_relay { u32 targets[4][2]; + i32 targets_events[4]; }; struct ent_cubemap { @@ -487,13 +546,37 @@ struct ent_cubemap { framebuffer_id, renderbuffer_id, placeholder[2]; }; -typedef struct ent_call ent_call; -struct ent_call{ - u32 id, function; - void *data; +struct ent_miniworld { + mdl_transform transform; + u32 pstr_world; + u32 camera; + u32 proxy; }; -#include "world.h" -static void entity_call( world_instance *world, ent_call *call ); +struct ent_prop { + mdl_transform transform; + u32 submesh_start, submesh_count, flags, pstr_alias; +}; -#endif /* ENTITY_H */ +struct ent_region { + mdl_transform transform; + u32 submesh_start, submesh_count, pstr_title, flags, zone_volume, + + /* 105+ */ + target0[2]; +}; + +struct ent_glider { + mdl_transform transform; + u32 flags; + f32 cooldown; +}; + +struct ent_npc +{ + mdl_transform transform; + u32 id, context, camera; +}; + +#include "world.h" +void entity_call( world_instance *world, ent_call *call );