| … | |
… | |
| 57 | |
57 | |
| 58 | $self->connect_ext (capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
| 59 | my (%cap) = @_; |
59 | my (%cap) = @_; |
| 60 | |
60 | |
| 61 | #$self->send ("setup sound 0"); # we use a different protocol |
61 | #$self->send ("setup sound 0"); # we use a different protocol |
| 62 | |
62 | $self->update_fx_want; |
| 63 | $self->send_exti_msg (fx_want => { |
|
|
| 64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
| 65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
| 66 | }); |
|
|
| 67 | |
63 | |
| 68 | if (my $ts = $cap{tileset}) { |
64 | if (my $ts = $cap{tileset}) { |
| 69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
| 70 | $self->{tileset} = $default; |
66 | $self->{tileset} = $default; |
| 71 | $self->{tilesize} = $default->[3]; |
67 | $self->{tilesize} = $default->[3]; |
| … | |
… | |
| 221 | |
217 | |
| 222 | # per server |
218 | # per server |
| 223 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
219 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| 224 | |
220 | |
| 225 | $self |
221 | $self |
|
|
222 | } |
|
|
223 | |
|
|
224 | sub update_fx_want { |
|
|
225 | my ($self) = @_; |
|
|
226 | |
|
|
227 | $self->send_exti_msg (fx_want => { |
|
|
228 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
229 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
230 | }); |
| 226 | } |
231 | } |
| 227 | |
232 | |
| 228 | sub logprint { |
233 | sub logprint { |
| 229 | my ($self, @a) = @_; |
234 | my ($self, @a) = @_; |
| 230 | |
235 | |
| … | |
… | |
| 501 | } |
506 | } |
| 502 | |
507 | |
| 503 | sub feed_map1a { |
508 | sub feed_map1a { |
| 504 | my ($self, $data) = @_; |
509 | my ($self, $data) = @_; |
| 505 | |
510 | |
| 506 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
511 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
512 | my $delay; |
|
|
513 | |
|
|
514 | for my $tile (@$missing) { |
|
|
515 | next if $self->{delay}{$tile}; |
|
|
516 | |
|
|
517 | $delay = 1; |
|
|
518 | |
|
|
519 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
520 | $tex->upload; |
|
|
521 | } else { |
|
|
522 | $self->{delay}{$tile} = 1; |
|
|
523 | |
|
|
524 | # we assume the face is in-flight and will eventually come |
|
|
525 | push @{$self->{face_cb}{$tile}}, sub { |
|
|
526 | delete $self->{delay}{$tile}; |
|
|
527 | $_[0]->upload; |
|
|
528 | }; |
|
|
529 | } |
|
|
530 | } |
|
|
531 | |
|
|
532 | if ($delay) { |
|
|
533 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
534 | Event->timer (after => 0.03, cb => sub { |
|
|
535 | $_[0]->w->cancel; |
|
|
536 | $self->{map_widget}->update; |
|
|
537 | }); |
|
|
538 | } else { |
| 507 | $self->{map_widget}->update; |
539 | $self->{map_widget}->update; |
|
|
540 | } |
| 508 | } |
541 | } |
| 509 | |
542 | |
| 510 | sub magicmap { |
543 | sub magicmap { |
| 511 | my ($self, $w, $h, $x, $y, $data) = @_; |
544 | my ($self, $w, $h, $x, $y, $data) = @_; |
| 512 | |
545 | |
| … | |
… | |
| 716 | $self->{map}->set_tileid ($facenum => $id); |
749 | $self->{map}->set_tileid ($facenum => $id); |
| 717 | |
750 | |
| 718 | CFPlus::DB::get tilecache => $id, $cb; |
751 | CFPlus::DB::get tilecache => $id, $cb; |
| 719 | |
752 | |
| 720 | } elsif ($face->{type} & 1) { # with metadata |
753 | } elsif ($face->{type} & 1) { # with metadata |
| 721 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
| 722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
754 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
| 723 | } |
755 | } |
| 724 | } |
756 | } |
| 725 | |
757 | |
| 726 | sub face_update { |
758 | sub face_update { |
| … | |
… | |
| 731 | if $changed; |
763 | if $changed; |
| 732 | |
764 | |
| 733 | $self->have_tile ($face->{id}); |
765 | $self->have_tile ($face->{id}); |
| 734 | |
766 | |
| 735 | } elsif ($face->{type} & 1) { # split metadata |
767 | } elsif ($face->{type} & 1) { # split metadata |
| 736 | my $cb = sub { }; |
|
|
| 737 | |
|
|
| 738 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
| 739 | $cb = sub { |
|
|
| 740 | $self->{music_meta}{$facenum} = $face; |
|
|
| 741 | |
|
|
| 742 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
| 743 | if $changed; |
|
|
| 744 | |
|
|
| 745 | &::audio_music_push ($facenum); |
|
|
| 746 | }; |
|
|
| 747 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
| 748 | $cb = sub { |
|
|
| 749 | $self->{sound_meta}{$facenum} = $face; |
|
|
| 750 | |
|
|
| 751 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
| 752 | if $changed; |
|
|
| 753 | |
|
|
| 754 | &::audio_sound_push ($facenum); |
|
|
| 755 | }; |
|
|
| 756 | } |
|
|
| 757 | |
|
|
| 758 | if ($changed) { # new data |
768 | if ($changed) { # new data |
| 759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
769 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
770 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 760 | |
771 | |
| 761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
772 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
| 762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
773 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
| 763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
| 764 | ::add_license ($face); |
|
|
| 765 | $cb->(); |
|
|
| 766 | }; |
|
|
| 767 | |
|
|
| 768 | } else { |
774 | } else { |
| 769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
775 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
776 | } |
|
|
777 | |
| 770 | ::add_license ($face); |
778 | ::add_license ($face); |
| 771 | $cb->(); |
779 | |
|
|
780 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
781 | $self->{music_meta}{$facenum} = $face; |
|
|
782 | |
|
|
783 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
784 | if $changed; |
|
|
785 | |
|
|
786 | &::audio_music_push ($facenum); |
|
|
787 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
788 | $self->{sound_meta}{$facenum} = $face; |
|
|
789 | |
|
|
790 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
791 | if $changed; |
|
|
792 | |
|
|
793 | &::audio_sound_push ($facenum); |
| 772 | } |
794 | } |
|
|
795 | |
| 773 | } |
796 | } |
| 774 | } |
797 | } |
| 775 | |
798 | |
| 776 | sub smooth_update { |
799 | sub smooth_update { |
| 777 | my ($self, $facenum, $face) = @_; |
800 | my ($self, $facenum, $face) = @_; |
| … | |
… | |
| 782 | sub have_tile { |
805 | sub have_tile { |
| 783 | my ($self, $tile) = @_; |
806 | my ($self, $tile) = @_; |
| 784 | |
807 | |
| 785 | return unless $self->{map}; |
808 | return unless $self->{map}; |
| 786 | |
809 | |
| 787 | $self->{texture}[$tile] ||= my $tex = |
810 | my $tex = $self->{texture}[$tile] ||= |
| 788 | new CFPlus::Texture |
811 | new CFPlus::Texture |
| 789 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
812 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
| 790 | |
813 | |
| 791 | $_->() for @{(delete $self->{face_cb}{$tile}) || []}; |
814 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
| 792 | } |
815 | } |
| 793 | |
816 | |
| 794 | sub connect_face_update { |
817 | sub connect_face_update { |
| 795 | my ($self, $id, $cb) = @_; |
818 | my ($self, $id, $cb) = @_; |
| 796 | |
819 | |
| … | |
… | |
| 991 | } |
1014 | } |
| 992 | |
1015 | |
| 993 | $::FLOORBOX->add_at (@add); |
1016 | $::FLOORBOX->add_at (@add); |
| 994 | }); |
1017 | }); |
| 995 | |
1018 | |
| 996 | $::WANT_REFRESH++; |
1019 | $::WANT_REFRESH->start; |
| 997 | } |
1020 | } |
| 998 | |
1021 | |
| 999 | sub set_opencont { |
1022 | sub set_opencont { |
| 1000 | my ($conn, $tag, $name) = @_; |
1023 | my ($conn, $tag, $name) = @_; |
| 1001 | $conn->{open_container} = $tag; |
1024 | $conn->{open_container} = $tag; |
