--- deliantra/Deliantra-Client/DC.pm 2006/05/14 20:51:19 1.51
+++ deliantra/Deliantra-Client/DC.pm 2006/05/23 00:26:17 1.58
@@ -22,8 +22,9 @@
}
use Carp ();
-use AnyEvent;
+use AnyEvent ();
use BerkeleyDB;
+
use CFClient::OpenGL;
our %GL_EXT;
@@ -42,6 +43,7 @@
glShadeModel GL_FLAT;
glDisable GL_DITHER;
glDisable GL_DEPTH_TEST;
+ glDepthMask 0;
glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
CFClient::Texture::restore_state ();
@@ -51,7 +53,7 @@
return unless $GL_DEBUG;
if (my $error = glGetError) {
- Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
+ Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
}
}
@@ -106,7 +108,7 @@
-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($) {
@@ -124,6 +126,59 @@
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 { "$_[1]" };
+*view_seq_italic = sub { "$_[1]" };
+*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 {
+ "" . $_[1]->title->present ($_[0]) . "\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::;
@@ -303,7 +358,7 @@
if (defined $data) {
glTexImage2D GL_TEXTURE_2D, 0,
$self->{internalformat},
- $tw, $th, # need to pad texture first
+ $tw, $th,
0,
$self->{format},
$self->{type},
@@ -319,6 +374,8 @@
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 {
@@ -330,10 +387,10 @@
if $self->{name};
}
-sub restore_state{
+sub restore_state {
$_->upload
for values %TEXTURES;
-};
+}
1;