X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=a14314a0ead9dea344529ae0ce668856a1f25565;hb=5ae8830824afe4fd399f8a2f912e4df9735f9fd5;hp=56938ce0ce25ca87485d57b3378067e81445b60b;hpb=a99e5f5d5c16a3e865796a96ad648e3c570d32ac;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index 56938ce..a14314a 100644
--- a/entity.h
+++ b/entity.h
@@ -24,6 +24,7 @@ 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;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -40,7 +41,9 @@ 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
 };
 
 static u32 mdl_entity_id_type( u32 entity_id )
@@ -214,12 +217,29 @@ struct ent_marker{
    u32 pstr_alias;
 };
 
+enum skateshop_type{
+   k_skateshop_type_boardshop,
+   k_skateshop_type_charshop
+};
+
 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 ent_swspreview{
@@ -242,6 +262,65 @@ struct ent_camera{
    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 )
 {
@@ -297,6 +376,4 @@ struct ent_call{
 
 #include "world.h"
 
-VG_STATIC void entity_call( world_instance *world, ent_call *call );
-
 #endif /* ENTITY_H */