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.200 by root, Thu Aug 2 14:35:21 2007 UTC vs.
Revision 1.217 by root, Sun Aug 19 14:09:28 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;
… …
168our $STATUSBOX; 167our $STATUSBOX;
169our $DEBUG_STATUS; 168our $DEBUG_STATUS;
170 169
171our $INV; 170our $INV;
172our $INVR; 171our $INVR;
173our $INV_RIGHT_HB; 172our $INVR_HB;
174
175our $PICKUP_CFG;
176 173
177############################################################################# 174#############################################################################
178 175
179sub status { 176sub status {
180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
217 my ($face) = @_; 214 my ($face) = @_;
218 215
219 $CFG->{effects_enable} 216 $CFG->{effects_enable}
220 or return; 217 or return;
221 218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) { 222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_; 224 my (undef, $dx, $dy, $vol) = @$_;
225 225
226 my $channel = CFPlus::Channel::find; 226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 227 $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); 228 $channel->set_position_r ($dx, $dy, 20);
234
235 $chunk->play ($channel); 229 $chunk->play ($channel);
236 } 230 }
237 } else { 231 } else {
238 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{sound_meta}{$face}
240 or return; 234 or return;
241 235
242 # if its a jingle, play it as ambient music 236 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) { 237 if ($meta->{meta}{jingle}) {
244 delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue 238 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 239 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face); 240 &audio_music_push ($face);
241 }
247 } else { 242 } else {
248 # fetch from database 243 # fetch from database
249 CFPlus::DB::get res_data => $meta->{name}, sub { 244 CFPlus::DB::get res_data => $meta->{name}, sub {
250 my $rwops = new CFPlus::RW $_[0]; 245 my $rwops = new CFPlus::RW $_[0];
251 my $chunk = new CFPlus::MixChunk $rwops; 246 my $chunk = new CFPlus::MixChunk $rwops
247 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
252 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 248 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
253 $AUDIO_CHUNK{$face} = $chunk; 249 $AUDIO_CHUNK{$face} = $chunk;
254 250
255 audio_sound_push ($face); 251 audio_sound_push ($face);
256 }; 252 };
… …
265 or return; 261 or return;
266 $CFG->{effects_enable} 262 $CFG->{effects_enable}
267 or return; 263 or return;
268 264
269 my $queue = $AUDIO_PLAY{$face} ||= []; 265 my $queue = $AUDIO_PLAY{$face} ||= [];
270 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 266 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
271 audio_sound_push $face 267 audio_sound_push $face
272 unless @$queue > 1; 268 unless @$queue > 1;
273} 269}
274 270
275sub audio_music_set_meta { 271sub audio_music_set_meta {
… …
308 my $rwops = $meta->{path} 304 my $rwops = $meta->{path}
309 ? new_from_file CFPlus::RW $meta->{path} 305 ? new_from_file CFPlus::RW $meta->{path}
310 : new CFPlus::RW $$MUSIC_PLAYING_DATA; 306 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
311 307
312 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops 308 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
313 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error 309 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
314 310
315 my $NOW = time; 311 my $NOW = time;
316 312
317 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 313 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
318 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 314 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
351 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 347 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
352 $fade_out = 1000; 348 $fade_out = 1000;
353 } 349 }
354 350
355 # if the currently playing song is acceptable, let it continue 351 # if the currently playing song is acceptable, let it continue
356 return if $MUSIC_PLAYING_META
357 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 352 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
358 353
359 my $NOW = time; 354 my $NOW = time;
360 355
361 if ($MUSIC_PLAYING_META) { 356 if ($MUSIC_PLAYING_META) {
362 $MUSIC_PLAYING_META->{stop_time} = $NOW; 357 $MUSIC_PLAYING_META->{stop_time} = $NOW;
… …
418 413
419sub audio_shutdown { 414sub audio_shutdown {
420 undef $MUSIC_PLAYER; 415 undef $MUSIC_PLAYER;
421 undef $MUSIC_PLAYING_META; 416 undef $MUSIC_PLAYING_META;
422 undef $MUSIC_PLAYING_DATA; 417 undef $MUSIC_PLAYING_DATA;
423
424 audio_music_set_meta { };
425 418
426 $MUSIC_WANT = []; 419 $MUSIC_WANT = [];
427 @MUSIC_JINGLE = (); 420 @MUSIC_JINGLE = ();
428 %AUDIO_PLAY = (); 421 %AUDIO_PLAY = ();
429 %AUDIO_CHUNK = (); 422 %AUDIO_CHUNK = ();
… …
774 state => $CFG->{fullscreen}, 767 state => $CFG->{fullscreen},
775 tooltip => "Bring the client into fullscreen mode.", 768 tooltip => "Bring the client into fullscreen mode.",
776 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 769 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
777 ); 770 );
778 771
772 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
773 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
774 state => $CFG->{force_opengl11},
775 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
776 . "higher memory usage and slower performance. It will, however, help tremendously on "
777 . "cards that claim to support a feature but fall back to software rendering. "
778 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
779 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
780 . "experience extremely low framerates and your card should do better, try this option.</b>",
781 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
782 );
783
784 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
785 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
786 state => $CFG->{texture_compression},
787 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
788 . "will save a lot of memory and increase performance. The compression algorithm "
789 . "can differ form card to card, so your mileage may vary.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
791 );
792
779 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 793 $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 794 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
781 state => $CFG->{fast}, 795 state => $CFG->{fast},
782 tooltip => "Lower the visual quality considerably to speed up rendering.", 796 tooltip => "Lower the visual quality considerably to speed up rendering.",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 797 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
809 823
810 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 824 $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 825 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
812 state => $CFG->{map_smoothing}, 826 state => $CFG->{map_smoothing},
813 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 827 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. " 828 . "This increases load on the graphics subsystem and works only with TRT servers. "
815 . "Changes take effect at next connection only.", 829 . "Changes take effect at next login only.",
816 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 830 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
817 ); 831 );
818 832
819 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 833 $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 834 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
831 ); 845 );
832 846
833 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 847 $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 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
835 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 849 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.", 850 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
851 . "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 }, 852 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
838 ); 853 );
839 854
840 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 855 $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 856 $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"); 893# $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 { 894# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
880# $CFG->{effects_volume} = $_[1]; 895# $CFG->{effects_volume} = $_[1];
881# }); 896# });
882 897
883 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 898 $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 899 $table->add_at (1, $row, new CFPlus::UI::CheckBox
885 expand => 1, state => $CFG->{effects_enable}, 900 expand => 1, state => $CFG->{effects_enable},
886 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 901 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
902 on_changed => sub {
887 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 } 903 $CFG->{effects_enable} = $_[1];
904 $CONN->update_fx_want if $CONN;
905 0
906 }
888 ); 907 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider 908 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 909 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 " 910 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.", 911 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 912 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 ); 913 );
895 914
896 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 915 $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 916 $table->add_at (1, $row, new CFPlus::UI::CheckBox
898 expand => 1, state => $CFG->{bgm_enable}, 917 expand => 1, state => $CFG->{bgm_enable},
899 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 918 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 } 919 on_changed => sub {
920 $CFG->{bgm_enable} = $_[1];
921 $CONN->update_fx_want if $CONN;
922 0
923 }
901 ); 924 );
902 $table->add_at (2, $row++, new CFPlus::UI::Slider 925 $table->add_at (2, $row++, new CFPlus::UI::Slider
903 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 926 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
904 tooltip => "The volume of the background music. Changes are instant.", 927 tooltip => "The volume of the background music. Changes are instant.",
905 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 928 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
… …
1594 $sw1->add ($INV = new CFPlus::UI::Inventory); 1617 $sw1->add ($INV = new CFPlus::UI::Inventory);
1595 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1618 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1596 1619
1597 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1620 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1598 1621
1599 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1622 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1600 1623
1601 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1624 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1602 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1625 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1603 1626
1604 # XXX: Call after $INVR = ... because set_opencont sets the items 1627 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1610sub media_window { 1633sub media_window {
1611 my $vb = new CFPlus::UI::VBox; 1634 my $vb = new CFPlus::UI::VBox;
1612 1635
1613 $vb->add (new CFPlus::UI::FancyFrame 1636 $vb->add (new CFPlus::UI::FancyFrame
1614 label => "Currently playing music", 1637 label => "Currently playing music",
1638 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1615 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0), 1639 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1616 ); 1640 );
1617 1641
1618 $vb->add (new CFPlus::UI::FancyFrame 1642 $vb->add (new CFPlus::UI::FancyFrame
1619 label => "Other media used in this session", 1643 label => "Other media used in this session",
1644 expand => 1,
1620 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller 1645 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1621 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1622 ); 1647 );
1623 1648
1624 $vb 1649 $vb
1650}
1651
1652sub add_license {
1653 my ($meta) = @_;
1654
1655 $meta = $meta->{meta}
1656 or return;
1657
1658 $meta->{license} || $meta->{author} || $meta->{source}
1659 or return;
1660
1661 $LICENSE_WIDGET->add_paragraph ({
1662 fg => [1, 1, 1, 1],
1663 markup => "<small>"
1664 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1665 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1666 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1667 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1668 . "</small>",
1669 });
1670 $LICENSE_WIDGET->scroll_to_bottom;
1625} 1671}
1626 1672
1627sub toggle_player_page { 1673sub toggle_player_page {
1628 my ($widget) = @_; 1674 my ($widget) = @_;
1629 1675
… …
1836 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1882 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1837 ); 1883 );
1838 $hb->add (new CFPlus::UI::Button 1884 $hb->add (new CFPlus::UI::Button
1839 text => "Quit anyway", 1885 text => "Quit anyway",
1840 expand => 1, 1886 expand => 1,
1841 on_activate => sub { exit }, 1887 on_activate => sub { Event::unloop_all },
1842 ); 1888 );
1843 } 1889 }
1844 1890
1845 $QUIT_DIALOG->show; 1891 $QUIT_DIALOG->show;
1846 $QUIT_DIALOG->grab_focus; 1892 $QUIT_DIALOG->grab_focus;
… …
2040 tooltip => "Terminates the program", 2086 tooltip => "Terminates the program",
2041 on_activate => sub { 2087 on_activate => sub {
2042 if ($CONN) { 2088 if ($CONN) {
2043 open_quit_dialog; 2089 open_quit_dialog;
2044 } else { 2090 } else {
2045 exit; 2091 Event::unloop_all;
2046 } 2092 }
2047 0 2093 0
2048 }, 2094 },
2049 ); 2095 );
2050 2096
2051 $BUTTONBAR->show; 2097 $BUTTONBAR->show;
2052 $SETUP_DIALOG->show; 2098 $SETUP_DIALOG->show;
2099 $MESSAGE_WINDOW->show;
2053 } 2100 }
2054 2101
2055 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2102 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2056} 2103}
2057 2104
… …
2065my $animate_timer; 2112my $animate_timer;
2066 2113
2067my $fps = 9; 2114my $fps = 9;
2068 2115
2069sub force_refresh { 2116sub force_refresh {
2117 if ($ENV{CFPLUS_DEBUG} & 4) {
2070 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2118 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2071 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2119 debug sprintf "%3.2f", $fps;
2120 }
2072 2121
2073 $CFPlus::UI::ROOT->draw; 2122 $CFPlus::UI::ROOT->draw;
2074 2123 CFPlus::SDL_GL_SwapBuffers;
2075 $WANT_REFRESH = 0;
2076 $CAN_REFRESH = 0;
2077 $LAST_REFRESH = $NOW; 2124 $LAST_REFRESH = $NOW;
2078 2125 $WANT_REFRESH->stop;
2079 CFPlus::SDL_GL_SwapBuffers;
2080} 2126}
2081 2127
2128$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2129
2082my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2130my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2083 $NOW = time; 2131 $NOW = time;
2084 2132
2085 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2133 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2086 for CFPlus::poll_events; 2134 for CFPlus::poll_events;
2087 2135
2088 if (%animate_object) { 2136 if (%animate_object) {
2089 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2137 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2090 ++$WANT_REFRESH; 2138 $WANT_REFRESH->start;
2091 }
2092
2093 if ($WANT_REFRESH) {
2094 force_refresh;
2095 } else {
2096 $CAN_REFRESH = 1;
2097 } 2139 }
2098}); 2140});
2099 2141
2100sub animation_start { 2142sub animation_start {
2101 my ($widget) = @_; 2143 my ($widget) = @_;
… …
2156 CFPlus::DB::Server::run; 2198 CFPlus::DB::Server::run;
2157 2199
2158 CFPlus::UI::set_layout ($::CFG->{layout}); 2200 CFPlus::UI::set_layout ($::CFG->{layout});
2159 2201
2160 my %DEF_CFG = ( 2202 my %DEF_CFG = (
2161 sdl_mode => 0, 2203 sdl_mode => 0,
2162 fullscreen => 0, 2204 fullscreen => 0,
2163 fast => 0, 2205 fast => 0,
2206 force_opengl11 => undef,
2207 texture_compression => 1,
2164 map_scale => 1, 2208 map_scale => 1,
2165 fow_enable => 1, 2209 fow_enable => 1,
2166 fow_intensity => 0, 2210 fow_intensity => 0,
2167 map_smoothing => 1, 2211 map_smoothing => 1,
2168 gui_fontsize => 1, 2212 gui_fontsize => 1,
2169 log_fontsize => 0.7, 2213 log_fontsize => 0.7,
2170 gauge_fontsize => 1, 2214 gauge_fontsize => 1,
2171 gauge_size => 0.35, 2215 gauge_size => 0.35,
2172 stat_fontsize => 0.7, 2216 stat_fontsize => 0.7,
2173 mapsize => 100, 2217 mapsize => 100,
2174 audio_enable => 1, 2218 audio_enable => 1,
2175 effects_enable => 1, 2219 effects_enable => 1,
2176 effects_volume => 1, 2220 effects_volume => 1,
2177 bgm_enable => 1, 2221 bgm_enable => 1,
2178 bgm_volume => 0.5, 2222 bgm_volume => 0.5,
2179 output_sync => 1, 2223 output_sync => 1,
2180 output_count => 1, 2224 output_count => 1,
2181 output_rate => "", 2225 output_rate => "",
2182 pickup => 0, 2226 pickup => 0,
2183 inv_sort => "mtime", 2227 inv_sort => "mtime",
2184 default => "profile", # default profile 2228 default => "profile", # default profile
2185 show_tips => 1, 2229 show_tips => 1,
2186 logview_max_par => 1000, 2230 logview_max_par => 1000,
2187 ); 2231 );
2188 2232
2189 while (my ($k, $v) = each %DEF_CFG) { 2233 while (my ($k, $v) = each %DEF_CFG) {
2190 $CFG->{$k} = $v unless exists $CFG->{$k}; 2234 $CFG->{$k} = $v unless exists $CFG->{$k};
2191 } 2235 }
… …
2257} 2301}
2258 2302
2259show_tip_of_the_day if $CFG->{show_tips}; 2303show_tip_of_the_day if $CFG->{show_tips};
2260 2304
2261Event::loop; 2305Event::loop;
2306
2307#video_shutdown;
2308#audio_shutdown;
2262#CFPlus::SDL_Quit; 2309CFPlus::SDL_Quit;
2263#CFPlus::_exit 0;
2264
2265END {
2266 CFPlus::SDL_Quit;
2267 CFPlus::DB::Server::stop; 2310CFPlus::DB::Server::stop;
2268}
2269 2311
2270=head1 NAME 2312=head1 NAME
2271 2313
2272cfplus - A Crossfire+ and Crossfire game client 2314cfplus - A Crossfire TRT and Crossfire game client
2273 2315
2274=head1 SYNOPSIS 2316=head1 SYNOPSIS
2275 2317
2276Just run it - no commandline arguments are supported. 2318Just run it - no commandline arguments are supported.
2277 2319
2278=head1 USAGE 2320=head1 USAGE
2279 2321
2280cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2322cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2281fullscreen and interactively. 2323be used in fullscreen mode and interactively.
2282 2324
2283=head1 DEBUGGING 2325=head1 DEBUGGING
2284 2326
2285 2327
2286CFPLUS_DEBUG - environment variable 2328CFPLUS_DEBUG - environment variable

Diff Legend

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