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.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 2007 UTC

… …
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 # check if already cached 70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
76 } else { 80 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 83 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 85
82 CFPlus::DB::write_file $chksum, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 93 &::audio_music_set ($self->{songs});
94 };
95 };
89 }); 96 });
90 } 97 }
91 } 98 }
92 } 99 }
93 } 100 }
94 101
95 if (my $play = $ev->{play}) { 102 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 } 104 }
100 }); 105 });
101 106
102 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_; 108 my ($cap) = @_;
… …
120 ->convert_blessed 125 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
122 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
123 }); 128 });
124 129
130 # widgetset new
125 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_; 132 my ($arg) = @_;
127 133
128 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
129 w => {}, 135 w => {},
130 }; 136 };
131 }); 137 });
132 138
139 # widgetset destroy
133 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_; 141 my ($arg) = @_;
135 142
136 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return; 144 or return;
138 145
139 $_->destroy 146 $_->destroy
140 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
141 }); 148 });
142 149
150 # widgetset destroy
143 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_; 152 my ($arg) = @_;
145 153
146 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
147 155
… …
177 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";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 } 187 }
180 }); 188 });
181 189
190 # widget call
182 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
183 my ($arg) = @_; 192 my ($arg) = @_;
184 193
185 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
186 or return; 195 or return;
… …
193 } else { 202 } else {
194 $w->$m (@$a); 203 $w->$m (@$a);
195 } 204 }
196 }); 205 });
197 206
207 # widget set
198 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
199 my ($arg) = @_; 209 my ($arg) = @_;
200 210
201 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
202 or return; 212 or return;
203 213
204 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
205 }); 215 });
206 216
217 # widget get
207 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
208 my ($arg) = @_; 219 my ($arg) = @_;
209 220
210 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
211 or return; 222 or return;
212 223
213 $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}}]);
214 }); 225 });
215 226
227 # destroy widgets on logout
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 230 $_->destroy
219 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
220 } 232 }
… …
761} 773}
762 774
763sub set_texture { 775sub set_texture {
764 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
765 777
778 return unless $self->{map};
779
766 $self->{texture}[$id] = my $tex = 780 $self->{texture}[$id] = my $tex =
767 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
769 783
770 $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}});
771 $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 }
772} 800}
773 801
774sub sound_play { 802sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
776 804

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines