projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont try to load nothign
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_skateshop.h
diff --git
a/ent_skateshop.h
b/ent_skateshop.h
index ff52db0f1380530b4d0c9f6d2c86622dbddf35c7..455c61df16c2e02dc687a64121f89d547708de68 100644
(file)
--- a/
ent_skateshop.h
+++ b/
ent_skateshop.h
@@
-8,23
+8,20
@@
#include "workshop.h"
#include "addon.h"
#include "workshop.h"
#include "addon.h"
-#define SKATESHOP_VIEW_SLOT_MAX
6
+#define SKATESHOP_VIEW_SLOT_MAX
5
struct{
v3f look_target;
struct{
v3f look_target;
- ent_skateshop *ptr_ent;
-
- int active;
- float factive;
struct shop_view_slot{
struct shop_view_slot{
-
struct cache_board *cache_ptr
;
+
u16 cache_id
;
float view_blend;
}
shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
u32 selected_world_id,
selected_board_id,
float view_blend;
}
shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
u32 selected_world_id,
selected_board_id,
+ selected_player_id,
pointcloud_world_id;
struct {
pointcloud_world_id;
struct {
@@
-35,9
+32,23
@@
struct{
u32 world_reg;
}
render;
u32 world_reg;
}
render;
+
+ union {
+ struct gui_helper *helper_pick, *helper_toggle;
+ };
+
+ struct gui_helper *helper_browse;
+
+
+ addon_reg *reg_preview, *reg_loaded_preview;
+ GLuint tex_preview, tex_preview_err;
}
}
-static global_skateshop={.render={.reg_id=0xffffffff,.world_reg=0xffffffff}};
+static global_skateshop={
+ .render={.reg_id=0xffffffff,.world_reg=0xffffffff}
+};
-VG_STATIC void global_skateshop_exit(void);
+static void ent_skateshop_preupdate( ent_skateshop *shop, int active );
+static void skateshop_render( ent_skateshop *shop );
+static void skateshop_render_nonfocused( world_instance *world, camera *cam );
#endif /* ENT_SKATESHOP_H */
#endif /* ENT_SKATESHOP_H */