some refactors before the storm
[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c
1 /*
2 * =============================================================================
3 *
4 * Copyright . . . -----, ,----- ,---. .---.
5 * 2021-2023 |\ /| | / | | | | /|
6 * | \ / | +-- / +----- +---' | / |
7 * | \ / | | / | | \ | / |
8 * | \/ | | / | | \ | / |
9 * ' ' '--' [] '----- '----- ' ' '---' SOFTWARE
10 *
11 * =============================================================================
12 */
13
14 #define SR_NETWORKED
15
16 #ifndef VG_RELEASE
17 #define VG_DEVWINDOW
18 #endif
19
20 /*
21 * system headers
22 * --------------------- */
23
24 #include "skaterift.h"
25 #include "steam.h"
26 #include "render.h"
27 #include "audio.h"
28
29 #include "world.h"
30
31 #include "font.h"
32 #include "player.h"
33
34 #include "network.h"
35 #include "menu.h"
36 #include "vehicle.h"
37 #include "save.h"
38 #include "player_remote.h"
39
40 /* unity build
41 * ----------------- */
42
43 #include "world.c"
44 #include "player.c"
45 #include "vehicle.c"
46 #include "entity.c"
47 #include "workshop.c"
48 #include "addon.c"
49 #include "highscores.c"
50 #include "save.c"
51 #include "world_map.c"
52 #include "network.c"
53 #include "player_remote.c"
54 #include "vg/vg_audio_dsp.h"
55 #include "world_routes_ui.c"
56 #include "particle.c"
57 #include "player_effects.c"
58 #include "freecam.c"
59
60 static int k_tools_mode = 0;
61
62 int main( int argc, char *argv[] ){
63 vg_mem.use_libc_malloc = 0;
64 vg_set_mem_quota( 160*1024*1024 );
65 vg_enter( argc, argv, "Voyager Game Engine" );
66 return 0;
67 }
68
69 static void vg_launch_opt(void){
70 const char *arg;
71 if( vg_long_opt( "noauth" ) ){
72 network_client.auth_mode = eServerModeNoAuthentication;
73 }
74
75 if( (arg = vg_long_opt_arg( "server" )) ){
76 vg_strncpy( arg, network_client.server_adress, 64,
77 k_strncpy_overflow_fatal );
78 }
79
80 if( vg_long_opt( "tools" ) ){
81 k_tools_mode = 1;
82 }
83
84 if( vg_long_opt( "demo" ) ){
85 skaterift.demo_mode = 1;
86 }
87 }
88
89 static void vg_preload(void){
90 vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" );
91 vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" );
92 vg_info(" | \\ / | +-- / +----- +---' | / | \n" );
93 vg_info(" | \\ / | | / | | \\ | / | \n" );
94 vg_info(" | \\/ | | / | | \\ | / | \n" );
95 vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
96 "SOFTWARE\n" );
97
98 /* please forgive me! */
99 u32 sz; char *drm;
100 if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) )
101 if( !strcmp(drm, "blibby!") )
102 skaterift.demo_mode = 0;
103
104 vg_loader_step( remote_players_init, NULL );
105
106 if( k_tools_mode )
107 return;
108
109 steam_init();
110 vg_loader_step( NULL, steam_end );
111 vg_loader_step( network_init, network_end );
112 }
113
114 static void async_skaterift_player_start( void *payload, u32 size ){
115 world_switch_instance(0);
116 }
117
118 static void async_call_ready( void *payload, u32 size ){
119 skaterift.op = k_async_op_none;
120 }
121
122 static void skaterift_restore_state(void){
123 savedata_file sav;
124 strcpy( sav.path, str_skaterift_main_save );
125 savedata_file_read( &sav );
126
127 vg_msg kvsav;
128 vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
129 skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 );
130
131 u32 board_reg_id = 0,
132 player_reg_id = 0;
133
134 vg_msg_cursor orig = kvsav.cur;
135 if( vg_msg_seekframe( &kvsav, "player" ) ){
136 addon_alias q;
137
138 /* board */
139 skaterift_read_addon_alias( &kvsav, "board", k_addon_type_board, &q );
140 u32 reg_id = addon_match( &q );
141 if( reg_id != 0xffffffff )
142 board_reg_id = reg_id;
143
144 /* playermodel */
145 skaterift_read_addon_alias( &kvsav, "playermodel",
146 k_addon_type_player, &q );
147 reg_id = addon_match( &q );
148 if( reg_id != 0xffffffff )
149 player_reg_id = reg_id;
150 }
151
152 localplayer.board_view_slot =
153 addon_cache_create_viewer( k_addon_type_board, board_reg_id );
154 localplayer.playermodel_view_slot =
155 addon_cache_create_viewer( k_addon_type_player, player_reg_id );
156
157 kvsav.cur = orig;
158 }
159
160 static addon_reg *skaterift_mount_world_unloadable( const char *path, u32 ext ){
161 addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" );
162 reg->flags |= (ADDON_REG_HIDDEN | ext);
163 return reg;
164 }
165
166 static void vg_load(void){
167 if( k_tools_mode ){
168 vg_async_call( async_call_ready, NULL, 0 );
169 return;
170 }
171
172 vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
173 vg_console_reg_cmd( "switch_active_instance",
174 skaterift_switch_instance_cmd, NULL );
175 vg_console_reg_cmd( "fc", freecam_cmd, NULL );
176 vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 );
177
178 vg_loader_step( render_init, NULL );
179 vg_loader_step( menu_init, NULL );
180 vg_loader_step( world_init, NULL );
181 vg_loader_step( vehicle_init, NULL );
182 vg_loader_step( font3d_init, NULL );
183 vg_loader_step( gui_init, NULL );
184
185 vg_loader_step( player_init, NULL );
186 vg_loader_step( player_ragdoll_init, NULL );
187
188 /* content stuff */
189 vg_loader_step( addon_system_init, NULL );
190 vg_loader_step( workshop_init, NULL );
191 vg_loader_step( skateshop_init, NULL );
192
193 /* player setup */
194 u32 bytes = 1024*1024*10;
195 skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
196 skaterift.replay.size = bytes;
197 replay_clear( &skaterift.replay );
198
199 particle_alloc( &particles_grind, 300 );
200
201 player_load_animation_reference( "models/ch_none.mdl" );
202 player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
203 player__bind();
204
205 player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
206
207 /* --------------------- */
208
209 vg_bake_shaders();
210 vg_loader_step( audio_init, audio_free );
211
212 /* 'systems' are completely loaded now */
213
214 /* Completing addon registrations
215 * -------------------------------------
216 */
217
218 /* hub world */
219 addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub", 0 );
220 skaterift_mount_world_unloadable( "maps/mp_spawn",
221 ADDON_REG_CITY|ADDON_REG_PREMIUM );
222 skaterift_mount_world_unloadable( "maps/mp_mtzero",
223 ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
224 skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
225
226 /* load home/permanent world manually */
227 world_static.load_state = k_world_loader_load;
228
229 struct world_load_args args = {
230 .purpose = k_world_purpose_hub,
231 .reg = hub
232 };
233 skaterift_world_load_thread( &args );
234
235 vg_async_call( async_skaterift_player_start, NULL, 0 );
236 vg_async_stall();
237
238 vg_console_load_autos();
239 menu_link();
240
241 addon_mount_content_folder( k_addon_type_player,
242 "playermodels", ".mdl" );
243 addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
244 addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
245 addon_mount_workshop_items();
246 vg_async_call( async_addon_reg_update, NULL, 0 );
247 vg_async_stall();
248
249 /* and now */
250 skaterift_restore_state();
251 update_ach_models();
252
253 vg_loader_step( NULL, skaterift_autosave_synchronous );
254
255 //board_processview_thread(NULL);
256 vg_async_call( async_call_ready, NULL, 0 );
257 }
258
259 static void draw_origin_axis(void){
260 vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 1.0f, 0.0f, 0.0f }, 0xffff0000 );
261 vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
262 vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
263 }
264 static void skaterift_change_client_world_preupdate(void);
265
266 /*
267 * UPDATE LOOP
268 * ---------------------------------------------------------------------------*/
269
270 static void vg_pre_update(void){
271 skaterift_preupdate_inputs();
272
273 if( k_tools_mode ) return;
274
275 steam_update();
276 if( skaterift.op == k_async_op_clientloading ) return;
277 if( world_static.load_state == k_world_loader_preload )
278 skaterift_change_client_world_preupdate();
279
280 draw_origin_axis();
281 skateshop_autostart_loading();
282 network_update();
283
284 /* time rate */
285 f32 target = 1;
286 if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
287 k_skaterift_world_map) ){
288 target = 0;
289 }
290
291 vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
292 vg.time_rate = vg_smoothstepf( skaterift.time_rate );
293
294 /* TODO: how can we compress this? */
295 ent_miniworld_preupdate();
296 player__pre_update();
297 world_entity_focus_preupdate();
298 skaterift_replay_pre_update();
299 remote_sfx_pre_update();
300 skateshop_world_preupdate( world_current_instance() );
301
302 world_update( world_current_instance(), localplayer.rb.co );
303 audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
304 world_map_pre_update();
305 }
306
307 static void vg_fixed_update(void){
308 if( k_tools_mode ) return;
309 if( skaterift.op == k_async_op_clientloading ) return;
310
311 world_routes_fixedupdate( world_current_instance() );
312 player__update();
313 vehicle_update_fixed();
314 }
315
316 static void vg_post_update(void){
317 if( k_tools_mode ) return;
318 if( skaterift.op == k_async_op_clientloading ) return;
319
320 player__post_update();
321
322 float dist;
323 int sample_index;
324 world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
325
326 audio_lock();
327 vg_dsp.echo_distances[sample_index] = dist;
328
329 v3f ears = { 1.0f,0.0f,0.0f };
330 m3x3_mulv( skaterift.cam.transform, ears, ears );
331 v3_copy( ears, vg_audio.external_listener_ears );
332 v3_copy( skaterift.cam.transform[3], vg_audio.external_listener_pos );
333
334 if( localplayer.gate_waiting ){
335 m4x3_mulv( localplayer.gate_waiting->transport,
336 vg_audio.external_listener_pos,
337 vg_audio.external_listener_pos );
338 }
339
340 v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
341 audio_unlock();
342
343 vehicle_update_post();
344
345 if( vg.time - skaterift.last_autosave > 20.0 ){
346 if( skaterift_autosave(1) ){
347 skaterift.last_autosave = vg.time;
348 }
349 }
350 }
351
352 /*
353 * RENDERING
354 * ---------------------------------------------------------------------------*/
355
356 static void vg_framebuffer_resize( int w, int h ){
357 render_fb_resize();
358 }
359
360 static void present_view_with_post_processing(void){
361 glBindFramebuffer( GL_FRAMEBUFFER, 0 );
362 glViewport( 0,0, vg.window_x, vg.window_y );
363
364 glEnable(GL_BLEND);
365 glDisable(GL_DEPTH_TEST);
366 glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA);
367 glBlendEquation(GL_FUNC_ADD);
368
369 v2f inverse;
370 render_fb_inverse_ratio( gpipeline.fb_main, inverse );
371
372 if( k_blur_effect ){
373 shader_blitblur_use();
374 shader_blitblur_uTexMain( 0 );
375 shader_blitblur_uTexMotion( 1 );
376 shader_blitblur_uBlurStrength( k_blur_strength /
377 (vg.time_frame_delta*60.0) );
378 shader_blitblur_uInverseRatio( inverse );
379
380 inverse[0] -= 0.0001f;
381 inverse[1] -= 0.0001f;
382 shader_blitblur_uClampUv( inverse );
383
384 static f64 effect_time = 133.0;
385 effect_time += vg.time_frame_delta;
386 shader_blitblur_uTime( effect_time );
387
388 f32 glitch_strength = 0.0f;
389 if( skaterift.activity == k_skaterift_replay ){
390 glitch_strength = 0.005f;
391 if( skaterift.replay_control == k_replay_control_play )
392 glitch_strength = 0.005f;
393 else
394 glitch_strength += 0.005f*skaterift.track_velocity;
395 }
396 shader_blitblur_uGlitchStrength( glitch_strength );
397
398 v2f override;
399 if( skaterift.activity == k_skaterift_menu )
400 v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
401 else
402 v2_zero( override );
403 shader_blitblur_uOverrideDir( override );
404
405 render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
406 render_fb_bind_texture( gpipeline.fb_main, 1, 1 );
407 }
408 else{
409 shader_blit_use();
410 shader_blit_uTexMain( 0 );
411 shader_blit_uInverseRatio( inverse );
412 render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
413 }
414
415 render_fsquad();
416 }
417
418 static void render_player_transparent(void){
419 static camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW
420 SAIS OTHERWISE */
421
422 m4x3_copy( skaterift.cam.transform, small_cam.transform );
423
424 small_cam.fov = skaterift.cam.fov;
425 small_cam.nearz = 0.05f;
426 small_cam.farz = 60.0f;
427
428 camera_update_view( &small_cam );
429 camera_update_projection( &small_cam );
430 camera_finalize( &small_cam );
431
432 /* Draw player to window buffer and blend background ontop */
433 player__render( &small_cam );
434 }
435
436 static world_instance *get_view_world(void){
437 world_instance *view_world = world_current_instance();
438 if( localplayer.gate_waiting &&
439 (localplayer.gate_waiting->flags & k_ent_gate_nonlocal) ){
440 view_world = &world_static.instances[world_static.active_instance ^ 0x1];
441 }
442
443 return view_world;
444 }
445
446 static void render_scene(void){
447 /* Draw world */
448 glEnable( GL_DEPTH_TEST );
449
450 for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
451 if( world_static.instances[i].status == k_world_status_loaded ){
452 world_prerender( &world_static.instances[i] );
453 }
454 }
455
456 if( skaterift.activity == k_skaterift_world_map ){
457 world_instance *world = world_current_instance();
458 glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
459
460 v3f bg;
461 v3_muls( world->ub_lighting.g_daysky_colour,
462 world->ub_lighting.g_day_phase -
463 world->ub_lighting.g_sunset_phase*0.1f, bg );
464
465 v3_muladds( bg, world->ub_lighting.g_sunset_colour,
466 (1.0f-0.5f)*world->ub_lighting.g_sunset_phase, bg );
467
468 v3_muladds( bg, world->ub_lighting.g_nightsky_colour,
469 (1.0f-world->ub_lighting.g_day_phase), bg );
470
471 glClearColor( bg[0], bg[1], bg[2], 0.0f );
472 glClear( GL_COLOR_BUFFER_BIT );
473 glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0,
474 GL_COLOR_ATTACHMENT1 } );
475
476 m4x3f identity;
477 m4x3_identity( identity );
478 render_world_override( world, world, identity, &skaterift.cam,
479 world_map.spawn,
480 (v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
481 render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
482 return;
483 }
484
485 world_instance *view_world = get_view_world();
486 render_world( view_world, &skaterift.cam, 0, 0, 1, 1 );
487
488 particle_system_update( &particles_grind, vg.time_delta );
489 //particle_system_debug( &particles_grind );
490 particle_system_prerender( &particles_grind );
491 particle_system_render( &particles_grind, &skaterift.cam );
492
493 /*
494 * render transition
495 */
496 if( global_miniworld.transition == 0 )
497 return;
498
499 world_instance *holdout_world = NULL;
500 f32 t = 0.0f;
501
502 if( global_miniworld.transition == 1 ){
503 holdout_world = &world_static.instances[ k_world_purpose_hub ];
504 t = global_miniworld.t;
505 }
506 else{
507 holdout_world = &world_static.instances[ k_world_purpose_client ];
508 t = 1.0f-global_miniworld.t;
509 }
510
511 if( holdout_world->status != k_world_status_loaded )
512 return;
513
514 t = vg_smoothstepf( t );
515
516 glEnable( GL_STENCIL_TEST );
517 glDisable( GL_DEPTH_TEST );
518 glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );
519 glStencilFunc( GL_ALWAYS, 1, 0xFF );
520 glStencilMask( 0xFF );
521
522 shader_blit_transition_use();
523 shader_blit_transition_uInverseRatio( (v2f){1.0f,1.0f} );
524 shader_blit_transition_uT( -(sqrtf(2)+0.5f) * t );
525
526 render_fsquad();
527 render_world( holdout_world, &global_miniworld.cam, 1, 0, 1, 1 );
528 }
529
530 static void skaterift_composite_maincamera(void){
531 camera_lerp( &localplayer.cam, &world_static.focus_cam,
532 vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
533
534 if( skaterift.freecam ){
535 freecam_preupdate();
536 v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos );
537 v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles );
538 skaterift.cam.fov = skaterift.replay_freecam.fov;
539 }
540 else {
541 if( skaterift.activity == k_skaterift_replay ){
542 replay_get_camera( &skaterift.replay, &skaterift.cam );
543 }
544 }
545
546 skaterift.cam.nearz = 0.1f;
547 skaterift.cam.farz = 2100.0f;
548
549 if( skaterift.activity == k_skaterift_world_map ){
550 camera_copy( &world_map.cam, &skaterift.cam );
551 skaterift.cam.nearz = 4.0f;
552 skaterift.cam.farz = 3100.0f;
553 }
554
555 if( global_miniworld.transition ){
556 f32 dt = vg.time_frame_delta / 2.0f,
557 s = vg_signf( global_miniworld.transition );
558 global_miniworld.t += s * dt;
559
560 if( (global_miniworld.t > 1.0f) || (global_miniworld.t < 0.0f) ){
561 global_miniworld.t = vg_clampf( global_miniworld.t, 0.0f, 1.0f );
562 global_miniworld.transition = 0;
563 }
564 }
565
566 camera_update_transform( &skaterift.cam );
567 camera_update_view( &skaterift.cam );
568 camera_update_projection( &skaterift.cam );
569 camera_finalize( &skaterift.cam );
570 }
571
572 static void render_main_game(void){
573 if( skaterift.activity == k_skaterift_replay ){
574 player__animate_from_replay( &skaterift.replay );
575 }
576 else{
577 player__animate();
578 skaterift_record_frame( &skaterift.replay, 0 );
579 }
580 animate_remote_players();
581 player__pre_render();
582
583 skaterift_composite_maincamera();
584
585 /* --------------------------------------------------------------------- */
586 if( skaterift.activity != k_skaterift_world_map ){
587 world_instance *world = world_current_instance();
588 render_world_cubemaps( world );
589
590 ent_gate *nlg = world->rendering_gate;
591 if( nlg && nlg->flags & k_ent_gate_nonlocal )
592 render_world_cubemaps( &world_static.instances[nlg->target] );
593 }
594
595 /* variable res target */
596 render_fb_bind( gpipeline.fb_main, 1 );
597 glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
598 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
599
600 render_scene();
601 glEnable( GL_DEPTH_TEST );
602
603 /* full res target */
604 glBindFramebuffer( GL_FRAMEBUFFER, 0 );
605 glViewport( 0,0, vg.window_x, vg.window_y );
606
607 render_player_transparent(); /* needs to read the depth buffer before we fuck
608 it up with the oblique rendering inside the
609 portals */
610
611 /* continue with variable rate */
612 if( !global_miniworld.transition &&
613 (skaterift.activity != k_skaterift_world_map) ){
614 render_fb_bind( gpipeline.fb_main, 1 );
615 render_world_gates( get_view_world(), &skaterift.cam );
616 }
617
618 /* composite */
619 present_view_with_post_processing();
620
621 skaterift_replay_post_render();
622 }
623
624 static void vg_render(void){
625 if( k_tools_mode ){
626 glBindFramebuffer( GL_FRAMEBUFFER, 0 );
627 glViewport( 0,0, vg.window_x, vg.window_y );
628 glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
629 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
630 return;
631 }
632
633 if( skaterift.op == k_async_op_clientloading ){
634 _vg_loader_render();
635 return;
636 }
637
638 glBindFramebuffer( GL_FRAMEBUFFER, 0 );
639
640 glViewport( 0,0, vg.window_x, vg.window_y );
641 glDisable( GL_DEPTH_TEST );
642 glDisable( GL_BLEND );
643
644 glClearColor( 1.0f, 0.0f, 0.0f, 0.0f );
645 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
646
647 render_main_game();
648 m4x4_copy( skaterift.cam.mtx.pv, vg.pv );
649
650 /* Other shite */
651 glDisable(GL_BLEND);
652 glDisable(GL_DEPTH_TEST);
653 vg_lines_drawall();
654 glViewport( 0,0, vg.window_x, vg.window_y );
655 gui_draw();
656 }
657
658 static void vg_gui(void){
659 if( skaterift.op == k_async_op_clientloading ) return;
660
661 menu_update();
662 if( skaterift.activity == k_skaterift_menu ){
663 glClear( GL_DEPTH_BUFFER_BIT );
664 menu_render();
665 }
666
667 player__im_gui();
668 world_instance *world = world_current_instance();
669
670 world_routes_imgui( world );
671 skaterift_replay_imgui();
672 workshop_form_gui();
673 render_view_framebuffer_ui();
674 remote_player_network_imgui( vg.pv );
675
676 if( skaterift.activity == k_skaterift_world_map ){
677 remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
678 remote_players_imgui_lobby();
679 }
680 else {
681 remote_players_chat_imgui(); /* TODO: conditional */
682 remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
683 }
684 }