projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision 2
[carveJwlIkooP6JGAAIwe30JlM.git]
/
workshop.c
diff --git
a/workshop.c
b/workshop.c
index 469eeea2260d40bca903f93cb0e1990187c6fc28..0b03894ed0223f4e44715392444a236558e6c5b1 100644
(file)
--- a/
workshop.c
+++ b/
workshop.c
@@
-1,6
+1,7
@@
-#include "workshop.h"
+#include "vg/vg_engine.h"
#include "vg/vg_tex.h"
#include "vg/vg_tex.h"
+#include "vg/vg_image.h"
#include "vg/vg_msg.h"
#include "vg/vg_binstr.h"
#include "vg/vg_loader.h"
#include "vg/vg_msg.h"
#include "vg/vg_binstr.h"
#include "vg/vg_loader.h"
@@
-10,6
+11,9
@@
#include "vg/vg_steam_ugc.h"
#include "vg/vg_steam_friends.h"
#include "steam.h"
#include "vg/vg_steam_ugc.h"
#include "vg/vg_steam_friends.h"
#include "steam.h"
+#include "workshop.h"
+
+struct workshop_form workshop_form;
static struct ui_enum_opt workshop_form_visibility_opts[] = {
{ k_ERemoteStoragePublishedFileVisibilityPublic, "Public" },
static struct ui_enum_opt workshop_form_visibility_opts[] = {
{ k_ERemoteStoragePublishedFileVisibilityPublic, "Public" },
@@
-805,7
+809,7
@@
static void on_workshop_UGCQueryComplete( void *data, void *userdata )
/*
* Console command to open the workshop publisher
*/
/*
* Console command to open the workshop publisher
*/
-
static
int workshop_submit_command( int argc, const char *argv[] )
+int workshop_submit_command( int argc, const char *argv[] )
{
if( !steam_ready ){
ui_start_modal( "Steam API is not initialized\n", UI_MODAL_BAD );
{
if( !steam_ready ){
ui_start_modal( "Steam API is not initialized\n", UI_MODAL_BAD );
@@
-841,7
+845,7
@@
static int workshop_submit_command( int argc, const char *argv[] )
return 0;
}
return 0;
}
-
static
void workshop_init(void)
+void workshop_init(void)
{
vg_console_reg_cmd( "workshop_submit", workshop_submit_command, NULL );
}
{
vg_console_reg_cmd( "workshop_submit", workshop_submit_command, NULL );
}
@@
-894,7
+898,7
@@
static void workshop_render_player_preview(void){
skeleton_apply_inverses( sk, localplayer.final_mtx );
skeleton_apply_transform( sk, transform, localplayer.final_mtx );
skeleton_apply_inverses( sk, localplayer.final_mtx );
skeleton_apply_transform( sk, transform, localplayer.final_mtx );
- camera cam;
+
vg_
camera cam;
v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos );
cam.nearz = 0.01f;
v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos );
cam.nearz = 0.01f;
@@
-902,10
+906,10
@@
static void workshop_render_player_preview(void){
cam.fov = 57.0f;
v3_zero( cam.angles );
cam.fov = 57.0f;
v3_zero( cam.angles );
- camera_update_transform( &cam );
- camera_update_view( &cam );
- camera_update_projection( &cam );
- camera_finalize( &cam );
+
vg_
camera_update_transform( &cam );
+
vg_
camera_update_view( &cam );
+
vg_
camera_update_projection( &cam );
+
vg_
camera_finalize( &cam );
render_playermodel( &cam, world_current_instance(), 0,
&workshop_form.player_model, sk, localplayer.final_mtx );
render_playermodel( &cam, world_current_instance(), 0,
&workshop_form.player_model, sk, localplayer.final_mtx );
@@
-943,7
+947,7
@@
static void workshop_render_board_preview(void){
v3_add( display->transform.co, display1->transform.co, baseco );
v3_muls( baseco, 0.5f, baseco );
v3_add( display->transform.co, display1->transform.co, baseco );
v3_muls( baseco, 0.5f, baseco );
- camera cam;
+
vg_
camera cam;
v3f basevector;
v3_sub( display->transform.co, ref->transform.co, basevector );
float dist = v3_length( basevector );
v3f basevector;
v3_sub( display->transform.co, ref->transform.co, basevector );
float dist = v3_length( basevector );
@@
-974,10
+978,10
@@
static void workshop_render_board_preview(void){
cam.farz = 100.0f;
cam.fov = ref->fov;
cam.farz = 100.0f;
cam.fov = ref->fov;
- camera_update_transform( &cam );
- camera_update_view( &cam );
- camera_update_projection( &cam );
- camera_finalize( &cam );
+
vg_
camera_update_transform( &cam );
+
vg_
camera_update_view( &cam );
+
vg_
camera_update_projection( &cam );
+
vg_
camera_finalize( &cam );
m4x3f mmdl, mmdl1;
mdl_transform_m4x3( &display->transform, mmdl );
m4x3f mmdl, mmdl1;
mdl_transform_m4x3( &display->transform, mmdl );
@@
-1373,7
+1377,7
@@
static void workshop_form_gui_sidebar( ui_rect sidebar )
}
}
}
}
-
static
void workshop_form_gui(void)
+void workshop_form_gui(void)
{
enum workshop_form_page stable_page = workshop_form.page;
if( stable_page == k_workshop_form_hidden ) return;
{
enum workshop_form_page stable_page = workshop_form.page;
if( stable_page == k_workshop_form_hidden ) return;
@@
-1501,7
+1505,7
@@
static void workshop_form_gui(void)
* -----------------------------------------------------------------------------
*/
* -----------------------------------------------------------------------------
*/
-
static
void async_workshop_get_filepath( void *data, u32 len )
+void async_workshop_get_filepath( void *data, u32 len )
{
struct async_workshop_filepath_info *info = data;
{
struct async_workshop_filepath_info *info = data;
@@
-1517,7
+1521,7
@@
static void async_workshop_get_filepath( void *data, u32 len )
}
}
}
}
-
static
void async_workshop_get_installed_files( void *data, u32 len )
+void async_workshop_get_installed_files( void *data, u32 len )
{
struct async_workshop_installed_files_info *info = data;
{
struct async_workshop_installed_files_info *info = data;