projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
my fucking fingers
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index e8b1f4dd5e3dea85dee98e0abfe75372d50f0041..fedaa3d8728b6b17dbf563784744c2d57c175e0f 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-11,6
+11,8
@@
* =============================================================================
*/
* =============================================================================
*/
+#if 1
+
#define SR_NETWORKED
#define VG_DEVWINDOW
#include "common.h"
#define SR_NETWORKED
#define VG_DEVWINDOW
#include "common.h"
@@
-23,6
+25,7
@@
#include "player.h"
#include "entity.c"
#include "player.h"
#include "entity.c"
+#include "workshop.c"
VG_STATIC struct player_avatar localplayer_avatar;
VG_STATIC struct player_model localplayer_models[3];
VG_STATIC struct player_avatar localplayer_avatar;
VG_STATIC struct player_model localplayer_models[3];
@@
-130,6
+133,7
@@
VG_STATIC void vg_load(void)
vg_loader_step( player_init, NULL );
vg_loader_step( player_ragdoll_init, NULL );
vg_loader_step( player_init, NULL );
vg_loader_step( player_ragdoll_init, NULL );
+ vg_loader_step( workshop_init, NULL );
vg_loader_step( skateshop_init, NULL );
/* ----------------- */
vg_loader_step( skateshop_init, NULL );
/* ----------------- */
@@
-404,8
+408,6
@@
VG_STATIC void render_main_game(void)
main_camera.fov = vg_lerpf( localplayer.cam.fov, menu_smooth_fov,
menu_opacity );
main_camera.fov = vg_lerpf( localplayer.cam.fov, menu_smooth_fov,
menu_opacity );
- main_camera.fov = vg_lerpf( main_camera.fov, 90.0f,
- global_skateshop.factive );
main_camera.nearz = 0.1f;
main_camera.farz = 2100.0f;
main_camera.nearz = 0.1f;
main_camera.farz = 2100.0f;
@@
-472,7
+474,7
@@
VG_STATIC void vg_render(void)
gui_draw();
}
gui_draw();
}
-VG_STATIC void vg_ui(void)
+VG_STATIC void vg_
g
ui(void)
{
if( skaterift_status == 0 ){
return;
{
if( skaterift_status == 0 ){
return;
@@
-483,6
+485,14
@@
VG_STATIC void vg_ui(void)
#endif
world_instance *world = get_active_world();
menu_crap_ui();
#endif
world_instance *world = get_active_world();
menu_crap_ui();
+
+ workshop_form_gui();
render_view_framebuffer_ui();
}
render_view_framebuffer_ui();
}
+
+#else
+
+#include "skaterift_imgui_dev.c"
+
+#endif