ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.113 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.122 by root, Sun Jul 15 22:07:48 2007 UTC

57 57
58 my $faces = $ev->{faces}; 58 my $faces = $ev->{faces};
59 my @songs; 59 my @songs;
60 60
61 # request music from server if appropriate 61 # request music from server if appropriate
62 my $pri = -100; 62 if (my $faces = $ev->{faces}) {
63 for my $face (@$faces) { 63 for (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) { 64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum; 65 utf8::downgrade $chksum;
66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); 70 # check if already cached
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
78 74
75 if (defined $meta_json) {
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 76 my $meta = $self->{json_coder}->decode ($meta_json);
80 ::message ({ markup => "downloaded song #$face, size $len octets" }); 77 $meta->{path} = $path;
81 78 $self->{music_meta}{$chksum} = $meta;
82 &::audio_music_set ($self->{songs}); 79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
83 }); 98 }
84 } 99 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 } 100 }
89 101
90 &::audio_music_set ($self->{songs} = \@songs); 102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
91 }); 105 });
92 106
93 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_; 108 my ($cap) = @_;
95 109
752} 766}
753 767
754sub set_texture { 768sub set_texture {
755 my ($self, $id, $data) = @_; 769 my ($self, $id, $data) = @_;
756 770
771 return unless $self->{map};
772
757 $self->{texture}[$id] = my $tex = 773 $self->{texture}[$id] = my $tex =
758 new_from_image CFPlus::Texture 774 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1; 775 $data, minify => 1, mipmap => 1;
760 776
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 777 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
762 $self->{map_widget}->update; 778 $self->{map_widget}->update;
779
780 $_->() for @{(delete $self->{face_cb}{$id}) || []};
781}
782
783sub connect_face_update {
784 my ($self, $id, $cb) = @_;
785
786 push @{$self->{face_cb}{$id}}, $cb;
787
788 CFPlus::guard {
789 @{$self->{face_cb}{$id}}
790 = grep $_ != $cb,
791 @{$self->{face_cb}{$id}};
792 }
763} 793}
764 794
765sub sound_play { 795sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 796 my ($self, $x, $y, $soundnum, $type) = @_;
767 797

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines