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.201 by root, Fri Aug 3 02:20:32 2007 UTC vs.
Revision 1.214 by elmex, Tue Aug 14 14:12:46 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;
… …
217 my ($face) = @_; 216 my ($face) = @_;
218 217
219 $CFG->{effects_enable} 218 $CFG->{effects_enable}
220 or return; 219 or return;
221 220
221 $AUDIO_PLAY{$face}
222 or return;
223
222 if (my $chunk = $AUDIO_CHUNK{$face}) { 224 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
225 227
226 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
234
235 $chunk->play ($channel); 231 $chunk->play ($channel);
236 } 232 }
237 } else { 233 } else {
238 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{sound_meta}{$face}
240 or return; 236 or return;
241 237
242 # if its a jingle, play it as ambient music 238 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) { 239 if ($meta->{meta}{jingle}) {
244 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
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face); 242 &audio_music_push ($face);
243 }
247 } else { 244 } else {
248 # fetch from database 245 # fetch from database
249 CFPlus::DB::get res_data => $meta->{name}, sub { 246 CFPlus::DB::get res_data => $meta->{name}, sub {
250 my $rwops = new CFPlus::RW $_[0]; 247 my $rwops = new CFPlus::RW $_[0];
251 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;
252 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 250 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
253 $AUDIO_CHUNK{$face} = $chunk; 251 $AUDIO_CHUNK{$face} = $chunk;
254 252
255 audio_sound_push ($face); 253 audio_sound_push ($face);
256 }; 254 };
… …
265 or return; 263 or return;
266 $CFG->{effects_enable} 264 $CFG->{effects_enable}
267 or return; 265 or return;
268 266
269 my $queue = $AUDIO_PLAY{$face} ||= []; 267 my $queue = $AUDIO_PLAY{$face} ||= [];
270 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 268 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
271 audio_sound_push $face 269 audio_sound_push $face
272 unless @$queue > 1; 270 unless @$queue > 1;
273} 271}
274 272
275sub audio_music_set_meta { 273sub audio_music_set_meta {
… …
308 my $rwops = $meta->{path} 306 my $rwops = $meta->{path}
309 ? new_from_file CFPlus::RW $meta->{path} 307 ? new_from_file CFPlus::RW $meta->{path}
310 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 308 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
311 309
312 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 310 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
313 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 311 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
314 312
315 my $NOW = time; 313 my $NOW = time;
316 314
317 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
318 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 316 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
351 @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;
352 $fade_out = 1000; 350 $fade_out = 1000;
353 } 351 }
354 352
355 # if the currently playing song is acceptable, let it continue 353 # if the currently playing song is acceptable, let it continue
356 return if $MUSIC_PLAYING_META
357 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
358 355
359 my $NOW = time; 356 my $NOW = time;
360 357
361 if ($MUSIC_PLAYING_META) { 358 if ($MUSIC_PLAYING_META) {
362 $MUSIC_PLAYING_META->{stop_time} = $NOW; 359 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
418 415
419sub audio_shutdown { 416sub audio_shutdown {
420 undef $MUSIC_PLAYER; 417 undef $MUSIC_PLAYER;
421 undef $MUSIC_PLAYING_META; 418 undef $MUSIC_PLAYING_META;
422 undef $MUSIC_PLAYING_DATA; 419 undef $MUSIC_PLAYING_DATA;
423
424 audio_music_set_meta { };
425 420
426 $MUSIC_WANT = []; 421 $MUSIC_WANT = [];
427 @MUSIC_JINGLE = (); 422 @MUSIC_JINGLE = ();
428 %AUDIO_PLAY = (); 423 %AUDIO_PLAY = ();
429 %AUDIO_CHUNK = (); 424 %AUDIO_CHUNK = ();
… …
774 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
775 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
776 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
777 ); 772 );
778 773
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
776 state => $CFG->{opengl11},
777 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
778 . "higher memory usage and slower performance. It will, however, help tremendously on "
779 . "cards that claim to support a feature but fall back to software rendering. "
780 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
781 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
782 . "experience extremely low framerates and your card should do better, try this option.</b>",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
784 );
785
779 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
780 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
781 state => $CFG->{fast}, 788 state => $CFG->{fast},
782 tooltip => "Lower the visual quality considerably to speed up rendering.", 789 tooltip => "Lower the visual quality considerably to speed up rendering.",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
809 816
810 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 817 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
811 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 818 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
812 state => $CFG->{map_smoothing}, 819 state => $CFG->{map_smoothing},
813 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 820 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
814 . "This increases load on the graphics subsystem and works only with 2.x servers. " 821 . "This increases load on the graphics subsystem and works only with TRT servers. "
815 . "Changes take effect at next connection only.", 822 . "Changes take effect at next login only.",
816 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 823 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
817 ); 824 );
818 825
819 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 826 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
820 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 827 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
831 ); 838 );
832 839
833 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
834 $table->add_at (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
835 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 842 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
836 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 843 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
844 . "but you still need to press apply to correctly re-layout the widget.",
837 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 845 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
838 ); 846 );
839 847
840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 848 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
841 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
878# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 886# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
879# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 887# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
880# $CFG->{effects_volume} = $_[1]; 888# $CFG->{effects_volume} = $_[1];
881# }); 889# });
882 890
883 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
884 $table->add_at (1, $row, new CFPlus::UI::CheckBox 892 $table->add_at (1, $row, new CFPlus::UI::CheckBox
885 expand => 1, state => $CFG->{effects_enable}, 893 expand => 1, state => $CFG->{effects_enable},
886 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 894 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
895 on_changed => sub {
887 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 } 896 $CFG->{effects_enable} = $_[1];
897 $CONN->update_fx_want if $CONN;
898 0
899 }
888 ); 900 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider 901 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 902 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
891 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 903 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
892 . "is set highest and you use your operating system volume setting. Changes are instant.", 904 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 905 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 ); 906 );
895 907
896 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 908 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
897 $table->add_at (1, $row, new CFPlus::UI::CheckBox 909 $table->add_at (1, $row, new CFPlus::UI::CheckBox
898 expand => 1, state => $CFG->{bgm_enable}, 910 expand => 1, state => $CFG->{bgm_enable},
899 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 911 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
900 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 912 on_changed => sub {
913 $CFG->{bgm_enable} = $_[1];
914 $CONN->update_fx_want if $CONN;
915 0
916 }
901 ); 917 );
902 $table->add_at (2, $row++, new CFPlus::UI::Slider 918 $table->add_at (2, $row++, new CFPlus::UI::Slider
903 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
904 tooltip => "The volume of the background music. Changes are instant.", 920 tooltip => "The volume of the background music. Changes are instant.",
905 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 921 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
… …
1859 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1875 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1860 ); 1876 );
1861 $hb->add (new CFPlus::UI::Button 1877 $hb->add (new CFPlus::UI::Button
1862 text => "Quit anyway", 1878 text => "Quit anyway",
1863 expand => 1, 1879 expand => 1,
1864 on_activate => sub { exit }, 1880 on_activate => sub { Event::unloop_all },
1865 ); 1881 );
1866 } 1882 }
1867 1883
1868 $QUIT_DIALOG->show; 1884 $QUIT_DIALOG->show;
1869 $QUIT_DIALOG->grab_focus; 1885 $QUIT_DIALOG->grab_focus;
… …
2063 tooltip => "Terminates the program", 2079 tooltip => "Terminates the program",
2064 on_activate => sub { 2080 on_activate => sub {
2065 if ($CONN) { 2081 if ($CONN) {
2066 open_quit_dialog; 2082 open_quit_dialog;
2067 } else { 2083 } else {
2068 exit; 2084 Event::unloop_all;
2069 } 2085 }
2070 0 2086 0
2071 }, 2087 },
2072 ); 2088 );
2073 2089
2074 $BUTTONBAR->show; 2090 $BUTTONBAR->show;
2075 $SETUP_DIALOG->show; 2091 $SETUP_DIALOG->show;
2092 $MESSAGE_WINDOW->show;
2076 } 2093 }
2077 2094
2078 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2095 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2079} 2096}
2080 2097
… …
2088my $animate_timer; 2105my $animate_timer;
2089 2106
2090my $fps = 9; 2107my $fps = 9;
2091 2108
2092sub force_refresh { 2109sub force_refresh {
2110 if ($ENV{CFPLUS_DEBUG} & 4) {
2093 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2111 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2094 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2112 debug sprintf "%3.2f", $fps;
2113 }
2095 2114
2096 $CFPlus::UI::ROOT->draw; 2115 $CFPlus::UI::ROOT->draw;
2097 2116 CFPlus::SDL_GL_SwapBuffers;
2098 $WANT_REFRESH = 0;
2099 $CAN_REFRESH = 0;
2100 $LAST_REFRESH = $NOW; 2117 $LAST_REFRESH = $NOW;
2101 2118 $WANT_REFRESH->stop;
2102 CFPlus::SDL_GL_SwapBuffers;
2103} 2119}
2104 2120
2121$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2122
2105my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2123my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2106 $NOW = time; 2124 $NOW = time;
2107 2125
2108 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2126 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2109 for CFPlus::poll_events; 2127 for CFPlus::poll_events;
2110 2128
2111 if (%animate_object) { 2129 if (%animate_object) {
2112 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2130 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2113 ++$WANT_REFRESH; 2131 $WANT_REFRESH->start;
2114 }
2115
2116 if ($WANT_REFRESH) {
2117 force_refresh;
2118 } else {
2119 $CAN_REFRESH = 1;
2120 } 2132 }
2121}); 2133});
2122 2134
2123sub animation_start { 2135sub animation_start {
2124 my ($widget) = @_; 2136 my ($widget) = @_;
… …
2182 2194
2183 my %DEF_CFG = ( 2195 my %DEF_CFG = (
2184 sdl_mode => 0, 2196 sdl_mode => 0,
2185 fullscreen => 0, 2197 fullscreen => 0,
2186 fast => 0, 2198 fast => 0,
2199 opengl11 => 0,
2187 map_scale => 1, 2200 map_scale => 1,
2188 fow_enable => 1, 2201 fow_enable => 1,
2189 fow_intensity => 0, 2202 fow_intensity => 0,
2190 map_smoothing => 1, 2203 map_smoothing => 1,
2191 gui_fontsize => 1, 2204 gui_fontsize => 1,
… …
2280} 2293}
2281 2294
2282show_tip_of_the_day if $CFG->{show_tips}; 2295show_tip_of_the_day if $CFG->{show_tips};
2283 2296
2284Event::loop; 2297Event::loop;
2298
2299#video_shutdown;
2300#audio_shutdown;
2285#CFPlus::SDL_Quit; 2301CFPlus::SDL_Quit;
2286#CFPlus::_exit 0;
2287
2288END {
2289 CFPlus::SDL_Quit;
2290 CFPlus::DB::Server::stop; 2302CFPlus::DB::Server::stop;
2291}
2292 2303
2293=head1 NAME 2304=head1 NAME
2294 2305
2295cfplus - A Crossfire+ and Crossfire game client 2306cfplus - A Crossfire TRT and Crossfire game client
2296 2307
2297=head1 SYNOPSIS 2308=head1 SYNOPSIS
2298 2309
2299Just run it - no commandline arguments are supported. 2310Just run it - no commandline arguments are supported.
2300 2311
2301=head1 USAGE 2312=head1 USAGE
2302 2313
2303cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2314cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2304fullscreen and interactively. 2315be used in fullscreen mode and interactively.
2305 2316
2306=head1 DEBUGGING 2317=head1 DEBUGGING
2307 2318
2308 2319
2309CFPLUS_DEBUG - environment variable 2320CFPLUS_DEBUG - environment variable

Diff Legend

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