[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.59 by elmex, Tue May 23 17:30:18 2006 UTC

    use XSLoader;
    XSLoader::load "CFClient", $VERSION;
 }
+use Carp ();
-use AnyEvent;
+use AnyEvent ();
 use BerkeleyDB;
 use CFClient::OpenGL;
 our %GL_EXT;
 our $GL_VERSION;
 our $GL_NPOT;
+our $GL_DEBUG = 1;
 sub gl_init {
    $GL_VERSION = gl_version * 1;
    %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
    $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
+   $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_COLOR_MATERIAL;
+   glDisable GL_COLOR_MATERIAL;
    glShadeModel GL_FLAT;
+   glDisable GL_DITHER;
    glDisable GL_DEPTH_TEST;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glDepthMask 0;
    glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
    CFClient::Texture::restore_state ();
+}
+sub gl_check {
+   return unless $GL_DEBUG;
+   if (my $error = glGetError) {
+      Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
+   }
 }
 sub find_rcfile($) {
    my $path;
-   for (@INC) {
+   for (grep !ref, @INC) {
       $path = "$_/CFClient/resources/$_[0]";
       return $path if -r $path;
    }
    die "FATAL: can't find required file $_[0]\n";
                  -Home => "$Crossfire::VARDIR/pclient",
                  -Cachesize => 1_000_000,
                  -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
 #                 -ErrPrefix => "DATABASE",
                  -Verbose => 1,
-                 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
+                 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
                     or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
 sub db_table($) {
    my ($table) = @_;
    new CFClient::Database
       -Env      => $DB_ENV,
       -Filename => $table,
 #      -Filename => "database",
 #      -Subname  => $table,
+      -Property => DB_CHKSUM,
       -Flags    => DB_CREATE | DB_UPGRADE,
          or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
+}
+sub pod_to_pango($) {
+   my ($pom) = @_;
+   $pom->present ("CFClient::PodToPango")
+}
+package CFClient::PodToPango;
+use base Pod::POM::View::Text;
+our $indent = 0;
+*view_seq_code   =
+*view_seq_bold   = sub { "<b>$_[1]</b>" };
+*view_seq_italic = sub { "<i>$_[1]</i>" };
+*view_seq_space  =
+*view_seq_link   =
+*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
+sub view_seq_text {
+   my $text = $_[1];
+   $text =~ s/\s+/ /g;
+   CFClient::UI::Label::escape ($text)
+}
+sub view_item {
+   ("\t" x ($indent / 4))
+   . $_[1]->title->present ($_[0])
+   . "\n"
+   . $_[1]->content->present ($_[0])
+}
+sub view_verbatim {
+   (join "",
+       map +("\t" x ($indent / 2)) . "$_\n",
+          split /\n/, CFClient::UI::Label::escape ($_[1]))
+   . "\n"
+}
+sub view_textblock {
+   ("\t" x ($indent / 2)) . "$_[1]\n\n"
+}
+sub view_head2 {
+   "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
+   . $_[1]->content->present ($_[0])
+};
+sub view_over {
+   local $indent = $indent + $_[1]->indent;
+   $_[1]->content->present ($_[0])
 }
 package CFClient::Database;
 our @ISA = BerkeleyDB::Btree::;
 #}
 sub new_from_layout {
    my ($class, $layout, %arg) = @_;
-   my ($w, $h, $data) = $layout->render;
+   my ($w, $h, $data, $format, $internalformat) = $layout->render;
    $class->new (
       w              => $w,
       h              => $h,
       data           => $data,
-      internalformat => GL_ALPHA4,
-      format         => GL_ALPHA,
+      format         => $format,
+      internalformat => $format,
       type           => GL_UNSIGNED_BYTE,
       %arg,
    )
 }
 sub new_from_opengl {
    my ($class, $w, $h, $cb) = @_;
-   $class->new (w => $w, h => $h, render_cb => $cb)
+   $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
 }
 sub topot {
    (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
 }
          = CFClient::load_image_inline $self->{image};
    }
    my ($tw, $th) = @$self{qw(w h)};
-   unless ($tw && $th) {
+   unless ($tw > 0 && $th > 0) {
       $tw = $th = 1;
       $data = "\x00" x 64;
    }
    $self->{minified} = [CFClient::average $tw, $th, $data]
    unless ($GL_NPOT) {
       # TODO: does not work for zero-sized textures
       $tw = topot $tw;
       $th = topot $th;
-      if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
+      if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
          my $bpp = (length $data) / ($self->{w} * $self->{h});
          $data = pack "(a" . ($tw * $bpp) . ")*",
                     unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
          $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
       }
    }
    $self->{s} = $self->{w} / $tw;
    $self->{t} = $self->{h} / $th;
-   glGetError;
    $self->{name} ||= glGenTexture;
    glBindTexture GL_TEXTURE_2D, $self->{name};
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
    if ($::FAST) {
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
+   } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
+      # alternatively check for 0x8191
+      glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
    } else {
       glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
-      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
    }
+   glGetError;
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
-                   $tw, $th, # need to pad texture first
+                   $tw, $th,
                    0,
                    $self->{format},
                    $self->{type},
                    $data;
-      if (my $error = glGetError) {
+      CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
-         warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
-                      $error, $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
+                         $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
-      }
    } else {
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
                    $tw, $th,
                    0;
-      glGetError and die "glCopyTexImage2D $tw,$th";
+      CFClient::gl_check "copying to texture %dx%d if=%x",
+                         $tw, $th, $self->{internalformat};
    }
+   glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
 }
 sub DESTROY {
    my ($self) = @_;
    glDeleteTexture delete $self->{name}
       if $self->{name};
 }
-sub restore_state{
+sub restore_state {
    $_->upload
       for values %TEXTURES;
-};
+}
 1;
 =back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC vs. Revision 1.59 by elmex, Tue May 23 17:30:18 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.59 by elmex, Tue May 23 17:30:18 2006 UTC