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.207 by root, Thu Aug 9 11:02:08 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 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]);
… …
231 $channel->set_position_r ($dx, $dy, 20); 228 $channel->set_position_r ($dx, $dy, 20);
232 $chunk->play ($channel); 229 $chunk->play ($channel);
233 } 230 }
234 } else { 231 } else {
235 # sound_meta not set means data is in flight either way 232 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face} 233 my $meta = $CONN->{face}[$face]
237 or return; 234 or return;
238 235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music 239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{jingle}) { 240 if ($meta->{data}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 241 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 242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face); 243 &audio_music_push ($face);
244 } 244 }
245 } else { 245 } else {
246 # fetch from database 246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub { 247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0]; 248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops 249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk; 252 $AUDIO_CHUNK{$face} = $chunk;
253 253
254 audio_sound_push ($face); 254 audio_sound_push ($face);
255 }; 255 };
256 } 256 }
… …
264 or return; 264 or return;
265 $CFG->{effects_enable} 265 $CFG->{effects_enable}
266 or return; 266 or return;
267 267
268 my $queue = $AUDIO_PLAY{$face} ||= []; 268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
270 audio_sound_push $face 270 audio_sound_push $face
271 unless @$queue > 1; 271 unless @$queue > 1;
272} 272}
273 273
274sub audio_music_set_meta { 274sub audio_music_set_meta {
275 my ($meta) = @_; 275 my ($meta) = @_;
276 276
277 $MUSIC_PLAYING_META = $meta; 277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup ( 278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 ); 283 );
284} 284}
285 285
286sub audio_music_update_volume { 286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META; 287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128; 290 CFPlus::MixMusic::volume $base * $volume * 128;
291} 291}
292 292
293sub audio_music_start { 293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META; 294 my $meta = $MUSIC_PLAYING_META;
… …
337 $fade_out = 333; 337 $fade_out = 333;
338 } else { 338 } else {
339 return unless $CFG->{bgm_enable}; 339 return unless $CFG->{bgm_enable};
340 340
341 my @have = 341 my @have =
342 grep $_, 342 grep $_ && $_->{data},
343 map $CONN->{music_meta}{$_}, 343 map $CONN->{face}[$_],
344 @$MUSIC_WANT; 344 @$MUSIC_WANT;
345 345
346 @MUSIC_HAVE = @have 346 @MUSIC_HAVE = @have
347 if @have; 347 if @have;
348 348
… …
770 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
771 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
773 ); 773 );
774 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{fast}, 799 state => $CFG->{fast},
778 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
805 827
806 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
808 state => $CFG->{map_smoothing}, 830 state => $CFG->{map_smoothing},
809 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 831 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
810 . "This increases load on the graphics subsystem and works only with 2.x servers. " 832 . "This increases load on the graphics subsystem and works only with TRT servers. "
811 . "Changes take effect at next connection only.", 833 . "Changes take effect at next login only.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
813 ); 835 );
814 836
815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
827 ); 849 );
828 850
829 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 851 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
830 $table->add_at (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
831 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
832 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "but you still need to press apply to correctly re-layout the widget.",
833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
834 ); 857 );
835 858
836 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
837 $table->add_at (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
898 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
899 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
900 on_changed => sub { 923 on_changed => sub {
901 $CFG->{bgm_enable} = $_[1]; 924 $CFG->{bgm_enable} = $_[1];
902 $CONN->update_fx_want if $CONN; 925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
903 0 927 0
904 } 928 }
905 ); 929 );
906 $table->add_at (2, $row++, new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
… …
1598 $sw1->add ($INV = new CFPlus::UI::Inventory); 1622 $sw1->add ($INV = new CFPlus::UI::Inventory);
1599 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1623 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1600 1624
1601 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1625 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1602 1626
1603 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1627 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1604 1628
1605 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1629 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1606 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1630 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1607 1631
1608 # XXX: Call after $INVR = ... because set_opencont sets the items 1632 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1631} 1655}
1632 1656
1633sub add_license { 1657sub add_license {
1634 my ($meta) = @_; 1658 my ($meta) = @_;
1635 1659
1636 $meta = $meta->{meta} 1660 $meta = $meta->{data}
1637 or return; 1661 or return;
1638 1662
1639 $meta->{license} || $meta->{author} || $meta->{source} 1663 $meta->{license} || $meta->{author} || $meta->{source}
1640 or return; 1664 or return;
1641 1665
… …
1863 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1887 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1864 ); 1888 );
1865 $hb->add (new CFPlus::UI::Button 1889 $hb->add (new CFPlus::UI::Button
1866 text => "Quit anyway", 1890 text => "Quit anyway",
1867 expand => 1, 1891 expand => 1,
1868 on_activate => sub { exit }, 1892 on_activate => sub { Event::unloop_all },
1869 ); 1893 );
1870 } 1894 }
1871 1895
1872 $QUIT_DIALOG->show; 1896 $QUIT_DIALOG->show;
1873 $QUIT_DIALOG->grab_focus; 1897 $QUIT_DIALOG->grab_focus;
… …
2067 tooltip => "Terminates the program", 2091 tooltip => "Terminates the program",
2068 on_activate => sub { 2092 on_activate => sub {
2069 if ($CONN) { 2093 if ($CONN) {
2070 open_quit_dialog; 2094 open_quit_dialog;
2071 } else { 2095 } else {
2072 exit; 2096 Event::unloop_all;
2073 } 2097 }
2074 0 2098 0
2075 }, 2099 },
2076 ); 2100 );
2077 2101
2078 $BUTTONBAR->show; 2102 $BUTTONBAR->show;
2079 $SETUP_DIALOG->show; 2103 $SETUP_DIALOG->show;
2104 $MESSAGE_WINDOW->show;
2080 } 2105 }
2081 2106
2082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2107 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2083} 2108}
2084 2109
… …
2092my $animate_timer; 2117my $animate_timer;
2093 2118
2094my $fps = 9; 2119my $fps = 9;
2095 2120
2096sub force_refresh { 2121sub force_refresh {
2122 if ($ENV{CFPLUS_DEBUG} & 4) {
2097 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2123 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2124 debug sprintf "%3.2f", $fps;
2125 }
2099 2126
2100 $CFPlus::UI::ROOT->draw; 2127 $CFPlus::UI::ROOT->draw;
2101 2128 CFPlus::SDL_GL_SwapBuffers;
2102 $WANT_REFRESH = 0;
2103 $CAN_REFRESH = 0;
2104 $LAST_REFRESH = $NOW; 2129 $LAST_REFRESH = $NOW;
2105 2130 $WANT_REFRESH->stop;
2106 CFPlus::SDL_GL_SwapBuffers;
2107} 2131}
2108 2132
2133$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2134
2109my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2135my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2110 $NOW = time; 2136 $NOW = time;
2111 2137
2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2138 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2113 for CFPlus::poll_events; 2139 for CFPlus::poll_events;
2114 2140
2115 if (%animate_object) { 2141 if (%animate_object) {
2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2142 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2117 ++$WANT_REFRESH; 2143 $WANT_REFRESH->start;
2118 }
2119
2120 if ($WANT_REFRESH) {
2121 force_refresh;
2122 } else {
2123 $CAN_REFRESH = 1;
2124 } 2144 }
2125}); 2145});
2126 2146
2127sub animation_start { 2147sub animation_start {
2128 my ($widget) = @_; 2148 my ($widget) = @_;
… …
2183 CFPlus::DB::Server::run; 2203 CFPlus::DB::Server::run;
2184 2204
2185 CFPlus::UI::set_layout ($::CFG->{layout}); 2205 CFPlus::UI::set_layout ($::CFG->{layout});
2186 2206
2187 my %DEF_CFG = ( 2207 my %DEF_CFG = (
2188 sdl_mode => 0, 2208 sdl_mode => 0,
2189 fullscreen => 0, 2209 fullscreen => 0,
2190 fast => 0, 2210 fast => 0,
2211 force_opengl11 => undef,
2212 texture_compression => 1,
2191 map_scale => 1, 2213 map_scale => 1,
2192 fow_enable => 1, 2214 fow_enable => 1,
2193 fow_intensity => 0, 2215 fow_intensity => 0,
2194 map_smoothing => 1, 2216 map_smoothing => 1,
2195 gui_fontsize => 1, 2217 gui_fontsize => 1,
2196 log_fontsize => 0.7, 2218 log_fontsize => 0.7,
2197 gauge_fontsize => 1, 2219 gauge_fontsize => 1,
2198 gauge_size => 0.35, 2220 gauge_size => 0.35,
2199 stat_fontsize => 0.7, 2221 stat_fontsize => 0.7,
2200 mapsize => 100, 2222 mapsize => 100,
2201 audio_enable => 1, 2223 audio_enable => 1,
2202 effects_enable => 1, 2224 effects_enable => 1,
2203 effects_volume => 1, 2225 effects_volume => 1,
2204 bgm_enable => 1, 2226 bgm_enable => 1,
2205 bgm_volume => 0.5, 2227 bgm_volume => 0.5,
2206 output_sync => 1, 2228 output_sync => 1,
2207 output_count => 1, 2229 output_count => 1,
2208 output_rate => "", 2230 output_rate => "",
2209 pickup => 0, 2231 pickup => 0,
2210 inv_sort => "mtime", 2232 inv_sort => "mtime",
2211 default => "profile", # default profile 2233 default => "profile", # default profile
2212 show_tips => 1, 2234 show_tips => 1,
2213 logview_max_par => 1000, 2235 logview_max_par => 1000,
2214 ); 2236 );
2215 2237
2216 while (my ($k, $v) = each %DEF_CFG) { 2238 while (my ($k, $v) = each %DEF_CFG) {
2217 $CFG->{$k} = $v unless exists $CFG->{$k}; 2239 $CFG->{$k} = $v unless exists $CFG->{$k};
2218 } 2240 }
… …
2284} 2306}
2285 2307
2286show_tip_of_the_day if $CFG->{show_tips}; 2308show_tip_of_the_day if $CFG->{show_tips};
2287 2309
2288Event::loop; 2310Event::loop;
2311
2312#video_shutdown;
2313#audio_shutdown;
2289#CFPlus::SDL_Quit; 2314CFPlus::SDL_Quit;
2290#CFPlus::_exit 0;
2291
2292END {
2293 video_shutdown;
2294 audio_shutdown;
2295 CFPlus::SDL_Quit;
2296 CFPlus::DB::Server::stop; 2315CFPlus::DB::Server::stop;
2297}
2298 2316
2299=head1 NAME 2317=head1 NAME
2300 2318
2301cfplus - A Crossfire TRT and Crossfire game client 2319cfplus - A Crossfire TRT and Crossfire game client
2302 2320

Diff Legend

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