ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC vs.
Revision 1.208 by root, Fri Aug 10 04:02:14 2007 UTC

… …
113our $CONN; 113our $CONN;
114our $PROFILE; # current profile 114our $PROFILE; # current profile
115our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116 116
117our $WANT_REFRESH; 117our $WANT_REFRESH;
118our $CAN_REFRESH;
119 118
120our @SDL_MODES; 119our @SDL_MODES;
121our $WIDTH; 120our $WIDTH;
122our $HEIGHT; 121our $HEIGHT;
123our $FULLSCREEN; 122our $FULLSCREEN;
… …
144our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
145 144
146our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
147our $PL_WINDOW; 146our $PL_WINDOW;
148 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
149our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
150our $STATS_PAGE; 152our $STATS_PAGE;
151our $SKILL_PAGE; 153our $SKILL_PAGE;
152our $SPELL_PAGE; 154our $SPELL_PAGE;
153our $SPELL_LIST; 155our $SPELL_LIST;
… …
214 my ($face) = @_; 216 my ($face) = @_;
215 217
216 $CFG->{effects_enable} 218 $CFG->{effects_enable}
217 or return; 219 or return;
218 220
221 $AUDIO_PLAY{$face}
222 or return;
223
219 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
220 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
221 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
222 227
223 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
224 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
225 $dx = $dx / 10 * 255;
226 $channel->set_panning (255 - $dx, 255 + $dx);
227
228# my $angle = $dx ? : $dx < 0 ?
229# my $distance = -$vol;
230# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
231
232 $chunk->play ($channel); 231 $chunk->play ($channel);
233 } 232 }
234 } else { 233 } else {
235 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{sound_meta}{$face}
237 or return; 236 or return;
238 237
239 # if its a jingle, play it as ambient music 238 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) { 239 if ($meta->{meta}{jingle}) {
241 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue 240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face); 242 &audio_music_push ($face);
243 }
244 } else { 244 } else {
245 # fetch from database 245 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub { 246 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0]; 247 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops; 248 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
249 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
250 $AUDIO_CHUNK{$face} = $chunk; 251 $AUDIO_CHUNK{$face} = $chunk;
251 252
252 audio_sound_push ($face); 253 audio_sound_push ($face);
253 }; 254 };
… …
265 266
266 my $queue = $AUDIO_PLAY{$face} ||= []; 267 my $queue = $AUDIO_PLAY{$face} ||= [];
267 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 268 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
268 audio_sound_push $face 269 audio_sound_push $face
269 unless @$queue > 1; 270 unless @$queue > 1;
271}
272
273sub audio_music_set_meta {
274 my ($meta) = @_;
275
276 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
282 );
270} 283}
271 284
272sub audio_music_update_volume { 285sub audio_music_update_volume {
273 return unless $MUSIC_PLAYING_META; 286 return unless $MUSIC_PLAYING_META;
274 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
… …
293 my $rwops = $meta->{path} 306 my $rwops = $meta->{path}
294 ? new_from_file CFPlus::RW $meta->{path} 307 ? new_from_file CFPlus::RW $meta->{path}
295 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
296 309
297 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
298 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
299 312
300 my $NOW = time; 313 my $NOW = time;
301 314
302 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
303 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
306 } else { 319 } else {
307 $MUSIC_PLAYER->play (0); 320 $MUSIC_PLAYER->play (0);
308 $MUSIC_START = time; 321 $MUSIC_START = time;
309 } 322 }
310 323
311 delete $MUSIC_PLAYING_META->{stop_time}; 324 delete $meta->{stop_time};
312 delete $MUSIC_PLAYING_META->{stop_pos}; 325 delete $meta->{stop_pos};
313 } 326 }
314} 327}
315 328
316sub audio_music_push { 329sub audio_music_push {
317 return unless $SDL_MIXER; 330 return unless $SDL_MIXER;
… …
336 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
337 $fade_out = 1000; 350 $fade_out = 1000;
338 } 351 }
339 352
340 # if the currently playing song is acceptable, let it continue 353 # if the currently playing song is acceptable, let it continue
341 return if $MUSIC_PLAYING_META
342 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
343 355
344 my $NOW = time; 356 my $NOW = time;
345 357
346 if ($MUSIC_PLAYING_META) { 358 if ($MUSIC_PLAYING_META) {
347 $MUSIC_PLAYING_META->{stop_time} = $NOW; 359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
351 # sort by stop time, oldest first 363 # sort by stop time, oldest first
352 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
353 365
354 # if the most recently-played piece played very recently, 366 # if the most recently-played piece played very recently,
355 # resume it, else choose the oldest piece for rotation. 367 # resume it, else choose the oldest piece for rotation.
356 $MUSIC_PLAYING_META = 368 audio_music_set_meta
357 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
358 ? $MUSIC_HAVE[-1] 370 ? $MUSIC_HAVE[-1]
359 : $MUSIC_HAVE[0]; 371 : $MUSIC_HAVE[0];
360 372
361 audio_music_start; 373 audio_music_start;
… …
371 383
372sub audio_music_finished { 384sub audio_music_finished {
373 # we compress multiple jingles of the same type 385 # we compress multiple jingles of the same type
374 shift @MUSIC_JINGLE 386 shift @MUSIC_JINGLE
375 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388
389 $MUSIC_PLAYING_WIDGET->clear;
376 390
377 undef $MUSIC_PLAYER; 391 undef $MUSIC_PLAYER;
378 undef $MUSIC_PLAYING_META; 392 undef $MUSIC_PLAYING_META;
379 undef $MUSIC_PLAYING_DATA; 393 undef $MUSIC_PLAYING_DATA;
380 394
… …
859# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 873# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
860# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 874# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
861# $CFG->{effects_volume} = $_[1]; 875# $CFG->{effects_volume} = $_[1];
862# }); 876# });
863 877
864 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 878 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
865 $table->add_at (1, $row, new CFPlus::UI::CheckBox 879 $table->add_at (1, $row, new CFPlus::UI::CheckBox
866 expand => 1, state => $CFG->{effects_enable}, 880 expand => 1, state => $CFG->{effects_enable},
867 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 881 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
882 on_changed => sub {
868 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 } 883 $CFG->{effects_enable} = $_[1];
884 $CONN->update_fx_want if $CONN;
885 0
886 }
869 ); 887 );
870 $table->add_at (2, $row++, new CFPlus::UI::Slider 888 $table->add_at (2, $row++, new CFPlus::UI::Slider
871 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 889 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
872 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 890 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
873 . "is set highest and you use your operating system volume setting. Changes are instant.", 891 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
874 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 892 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
875 ); 893 );
876 894
877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 895 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
878 $table->add_at (1, $row, new CFPlus::UI::CheckBox 896 $table->add_at (1, $row, new CFPlus::UI::CheckBox
879 expand => 1, state => $CFG->{bgm_enable}, 897 expand => 1, state => $CFG->{bgm_enable},
880 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 898 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
881 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 899 on_changed => sub {
900 $CFG->{bgm_enable} = $_[1];
901 $CONN->update_fx_want if $CONN;
902 0
903 }
882 ); 904 );
883 $table->add_at (2, $row++, new CFPlus::UI::Slider 905 $table->add_at (2, $row++, new CFPlus::UI::Slider
884 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 906 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
885 tooltip => "The volume of the background music. Changes are instant.", 907 tooltip => "The volume of the background music. Changes are instant.",
886 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 908 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
… …
1586 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1608 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1587 1609
1588 $hb 1610 $hb
1589} 1611}
1590 1612
1613sub media_window {
1614 my $vb = new CFPlus::UI::VBox;
1615
1616 $vb->add (new CFPlus::UI::FancyFrame
1617 label => "Currently playing music",
1618 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1619 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1620 );
1621
1622 $vb->add (new CFPlus::UI::FancyFrame
1623 label => "Other media used in this session",
1624 expand => 1,
1625 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1626 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1627 );
1628
1629 $vb
1630}
1631
1632sub add_license {
1633 my ($meta) = @_;
1634
1635 $meta = $meta->{meta}
1636 or return;
1637
1638 $meta->{license} || $meta->{author} || $meta->{source}
1639 or return;
1640
1641 $LICENSE_WIDGET->add_paragraph ({
1642 fg => [1, 1, 1, 1],
1643 markup => "<small>"
1644 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1645 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1646 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1647 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1648 . "</small>",
1649 });
1650 $LICENSE_WIDGET->scroll_to_bottom;
1651}
1652
1591sub toggle_player_page { 1653sub toggle_player_page {
1592 my ($widget) = @_; 1654 my ($widget) = @_;
1593 1655
1594 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) { 1656 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1595 $PL_WINDOW->hide; 1657 $PL_WINDOW->hide;
… …
1632 $ntb->add_tab ( 1694 $ntb->add_tab (
1633 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1695 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1634 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1696 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1635 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1697 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1636 ); 1698 );
1637 $ntb->add_tab (Pickup => autopickup_setup, 1699 $ntb->add_tab (Pickup => autopickup_setup,
1638 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1700 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1701
1702 $ntb->add_tab (Media => media_window,
1703 "License, Author and Source info for media sent by the server.");
1639 1704
1640 $ntb->set_current_page ($INVENTORY_PAGE); 1705 $ntb->set_current_page ($INVENTORY_PAGE);
1641 1706
1642 $plwin->add ($ntb); 1707 $plwin->add ($ntb);
1643 $plwin 1708 $plwin
… …
2026my $animate_timer; 2091my $animate_timer;
2027 2092
2028my $fps = 9; 2093my $fps = 9;
2029 2094
2030sub force_refresh { 2095sub force_refresh {
2096 if ($ENV{CFPLUS_DEBUG} & 4) {
2031 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2032 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps;
2099 }
2033 2100
2034 $CFPlus::UI::ROOT->draw; 2101 $CFPlus::UI::ROOT->draw;
2035 2102 CFPlus::SDL_GL_SwapBuffers;
2036 $WANT_REFRESH = 0;
2037 $CAN_REFRESH = 0;
2038 $LAST_REFRESH = $NOW; 2103 $LAST_REFRESH = $NOW;
2039 2104 $WANT_REFRESH->stop;
2040 CFPlus::SDL_GL_SwapBuffers;
2041} 2105}
2042 2106
2107$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2108
2043my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2044 $NOW = time; 2110 $NOW = time;
2045 2111
2046 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2047 for CFPlus::poll_events; 2113 for CFPlus::poll_events;
2048 2114
2049 if (%animate_object) { 2115 if (%animate_object) {
2050 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2051 ++$WANT_REFRESH; 2117 $WANT_REFRESH->start;
2052 }
2053
2054 if ($WANT_REFRESH) {
2055 force_refresh;
2056 } else {
2057 $CAN_REFRESH = 1;
2058 } 2118 }
2059}); 2119});
2060 2120
2061sub animation_start { 2121sub animation_start {
2062 my ($widget) = @_; 2122 my ($widget) = @_;
… …
2222Event::loop; 2282Event::loop;
2223#CFPlus::SDL_Quit; 2283#CFPlus::SDL_Quit;
2224#CFPlus::_exit 0; 2284#CFPlus::_exit 0;
2225 2285
2226END { 2286END {
2287 video_shutdown;
2288 audio_shutdown;
2227 CFPlus::SDL_Quit; 2289 CFPlus::SDL_Quit;
2228 CFPlus::DB::Server::stop; 2290 CFPlus::DB::Server::stop;
2229} 2291}
2230 2292
2231=head1 NAME 2293=head1 NAME
2232 2294
2233cfplus - A Crossfire+ and Crossfire game client 2295cfplus - A Crossfire TRT and Crossfire game client
2234 2296
2235=head1 SYNOPSIS 2297=head1 SYNOPSIS
2236 2298
2237Just run it - no commandline arguments are supported. 2299Just run it - no commandline arguments are supported.
2238 2300
2239=head1 USAGE 2301=head1 USAGE
2240 2302
2241cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2242fullscreen and interactively. 2304be used in fullscreen mode and interactively.
2243 2305
2244=head1 DEBUGGING 2306=head1 DEBUGGING
2245 2307
2246 2308
2247CFPLUS_DEBUG - environment variable 2309CFPLUS_DEBUG - environment variable

Diff Legend

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