X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=5ac85d8b01e08290de63231e7ba8bcfb23a1fbd6;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=a92f4bf1055d96d1fadb50d0c57e6f9280409bde;hpb=6a6539bcfeb7bd693251f7aae31056671a65c0f0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/entity.h b/entity.h index a92f4bf..5ac85d8 100644 --- a/entity.h +++ b/entity.h @@ -24,6 +24,12 @@ 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; enum entity_alias{ k_ent_none = 0, @@ -41,21 +47,24 @@ enum entity_alias{ k_ent_skateshop = 12, k_ent_camera = 13, k_ent_swspreview = 14, - k_ent_menuitem = 15 + 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 }; -static u32 mdl_entity_id_type( u32 entity_id ) -{ +static u32 mdl_entity_id_type( u32 entity_id ){ return (entity_id & 0xffff0000) >> 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); } @@ -87,16 +96,30 @@ 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 */ +}; struct ent_gate{ - u32 type, - target; + u32 flags, + target, + key; v3f dimensions, co[2]; @@ -117,6 +140,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{ @@ -167,7 +193,7 @@ struct ent_audio_clip{ union{ mdl_file file; audio_clip clip; - }; + }_; float probability; }; @@ -180,18 +206,17 @@ struct volume_trigger{ u32 event, blank; }; -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; @@ -215,12 +240,36 @@ struct ent_marker{ 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 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 ent_swspreview{ @@ -297,6 +346,11 @@ struct ent_menuitem{ }; }; +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 ) { @@ -343,6 +397,76 @@ struct ent_glyph{ indice_count; }; +struct ent_ccmd{ + u32 pstr_command; +}; + +enum ent_objective_filter{ + k_ent_objective_filter_none = 0x00000000, + k_ent_objective_filter_trick_shuvit = 0x00000001, + k_ent_objective_filter_trick_kickflip = 0x00000002, + k_ent_objective_filter_trick_treflip = 0x00000004, + k_ent_objective_filter_trick_any = + k_ent_objective_filter_trick_shuvit| + k_ent_objective_filter_trick_treflip| + k_ent_objective_filter_trick_kickflip, + k_ent_objective_filter_flip_back = 0x00000008, + k_ent_objective_filter_flip_front = 0x00000010, + k_ent_objective_filter_flip_any = + k_ent_objective_filter_flip_back| + k_ent_objective_filter_flip_front, + k_ent_objective_filter_grind_truck_any = 0x00000020, + k_ent_objective_filter_grind_board_any = 0x00000040, + k_ent_objective_filter_grind_any = + k_ent_objective_filter_grind_truck_any| + k_ent_objective_filter_grind_board_any, + k_ent_objective_filter_footplant = 0x00000080, + k_ent_objective_filter_passthrough = 0x00000100 +}; + +enum ent_objective_flag { + k_ent_objective_hidden = 0x1, + k_ent_objective_passed = 0x2 +}; + +struct ent_objective{ + mdl_transform transform; + u32 submesh_start, + submesh_count, + flags, + id_next, + filter,filter2, + id_win, + win_event; + f32 time_limit; +}; + +enum ent_challenge_flag { + k_ent_challenge_timelimit = 0x1 +}; + +struct ent_challenge{ + mdl_transform transform; + u32 pstr_alias, + flags, + target, + target_event, + reset, + reset_event, + first, + camera, + status; +}; + +struct ent_relay { + u32 targets[4][2]; +}; + +struct ent_cubemap { + v3f co; + u32 resolution, live, texture_id, + framebuffer_id, renderbuffer_id, placeholder[2]; +}; typedef struct ent_call ent_call; struct ent_call{ @@ -351,5 +475,6 @@ struct ent_call{ }; #include "world.h" +VG_STATIC void entity_call( world_instance *world, ent_call *call ); #endif /* ENTITY_H */