X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=entity.h;h=1de6f7026b62379c7f80092ecc6550849e5723c7;hb=b8ff92a2caafa557608b84f4a037a5b3ce2628f7;hp=e8b9d411a91d04452e5e7b58216bfacb714b9297;hpb=872ad3e040f22df357929d3778a955ae8c4ac52b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/entity.h b/entity.h
index e8b9d41..1de6f70 100644
--- a/entity.h
+++ b/entity.h
@@ -22,6 +22,9 @@ 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;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -36,7 +39,11 @@ enum entity_alias{
    k_ent_font        = 9,
    k_ent_font_variant= 10,
    k_ent_traffic     = 11,
-   k_ent_skateshop   = 12
+   k_ent_skateshop   = 12,
+   k_ent_camera      = 13,
+   k_ent_swspreview  = 14,
+   k_ent_menuitem    = 15,
+   k_ent_worldinfo   = 16
 };
 
 static u32 mdl_entity_id_type( u32 entity_id )
@@ -91,7 +98,8 @@ enum gate_type{
 
 struct ent_gate{
    u32 type,
-       target;
+       target, 
+       key;
 
    v3f dimensions,
        co[2];
@@ -210,11 +218,40 @@ 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;
+   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{
@@ -228,6 +265,70 @@ struct ent_traffic{
    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 )
 {
@@ -282,7 +383,6 @@ struct ent_call{
 };
 
 #include "world.h"
-
 VG_STATIC void entity_call( world_instance *world, ent_call *call );
 
 #endif /* ENTITY_H */