| … | |
… | |
| 21 | |
21 | |
| 22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
23 | setup_req => { |
| 24 | extmap => 1, |
24 | extmap => 1, |
| 25 | excmd => 1, |
25 | excmd => 1, |
| 26 | xwidget => 1,#d# |
26 | ywidget => 1,#d# |
| 27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
| 28 | }, |
28 | }, |
| 29 | ); |
29 | ); |
| 30 | |
30 | |
| 31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
| … | |
… | |
| 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 | |
| … | |
… | |
| 544 | do { |
549 | do { |
| 545 | $id = pop @{$self->{bg_fetch}} |
550 | $id = pop @{$self->{bg_fetch}} |
| 546 | or return; |
551 | or return; |
| 547 | } while $self->{texture}[$id]; |
552 | } while $self->{texture}[$id]; |
| 548 | |
553 | |
| 549 | CFPlus::DB::get tilecache => $id, sub { |
554 | CFPlus::DB::exists tilecache => $id, sub { |
| 550 | my ($data) = @_; |
555 | my ($exists) = @_; |
| 551 | |
556 | |
| 552 | return unless $self->{map}; # stop when destroyed |
557 | return unless $self->{map}; # stop when destroyed |
| 553 | |
558 | |
| 554 | $self->set_texture ($id => $data) |
559 | $self->have_tile ($id) |
| 555 | if defined $data; |
560 | if $exists; |
| 556 | |
561 | |
| 557 | $self->bg_fetch; |
562 | $self->bg_fetch; |
| 558 | }; |
563 | }; |
| 559 | } |
564 | } |
| 560 | |
565 | |
| … | |
… | |
| 728 | |
733 | |
| 729 | if ($face->{type} == 0) { # FT_FACE |
734 | if ($face->{type} == 0) { # FT_FACE |
| 730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
735 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
| 731 | if $changed; |
736 | if $changed; |
| 732 | |
737 | |
| 733 | $self->set_texture ($face->{id} => delete $face->{data}); |
738 | $self->have_tile ($face->{id}); |
| 734 | |
739 | |
| 735 | } elsif ($face->{type} & 1) { # split metadata |
740 | } 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 |
741 | if ($changed) { # new data |
| 759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
742 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
743 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 760 | |
744 | |
| 761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
745 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
| 762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
746 | 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 { |
747 | } else { |
| 769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
748 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
749 | } |
|
|
750 | |
| 770 | ::add_license ($face); |
751 | ::add_license ($face); |
| 771 | $cb->(); |
752 | |
|
|
753 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
754 | $self->{music_meta}{$facenum} = $face; |
|
|
755 | |
|
|
756 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
757 | if $changed; |
|
|
758 | |
|
|
759 | &::audio_music_push ($facenum); |
|
|
760 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
761 | $self->{sound_meta}{$facenum} = $face; |
|
|
762 | |
|
|
763 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
764 | if $changed; |
|
|
765 | |
|
|
766 | &::audio_sound_push ($facenum); |
| 772 | } |
767 | } |
|
|
768 | |
| 773 | } |
769 | } |
| 774 | } |
770 | } |
| 775 | |
771 | |
| 776 | sub smooth_update { |
772 | sub smooth_update { |
| 777 | my ($self, $facenum, $face) = @_; |
773 | my ($self, $facenum, $face) = @_; |
| 778 | |
774 | |
| 779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
775 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
| 780 | } |
776 | } |
| 781 | |
777 | |
| 782 | sub set_texture { |
778 | sub have_tile { |
| 783 | my ($self, $id, $data) = @_; |
779 | my ($self, $tile) = @_; |
| 784 | |
780 | |
| 785 | return unless $self->{map}; |
781 | return unless $self->{map}; |
| 786 | |
782 | |
| 787 | $self->{texture}[$id] = my $tex = |
783 | $self->{texture}[$tile] ||= my $tex = |
| 788 | new_from_image CFPlus::Texture |
784 | new CFPlus::Texture |
| 789 | $data, minify => 1, mipmap => 1; |
785 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
| 790 | |
786 | |
| 791 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
| 792 | $self->{map_widget}->update; |
|
|
| 793 | |
|
|
| 794 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
787 | $_->() for @{(delete $self->{face_cb}{$tile}) || []}; |
| 795 | } |
788 | } |
| 796 | |
789 | |
| 797 | sub connect_face_update { |
790 | sub connect_face_update { |
| 798 | my ($self, $id, $cb) = @_; |
791 | my ($self, $id, $cb) = @_; |
| 799 | |
792 | |
