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.206 by root, Thu Aug 9 03:40:44 2007 UTC vs.
Revision 1.212 by root, Sun Aug 12 13:09:44 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;
… …
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 225 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_; 226 my (undef, $dx, $dy, $vol) = @$_;
228 227
229 my $channel = CFPlus::Channel::find; 228 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 229 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $dx = $dx / 10 * 255;
232 $channel->set_panning (255 - $dx, 255 + $dx);
233
234# my $angle = $dx ? : $dx < 0 ?
235# my $distance = -$vol;
236# $channel->set_position ($angle, $distance); 230 $channel->set_position_r ($dx, $dy, 20);
237
238 $chunk->play ($channel); 231 $chunk->play ($channel);
239 } 232 }
240 } else { 233 } else {
241 # sound_meta not set means data is in flight either way 234 # sound_meta not set means data is in flight either way
242 my $meta = $CONN->{sound_meta}{$face} 235 my $meta = $CONN->{sound_meta}{$face}
… …
270 or return; 263 or return;
271 $CFG->{effects_enable} 264 $CFG->{effects_enable}
272 or return; 265 or return;
273 266
274 my $queue = $AUDIO_PLAY{$face} ||= []; 267 my $queue = $AUDIO_PLAY{$face} ||= [];
275 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
276 audio_sound_push $face 269 audio_sound_push $face
277 unless @$queue > 1; 270 unless @$queue > 1;
278} 271}
279 272
280sub audio_music_set_meta { 273sub audio_music_set_meta {
… …
776 state => $CFG->{fullscreen}, 769 state => $CFG->{fullscreen},
777 tooltip => "Bring the client into fullscreen mode.", 770 tooltip => "Bring the client into fullscreen mode.",
778 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
779 ); 772 );
780 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
781 $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");
782 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
783 state => $CFG->{fast}, 788 state => $CFG->{fast},
784 tooltip => "Lower the visual quality considerably to speed up rendering.", 789 tooltip => "Lower the visual quality considerably to speed up rendering.",
785 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 790 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
… …
811 816
812 $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");
813 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 818 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
814 state => $CFG->{map_smoothing}, 819 state => $CFG->{map_smoothing},
815 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. "
816 . "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. "
817 . "Changes take effect at next connection only.", 822 . "Changes take effect at next login only.",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 823 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
819 ); 824 );
820 825
821 $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");
822 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 827 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
… …
833 ); 838 );
834 839
835 $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");
836 $table->add_at (1, $row++, new CFPlus::UI::Slider 841 $table->add_at (1, $row++, new CFPlus::UI::Slider
837 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 842 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
838 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.",
839 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 },
840 ); 846 );
841 847
842 $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");
843 $table->add_at (1, $row++, new CFPlus::UI::Slider 849 $table->add_at (1, $row++, new CFPlus::UI::Slider
… …
2098my $animate_timer; 2104my $animate_timer;
2099 2105
2100my $fps = 9; 2106my $fps = 9;
2101 2107
2102sub force_refresh { 2108sub force_refresh {
2109 if ($ENV{CFPLUS_DEBUG} & 4) {
2103 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2110 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2104 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2111 debug sprintf "%3.2f", $fps;
2112 }
2105 2113
2106 $CFPlus::UI::ROOT->draw; 2114 $CFPlus::UI::ROOT->draw;
2107 2115 CFPlus::SDL_GL_SwapBuffers;
2108 $WANT_REFRESH = 0;
2109 $CAN_REFRESH = 0;
2110 $LAST_REFRESH = $NOW; 2116 $LAST_REFRESH = $NOW;
2111 2117 $WANT_REFRESH->stop;
2112 CFPlus::SDL_GL_SwapBuffers;
2113} 2118}
2114 2119
2120$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2121
2115my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2122my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
2116 $NOW = time; 2123 $NOW = time;
2117 2124
2118 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2125 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2119 for CFPlus::poll_events; 2126 for CFPlus::poll_events;
2120 2127
2121 if (%animate_object) { 2128 if (%animate_object) {
2122 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2129 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2123 ++$WANT_REFRESH; 2130 $WANT_REFRESH->start;
2124 }
2125
2126 if ($WANT_REFRESH) {
2127 force_refresh;
2128 } else {
2129 $CAN_REFRESH = 1;
2130 } 2131 }
2131}); 2132});
2132 2133
2133sub animation_start { 2134sub animation_start {
2134 my ($widget) = @_; 2135 my ($widget) = @_;
… …
2192 2193
2193 my %DEF_CFG = ( 2194 my %DEF_CFG = (
2194 sdl_mode => 0, 2195 sdl_mode => 0,
2195 fullscreen => 0, 2196 fullscreen => 0,
2196 fast => 0, 2197 fast => 0,
2198 opengl11 => 0,
2197 map_scale => 1, 2199 map_scale => 1,
2198 fow_enable => 1, 2200 fow_enable => 1,
2199 fow_intensity => 0, 2201 fow_intensity => 0,
2200 map_smoothing => 1, 2202 map_smoothing => 1,
2201 gui_fontsize => 1, 2203 gui_fontsize => 1,

Diff Legend

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