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.123 by root, Thu Jul 19 16:44:14 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
111 ->convert_blessed 125 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
113 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
114 }); 128 });
115 129
130 # widgetset new
116 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_; 132 my ($arg) = @_;
118 133
119 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
120 w => {}, 135 w => {},
121 }; 136 };
122 }); 137 });
123 138
139 # widgetset destroy
124 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_; 141 my ($arg) = @_;
126 142
127 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return; 144 or return;
129 145
130 $_->destroy 146 $_->destroy
131 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
132 }); 148 });
133 149
150 # widgetset destroy
134 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_; 152 my ($arg) = @_;
136 153
137 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
138 155
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 } 187 }
171 }); 188 });
172 189
190 # widget call
173 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
174 my ($arg) = @_; 192 my ($arg) = @_;
175 193
176 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
177 or return; 195 or return;
184 } else { 202 } else {
185 $w->$m (@$a); 203 $w->$m (@$a);
186 } 204 }
187 }); 205 });
188 206
207 # widget set
189 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
190 my ($arg) = @_; 209 my ($arg) = @_;
191 210
192 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
193 or return; 212 or return;
194 213
195 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
196 }); 215 });
197 216
217 # widget get
198 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
199 my ($arg) = @_; 219 my ($arg) = @_;
200 220
201 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
202 or return; 222 or return;
203 223
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 }); 225 });
206 226
227 # destroy widgets on logout
207 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
208 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy 230 $_->destroy
210 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
211 } 232 }
752} 773}
753 774
754sub set_texture { 775sub set_texture {
755 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
756 777
778 return unless $self->{map};
779
757 $self->{texture}[$id] = my $tex = 780 $self->{texture}[$id] = my $tex =
758 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
760 783
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 784 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
762 $self->{map_widget}->update; 785 $self->{map_widget}->update;
786
787 $_->() for @{(delete $self->{face_cb}{$id}) || []};
788}
789
790sub connect_face_update {
791 my ($self, $id, $cb) = @_;
792
793 push @{$self->{face_cb}{$id}}, $cb;
794
795 CFPlus::guard {
796 @{$self->{face_cb}{$id}}
797 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}};
799 }
763} 800}
764 801
765sub sound_play { 802sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
767 804

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines