From 9695bd6aa2ca31da9dbcde29eb5d082489c4decc Mon Sep 17 00:00:00 2001 From: hgn Date: Sat, 20 Apr 2024 10:49:58 +0100 Subject: [PATCH] guide background cameras --- ent_camera.c | 10 +++ ent_camera.h | 3 + maps_src/dev_hub/main.mdl | Bin 1945104 -> 1945520 bytes menu.c | 178 ++++++++++++++++++++++++++++++-------- menu.h | 9 +- skaterift.c | 54 +++++++++--- world_entity.c | 14 ++- 7 files changed, 213 insertions(+), 55 deletions(-) create mode 100644 ent_camera.c create mode 100644 ent_camera.h diff --git a/ent_camera.c b/ent_camera.c new file mode 100644 index 0000000..d23d8d8 --- /dev/null +++ b/ent_camera.c @@ -0,0 +1,10 @@ +#include "entity.h" + +void ent_camera_unpack( ent_camera *ent, vg_camera *cam ) +{ + v3f dir = {0.0f,-1.0f,0.0f}; + mdl_transform_vector( &ent->transform, dir, dir ); + v3_angles( dir, cam->angles ); + v3_copy( ent->transform.co, cam->pos ); + cam->fov = ent->fov; +} diff --git a/ent_camera.h b/ent_camera.h new file mode 100644 index 0000000..bf4ce14 --- /dev/null +++ b/ent_camera.h @@ -0,0 +1,3 @@ +#include "entity.h" + +void ent_camera_unpack( ent_camera *ent, vg_camera *cam ); diff --git a/maps_src/dev_hub/main.mdl b/maps_src/dev_hub/main.mdl index 1e61b4f1ba382369766ffe12f2b2e507aad769c4..28304f5d827738bf81b5d7c822e519657e00dad0 100644 GIT binary patch delta 3225 zcmZ`)dstM}7N0#j;v~4`Da=5CG9s@l2#5-E_ArQyA_xH@A|Q_eM_`o40HPpfL~5Zp zj;p%fQWL4Jn2+#O${Ep6dw4DL!FThSO=?>C!mLDFC-V07$KBuen>}l7U>JC4K;d{Z<{NKQnp(wk;u($WVBQ>&HOG= zObLx2-10O)xxr|tU0hjKgj*!j2ZQ(h>8=EWi_7BZGY=4@^pMW1kSgYAo*Oi@M}-)- zs}vG1X@TC-xp z_!kZ~2 zx=;MGN}0q#(h#9IlD~s#D>nuGr4(Cm7%Df7@;cI!tVh>A(qjFVKYD-fpK}Zop5JM3%#4v;%VmLyMcm^>7VUKX&n^H&KvdVuP zs}qX6^4K0QIZ`Xx0Fh2KQ~pJ$m2)$ev-x0gqCq4PdYtH5dAjHK!o+P0SSe&Uqmi5E z@tE|odM1G`XX-BxeRoT@@5N%a1#HgrCvt{A<3baN{Fw;X?q9!YWRF1QhMR6RJ9PVM zE7)gzvl~4}$T7%qr-d?Q%Rg8c^t#g)xk{&CJ-=z#Dai0ZG2ZW<`f_k1D*&4Z^(Sg@ zP|!U2DbJRyp-3t>@S#-iV$3ixqmpx0D5!v=PX0keH_Qpzbj0*(axeWFNba~Ttq!r?QaCKnM zO76mA6B`XCADT&O;DiqiC!h1gmwFTO7Wj_AM8-hU7>kMc=ry@I$|fur6U0{X{eEJmc@RI2^74TC$3pJIboM#O{OJTz z36cJo!0ykls*4I6*?rK9;*i$`&UQ7C{Qwq!tWF1BY;rCR=fjbp;*AHpUvQM56oc( z=nchHj#q_=Bz?=rPo#;23_x2r_S3vjcj0TFvXd^G1BKBcNaWeN(T0P5xjH#I6d+W8_(doG&24L zv`3?>^)Fo#RQvLn7S2Rt$ge;jgVl_H-WZxG8+av&y9vH( zP6c!4`{QXXkssh3gw=*Z)(fTt44DA!30Qv+$aL6nm*Ev1EhLBGj*i}xpA20r9LvaM zcfmFTsY(IUObp(()5Jc6_L-QdCs-2k{(c1AiAc{@_1$il%u<#P{V0-ipqhosnUFM# zu9Lk}a+3QEuFS&w)Bp}ic(n5&HVNHbjs98v2r81WS)JfS5^lT>14+~>kNWtDpje;I zTA?=?SC>P7GG-V74YTpBnEps@JsIrA2EaBOFK!2@Q!s;_O*^_TZOUPlU`oM0DnEU@ z+X!1z=uMf+{bV%XfYJs5^IDC5wXoRCT-M__iqqFEi!a{;u+2qIcY|XV9$XEWvd~fb z*~i^K-LGTG(4K|V1;ZI}^+?hMA^rVg_B_bu(X}K4+U6nu9@~ZqdC)Ttz4w_O9&`iW zY<$yB1pgvr?e}1dAtRgeF`G5sOtLGE6>SL-{vS0%-`i$gU_Y5<{pSPgvL`KE@!}d5 zemGMNeGSyp@%>j%an~NzX-ZGe5WF{4u@*4R$DEe8ZWhMvt72!NT@;5usOAE~D%d(W zGapm*f&3gy=7`-_T#k#Ld4nYf`%nj}T)ZAVGhBt`mKr8NS1uN*0b4F^Nrs9%-0~&9 zq`F^1*mP*m!z~>Uxqx1iZFuq^=11_&N4sgznU77l8m{CceJ_AR0e-Re1{bgNaoAdXIKbtD-ti- zi$|Ao(W@$1Gw6%)=5H1{xzzYl_8q87uw$#Bp#-~T*w=P!rne7!54uY5P{Y7+AvF^_ zXkUm!0V(?ElVdUWudHAVU@_1ZneJw5cO37#h^7%To;Q_>Pw@i2 zrwl)Teq@` z1aGUNPoyNBx7EB@ z1wvM0`OiYnN_qeZZ+M=TpiA5Hc-+}0dQcylkDnjYDx`DVeK%{-KoWC-$QLlu(96lf z#QHjx1FB{uNw#5`a3`VyKam;Dc>F`a){LA7^6D2csGNT?nu|$W%yzX{S}0-^!V%$w da7MTwToG=F(Fk{h2SR~RB0PCZi`TMozXMV5Sg8O2 delta 2876 zcmZ`*c~}%j7M~hzNoO$?gh7~ra40HQ1aX4LOcx--p&}tL62$-`3_6^0qbN#Dhp17+ z3BHXRkC>g+FNzTjc6OB>H6iL36U{2>M)6ofyjM-c7$dT;*ZAl5_x+~2s$RY0_ui|X z-Ir?CUZ^n^s#Gd}gcjk0u$AUp>u`MjJW{Jv=XjNh;6i0pg{^d6@TnS(?36tySZ&Qmvh|3?(1tplXyQMq<^JhS{^MsSEB2p7Z) z2p;hw;!g-y#8AmU{iWMZ{?3RbIo~&j?FNlIbrL&tyVFemM1)iDEG=PKp!cAmWGYxZ z=qldqb5kC-HJ24bp9czg`y4f76fa_GFl*>&e%z;9Is+~iu#Z91(7WV{RP9L<3GX^y z)A{({4eTj&4aY-w#G#!5apml|6y!zE5^@y!y=fk&ZF-eOfK^MI_)$q(cJTKY_C53| z(}a<~7%zu4u=ybB=xAbqHXY63Px&kquDTbn&p_jY4jzVBADTrXVWSUi<_iw(k&k6r zShuA2rKyAnAihGI$PF0kN27@rOn&IdsMaL;tXm!nksN-so^Xy$Q&|lJ1z;p|N^|9; zvu1Vz%mK8StcG4?b)dab=y_Vrbf5{OnWPFz0%;WaM*29A`Vr!QLnF`;f4DP({zCS{ zm60@u)In?z4drG{iZOUXIll7OR_&85AH}hs!4X8S@rLMLIX5trEt6VDDW2v*?`SIV zVT+#1*^e^N0mm3RmQ+Ib7<6FI@vFxCyasj$xL}+P-XIITSEsT6fIb+bON7o~j9t|) z8M8-5vOX|}pwNXMJehD#!$yOMQ*M9sQkjGH5SqnB^*DqX;1-JBmI4=s>=lD0jM@ih zygbASNy*d)Ji_UGep}9E`Ls(iTQ7;>bQ>XCA$%;x{YbKmrRNDB9dJ?jDJq%OgDDat zc7P)i1NiWpWFdS1OjZciakv^Ib&XRqj%?>SP$0Vf=w-?M1-b-J^-h{r%=;7|QaY9!@J=+c)2CN3x zHdkkRXB>M18Y43P9hi)$s`>o(biCRG7*0jn}SvgUia?RFXq zgjQwx!4k4uTkmjc{brI^(UN2BlM{pvGn}O~Ez`1ARPh z_JrRMF8no%vmSNe}HK^I_eAh6ztyv@Ky@a^NI22PLIqY zW`rfo~e#74c7u&J$st7^|3ujk^PS($Iq)%l_7R zdHq|g95ioW9hIHF*I5R!Z_rzuX5Xpv_YZq))J7E>sLqcK;Pd<*SH?h(FPQt(_?UL@%?AxoVn*r!zBQxmp#e9A zSNA2dP~c`_UWVtqCf^hbSqA85V#Th8zL{8(DZf7LbPTFv&0x+%q4^nWj6MFz>=B5{ zG&*FbF|;s|eF7bs7^*=szKItI7nnI-&V`m)SdX z)(j#NkXM)GehxZlC}8pTe~#buq=KlV!j4m23rQveBm{Yd(^L_Exg zDd1+oBc}#!kduE4XGvhP;F0anZK2n=_Xi#t?!uwDD3<^!d02$2pfL~WdmGyF@Qc+R zHkU00O+J#p9yaD{aN_$2{9WZ^aY_t@M&x?%LRNXtm<%Na$0B+h8t0GFLla zWMPt6pfp<3*9(Qo%PZJBz|F_b-z2vQX{I9fBXrHjid_J{HmsV#=Uv!TKYz9h%r;DF z1hm_zo$z2PM5T6c6k=q1pj#Qjfh$6a4jemT`1#6GRt5SZ+Qdz}wWc#(I#fi{2?>@o zCCXJiSF)7i=a2kL>M5fq)co7W4$8F;g4hP=sK5vYB{aypiffn`Xe!a?Ei94wNTy0U zS0uj2o1s$F&yEA@J476I)sm;U*TIn>c5Sq>8=0( diff --git a/menu.c b/menu.c index eaec907..aea8e60 100644 --- a/menu.c +++ b/menu.c @@ -154,7 +154,15 @@ static bool menu_button( ui_rect inout_panel, bool select, const char *text ) } ui_text( rect, text, 1, k_ui_align_middle_center, 0 ); - return state == k_ui_button_click; + + if( state == k_ui_button_click ) + { + audio_lock(); + audio_oneshot( &audio_ui[0], 1.0f, 0.0f ); + audio_unlock(); + return 1; + } + else return 0; } static bool menu_checkbox( ui_rect inout_panel, bool select, @@ -208,15 +216,20 @@ static bool menu_checkbox( ui_rect inout_panel, bool select, ui_outline( box, 1, select? GUI_COL_HI: GUI_COL_NORM, 0 ); } - bool changed = (state == k_ui_button_click); - if( *data ) { ui_rect_pad( box, (ui_px[2]){8,8} ); ui_fill( box, GUI_COL_HI ); } - return changed; + if( state == k_ui_button_click ) + { + audio_lock(); + audio_oneshot( &audio_ui[0], 1.0f, 0.0f ); + audio_unlock(); + return 1; + } + else return 0; } static void menu_heading( ui_rect inout_panel, const char *label, u32 colour ) @@ -252,6 +265,41 @@ static u32 medal_colour( u32 flags ) else return 0; } +static i32 menu_nav( i32 *p_row, int mv, i32 max ) +{ + i32 row_prev = *p_row; + + if( mv < 0 ) *p_row = vg_min( max, (*p_row) +1 ); + if( mv > 0 ) *p_row = vg_max( 0, (*p_row) -1 ); + + if( *p_row != row_prev ) + { + audio_lock(); + audio_oneshot( &audio_ui[3], 1.0f, 0.0f ); + audio_unlock(); + } + + return *p_row; +} + +static void menu_try_find_cam( i32 id ) +{ + world_instance *world = &world_static.instances[0]; + for( u32 i=0; ient_npc); i ++ ) + { + ent_npc *fnpc = mdl_arritm( &world->ent_npc, i ); + if( (fnpc->id == 50) && (fnpc->context == id) ) + { + if( mdl_entity_id_type(fnpc->camera) == k_ent_camera ) + { + u32 index = mdl_entity_id_id( fnpc->camera ); + menu.bg_cam = mdl_arritm( &world->ent_camera, index ); + menu.bg_blur = 0; + } + } + } +} + void menu_gui(void) { if( button_down( k_srbind_mopen ) ) @@ -266,6 +314,9 @@ void menu_gui(void) if( skaterift.activity != k_skaterift_menu ) return; + menu.bg_blur = 1; + menu.bg_cam = NULL; + /* get buttons inputs * -------------------------------------------------------------------*/ int ml = button_down( k_srbind_mleft ), @@ -287,6 +338,9 @@ void menu_gui(void) { if( button_down( k_srbind_mback ) ) { + audio_lock(); + audio_oneshot( &audio_ui[3], 1.0f, 0.0f ); + audio_unlock(); vg_settings_close(); srinput.state = k_input_state_resume; } @@ -338,6 +392,41 @@ void menu_gui(void) goto menu_draw; } + else if( menu.page == k_menu_page_starter ) + { + i32 R = menu_nav( &menu.intro_row, mv, 3 ); + ui_rect panel = { 0,0, 600, 400 }, + screen = { 0,0, vg.window_x,vg.window_y }; + ui_rect_center( screen, panel ); + ui_fill( panel, ui_opacity( GUI_COL_DARK, 0.35f ) ); + ui_outline( panel, 1, GUI_COL_NORM, 0 ); + ui_rect_pad( panel, (ui_px[]){8,8} ); + + ui_rect title; + ui_split( panel, k_ui_axis_h, 28*2, 0, title, panel ); + ui_font_face( &vgf_default_title ); + ui_text( title, "Welcome to Skate Rift", 1, k_ui_align_middle_center, 0 ); + + ui_split( panel, k_ui_axis_h, 28, 0, title, panel ); + ui_font_face( &vgf_default_large ); + + menu_checkbox( panel, R == 0, + "Show controls overlay (good for new players)", + &control_overlay.enabled ); + menu_checkbox( panel, R == 1, "Auto connect to global server", + &network_client.auto_connect ); + + ui_rect end = { panel[0], panel[1] + panel[3] - 100, panel[2], 100 }; + menu_checkbox( end, R == 2, "Don't show this again", &menu.skip_starter ); + if( menu_button( end, R == 3, "OK" ) ) + { + menu.page = k_menu_page_main; + skaterift.activity = k_skaterift_default; + } + + menu_try_find_cam( 3 ); + goto menu_draw; + } /* TOP BAR * -------------------------------------------------------------------*/ @@ -381,6 +470,10 @@ void menu_gui(void) if( menu.main_index == vg_list_size(opts) ) menu.main_index --; + + audio_lock(); + audio_oneshot( &audio_ui[3], 1.0f, 0.0f ); + audio_unlock(); } } @@ -455,6 +548,7 @@ void menu_gui(void) if( menu.main_index == k_menu_main_map ) { + menu.bg_blur = 0; ui_font_face( &vgf_default_large ); ui_rect title = { vg.window_x/2 - 512/2, height+8, 512, 64 }; @@ -582,6 +676,7 @@ void menu_gui(void) combined &= route->flags; vg_strnull( &str, buf, sizeof(buf) ); + vg_strcat( &str, "(Race) " ); vg_strcat( &str, mdl_pstr(&world->meta, route->pstr_name)); if( route->flags & k_ent_route_flag_achieve_silver ) @@ -646,6 +741,9 @@ void menu_gui(void) { if( button_down( k_srbind_mback ) ) { + audio_lock(); + audio_oneshot( &audio_ui[3], 1.0f, 0.0f ); + audio_unlock(); skaterift.activity = k_skaterift_default; return; } @@ -655,37 +753,26 @@ void menu_gui(void) rect_copy( list0, list ); ui_rect_pad( list, (ui_px[2]){8,8} ); - i32 *row = (i32 *[]) - { - [k_menu_main_main] = &menu.main_row, - [k_menu_main_settings] = &menu.settings_row, - [k_menu_main_guide] = &menu.guides_row - } - [ menu.main_index ]; - - if( mv < 0 ) *row = (*row) +1; - if( mv > 0 ) *row = vg_max( 0, (*row) -1 ); - /* MAIN / MAIN * -------------------------------------------------------------------*/ if( menu.main_index == k_menu_main_main ) { - *row = vg_min( 2, *row ); + i32 R = menu_nav( &menu.main_row, mv, 2 ); - if( menu_button( list, *row == 0, "Resume" ) ) + if( menu_button( list, R == 0, "Resume" ) ) { skaterift.activity = k_skaterift_default; return; } - if( menu_button( list, *row == 1, "Credits" ) ) + if( menu_button( list, R == 1, "Credits" ) ) { menu.page = k_menu_page_credits; } ui_rect end = { list[0], list[1]+list[3]-64, list[2], 72 }; - if( menu_button( end, *row == 2, "Quit Game" ) ) + if( menu_button( end, R == 2, "Quit Game" ) ) { vg.window_should_close = 1; } @@ -694,67 +781,88 @@ void menu_gui(void) { ui_fill( list0, ui_opacity( GUI_COL_DARK, 0.36f ) ); ui_outline( list0, 1, GUI_COL_NORM, 0 ); - *row = vg_min( 8, *row ); + i32 R = menu_nav( &menu.settings_row, mv, 8 ); ui_font_face( &vgf_default_large ); list[1] -= 8; menu_heading( list, "Game", 0 ); - menu_checkbox( list, *row == 0, "Show controls overlay", + menu_checkbox( list, R == 0, "Show controls overlay", &control_overlay.enabled ); - menu_checkbox( list, *row == 1, "Auto connect to global server", + menu_checkbox( list, R == 1, "Auto connect to global server", &network_client.auto_connect ); menu_heading( list, "Audio/Video", 0 ); - menu_slider( list, *row == 2, "Volume", 0, 100, + menu_slider( list, R == 2, "Volume", 0, 100, &vg_audio.external_global_volume, "%.f%%" ); - menu_slider( list, *row == 3, "Resolution", 0, 100, + menu_slider( list, R == 3, "Resolution", 0, 100, &k_render_scale, "%.f%%" ); - menu_checkbox( list, *row == 4, "Motion Blur", &k_blur_effect ); + menu_checkbox( list, R == 4, "Motion Blur", &k_blur_effect ); menu_heading( list, "Camera", 0 ); - menu_slider( list, *row == 5, "Fov", 97, 135, + menu_slider( list, R == 5, "Fov", 97, 135, &k_fov, "%.1f\xb0" ); - menu_slider( list, *row == 6, "Cam Height", -0.4f, +1.4f, + menu_slider( list, R == 6, "Cam Height", -0.4f, +1.4f, &k_cam_height, vg_lerpf(-0.4f,1.4f,k_cam_height)>=0.0f? "+%.2fm": "%.2fm" ); - menu_checkbox( list, *row == 7, "Invert Y Axis", &k_invert_y ); + menu_checkbox( list, R == 7, "Invert Y Axis", &k_invert_y ); ui_rect end = { list[0], list[1]+list[3]-64, list[2], 72 }; ui_font_face( &vgf_default_small ); menu_heading( end, "Advanced", 0 ); - if( menu_button( end, *row == 8, "Open Engine Settings" ) ) + if( menu_button( end, R == 8, "Open Engine Settings" ) ) { vg_settings_open(); } } else if( menu.main_index == k_menu_main_guide ) { + list0[0] = 8; + list[0] = 16; + ui_fill( list0, ui_opacity( GUI_COL_DARK, 0.36f ) ); ui_outline( list0, 1, GUI_COL_NORM, 0 ); - *row = vg_min( 4, *row ); + i32 R = menu_nav( &menu.guides_row, mv, 7 ); ui_font_face( &vgf_default_large ); list[1] -= 8; + menu_heading( list, "Info", 0 ); + if( R == 0 ) menu_try_find_cam( 1 ); + if( menu_button( list, R == 0, "Where to go" ) ) + { + } + + if( R == 1 ) menu_try_find_cam( 0 ); + if( menu_button( list, R == 1, "Finding worlds" ) ) + { + } + + if( R == 2 ) menu_try_find_cam( 2 ); + if( menu_button( list, R == 2, "Playing Online" ) ) + { + } + menu_heading( list, "Controls", 0 ); - if( menu_button( list, *row == 0, "Skating \xb2" ) ) + if( R >= 3 ) menu_try_find_cam( 3 ); + if( menu_button( list, R == 3, "Skating \xb2" ) ) { } - if( menu_button( list, *row == 1, "Tricks \xb2" ) ) + if( menu_button( list, R == 4, "Tricks \xb2" ) ) { } menu_heading( list, "Workshop", 0 ); - if( menu_button( list, *row == 2, "Create a Board \xb2" ) ) + if( menu_button( list, R == 5, "Create a Board \xb2" ) ) { } - if( menu_button( list, *row == 3, "Create a World \xb2" ) ) + if( menu_button( list, R == 6, "Create a World \xb2" ) ) { } - if( menu_button( list, *row == 4, "Create a Playermodel \xb2" ) ) + if( menu_button( list, R == 7, "Create a Playermodel \xb2" ) ) { } } + } menu_draw: diff --git a/menu.h b/menu.h index 237a82a..b7b8f68 100644 --- a/menu.h +++ b/menu.h @@ -11,7 +11,8 @@ enum menu_page k_menu_page_starter, k_menu_page_premium, k_menu_page_main, - k_menu_page_credits + k_menu_page_credits, + k_menu_page_help, }; enum menu_main_subpage @@ -30,10 +31,14 @@ struct global_menu i32 main_index, main_row, settings_row, - guides_row; + guides_row, + intro_row; f32 mouse_dist; /* used for waking up mouse */ f32 repeater; + + bool bg_blur; + ent_camera *bg_cam; } extern menu; diff --git a/skaterift.c b/skaterift.c index dd04015..89ee898 100644 --- a/skaterift.c +++ b/skaterift.c @@ -45,6 +45,7 @@ #include "ent_miniworld.h" #include "ent_skateshop.h" #include "ent_npc.h" +#include "ent_camera.h" #include "world_map.h" #include "gui.h" #include "workshop.h" @@ -309,9 +310,19 @@ void vg_pre_update(void) /* time rate */ f32 target = 1; - if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) - { + if( skaterift.activity & k_skaterift_replay ) target = 0; + + v3f listen_co; + v3_copy( localplayer.rb.co, listen_co ); + + if( skaterift.activity & k_skaterift_menu ) + { + if( menu.bg_cam ) + { + v3_copy( menu.bg_cam->transform.co, listen_co ); + } + else target = 0; } vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) ); @@ -331,7 +342,7 @@ void vg_pre_update(void) skateshop_world_preupdate( world_current_instance() ); world_update( world_current_instance(), localplayer.rb.co ); - audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co ); + audio_ambient_sprites_update( world_current_instance(), listen_co ); world_map_pre_update(); } @@ -424,7 +435,7 @@ static void present_view_with_post_processing(void){ shader_blitblur_uGlitchStrength( glitch_strength ); v2f override; - if( (skaterift.activity == k_skaterift_menu) && !menu_viewing_map() ) + if( (skaterift.activity == k_skaterift_menu) && menu.bg_blur ) v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override ); else v2_zero( override ); @@ -443,7 +454,14 @@ static void present_view_with_post_processing(void){ render_fsquad(); } -static void render_player_transparent(void){ +static void render_player_transparent(void) +{ + if( (menu.page == k_menu_page_main) && + (menu.main_index == k_menu_main_guide) ) + { + return; + } + static vg_camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW SAIS OTHERWISE */ @@ -461,7 +479,15 @@ static void render_player_transparent(void){ player__render( &small_cam ); } -static world_instance *get_view_world(void){ +static world_instance *get_view_world(void) +{ + if( (skaterift.activity & k_skaterift_menu) && + (menu.page == k_menu_page_main) && + (menu.main_index == k_menu_main_guide) ) + { + return &world_static.instances[0]; + } + world_instance *view_world = world_current_instance(); if( localplayer.gate_waiting && (localplayer.gate_waiting->flags & k_ent_gate_nonlocal) ){ @@ -589,6 +615,11 @@ static void skaterift_composite_maincamera(void) skaterift.cam.nearz = 0.1f; skaterift.cam.farz = 2100.0f; + if( (skaterift.activity == k_skaterift_menu) && menu.bg_cam ) + { + ent_camera_unpack( menu.bg_cam, &skaterift.cam ); + } + if( menu_viewing_map() ) { vg_camera_copy( &world_map.cam, &skaterift.cam ); @@ -613,8 +644,10 @@ static void skaterift_composite_maincamera(void) vg_camera_finalize( &skaterift.cam ); } -static void render_main_game(void){ - if( skaterift.activity == k_skaterift_replay ){ +static void render_main_game(void) +{ + if( skaterift.activity == k_skaterift_replay ) + { player__animate_from_replay( &player_replay.local ); } else{ @@ -629,13 +662,13 @@ static void render_main_game(void){ skaterift_composite_maincamera(); /* --------------------------------------------------------------------- */ - if( menu_viewing_map() ) + if( !menu_viewing_map() ) { world_instance *world = world_current_instance(); render_world_cubemaps( world ); ent_gate *nlg = world->rendering_gate; - if( nlg && nlg->flags & k_ent_gate_nonlocal ) + if( nlg && (nlg->flags & k_ent_gate_nonlocal) ) render_world_cubemaps( &world_static.instances[nlg->target] ); } @@ -808,3 +841,4 @@ void vg_gui(void) #include "ent_npc.c" #include "model.c" #include "control_overlay.c" +#include "ent_camera.c" diff --git a/world_entity.c b/world_entity.c index cdc76f1..37e662f 100644 --- a/world_entity.c +++ b/world_entity.c @@ -14,6 +14,7 @@ #include "ent_glider.h" #include "ent_region.h" #include "ent_npc.h" +#include "ent_camera.h" #include "input.h" #include "player_walk.h" @@ -85,17 +86,14 @@ void world_entity_clear_focus(void) void world_entity_focus_camera( world_instance *world, u32 uid ) { - if( mdl_entity_id_type( uid ) == k_ent_camera ){ + if( mdl_entity_id_type( uid ) == k_ent_camera ) + { u32 index = mdl_entity_id_id( uid ); ent_camera *cam = mdl_arritm( &world->ent_camera, index ); - - v3f dir = {0.0f,-1.0f,0.0f}; - mdl_transform_vector( &cam->transform, dir, dir ); - v3_angles( dir, world_static.focus_cam.angles ); - v3_copy( cam->transform.co, world_static.focus_cam.pos ); - world_static.focus_cam.fov = cam->fov; + ent_camera_unpack( cam, &world_static.focus_cam ); } - else { + else + { vg_camera_copy( &localplayer.cam, &world_static.focus_cam ); /* TODO ? */ -- 2.25.1