[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.52 by root, Fri Jul 18 21:18:42 2008 UTC

 use AnyEvent::Socket ();
 use Compress::LZF;
 use DC;
-BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
+BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
 use DC::OpenGL ();
 use DC::Protocol;
 use DC::DB;
 use DC::UI;
 use DC::UI::Canvas;
 our $FAST; # fast, low-quality mode, possibly useful for software-rendering
 our $WANT_REFRESH;
 our @SDL_MODES;
+our $SDL_REINIT = 1;
 our $WIDTH;
 our $HEIGHT;
 our $FULLSCREEN;
 our $FONTSIZE;
       state => $CFG->{force_opengl11},
       tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
                . "higher memory usage and slower performance. It will, however, help tremendously on "
                . "cards that claim to support a feature but fall back to software rendering. "
                . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
-               . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
+               . "but cards and drivers from other vendors (ATI) are often just as bad. "
-               . "experience extremely low framerates and your card should do better, try this option.</b>",
+               . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
       on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
+   );
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
+   $table->add_at (1, $row++, new DC::UI::CheckBox
+      state => $CFG->{disable_alpha},
+      tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
+               . "by disabling a number of textures and transparency effects. Normally, these "
+               . "effects do not cost a lot of resources, but some graphics cards might fall "
+               . "back to etxremely slow rendering if this is enabled. If disabling this option "
+               . "noticably improves the framerate of the client please report this! "
+               . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
+      on_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{disable_alpha} = $value;
+         $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
+         0
+      }
    );
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
    $table->add_at (1, $row++, new DC::UI::CheckBox
       state => $CFG->{texture_compression},
       $dialog->show;
    };
 }
 sub sdl_init {
-   DC::SDL_Init
+   DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
       and die "SDL::Init failed!\n";
 }
 sub video_init {
+   DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
+   $SDL_REINIT = 0;
+   @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
+   @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
+   @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
+   @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+   @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
-   $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
+   if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
+      $CFG->{sdl_mode} = 0;
+      for (reverse 0 .. $#SDL_MODES) {
+         $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
+      }
+   }
    my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
    ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
    $FULLSCREEN = $CFG->{fullscreen};
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
 sub video_shutdown {
    DC::OpenGL::shutdown;
+   DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
    undef $SDL_ACTIVE;
 }
 my %animate_object;
 #      printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
    },
    DC::SDL_KEYDOWN => sub {
       if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
          # alt-enter
+         video_shutdown;
          $FULLSCREEN_ENABLE->toggle;
-         video_shutdown;
          video_init;
       } else {
          &DC::UI::feed_sdl_key_down_event;
       }
       update_modbox;
    my %DEF_CFG = (
       sdl_mode            => 0,
       fullscreen          => 1,
       fast                => 0,
       force_opengl11      => undef,
+      disable_alpha       => 0,
       texture_compression => 1,
       map_scale           => 1,
       fow_enable          => 1,
       fow_intensity       => 0,
       map_smoothing       => 1,
       }
    }
    sdl_init;
-   @SDL_MODES = DC::SDL_ListModes 8, 8;
-   @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
-   @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
-   @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
-   $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
    {
       my @fonts = map DC::find_rcfile "fonts/$_", qw(
          DejaVuSans.ttf
          DejaVuSansMono.ttf
          DejaVuSans-Bold.ttf

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs. Revision 1.52 by root, Fri Jul 18 21:18:42 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.52 by root, Fri Jul 18 21:18:42 2008 UTC