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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.50 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC

…		…
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
23		23
		24	use utf8;
		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent;	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
		29
27	use CFClient::OpenGL;	30	use CFClient::OpenGL;
28		31
29	our %GL_EXT;	32	our %GL_EXT;
30	our $GL_VERSION;	33	our $GL_VERSION;
31		34
…		…
35	sub gl_init {	38	sub gl_init {
36	$GL_VERSION = gl_version * 1;	39	$GL_VERSION = gl_version * 1;
37	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38		41
39	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	42	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
		43	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
40		44
41	glDisable GL_COLOR_MATERIAL;	45	glDisable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;	46	glShadeModel GL_FLAT;
43	glDisable GL_DITHER;	47	glDisable GL_DITHER;
44	glDisable GL_DEPTH_TEST;	48	glDisable GL_DEPTH_TEST;
		49	glDepthMask 0;
45	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;	50	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46		51
47	CFClient::Texture::restore_state ();	52	CFClient::Texture::restore_state ();
48	}	53	}
49		54
50	sub gl_check {	55	sub gl_check {
51	return unless $GL_DEBUG;	56	return unless $GL_DEBUG;
52		57
53	if (my $error = glGetError) {	58	if (my $error = glGetError) {
		59	my ($format, @args) = @_;
54	Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;	60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
55	}	61	}
56	}	62	}
57		63
58	sub find_rcfile($) {	64	sub find_rcfile($) {
59	my $path;	65	my $path;
…		…
104	-Home => "$Crossfire::VARDIR/pclient",	110	-Home => "$Crossfire::VARDIR/pclient",
105	-Cachesize => 1_000_000,	111	-Cachesize => 1_000_000,
106	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107	# -ErrPrefix => "DATABASE",	113	# -ErrPrefix => "DATABASE",
108	-Verbose => 1,	114	-Verbose => 1,
109	-Flags => DB_CREATE \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	115	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,
110	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	116	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
111		117
112	sub db_table($) {	118	sub db_table($) {
113	my ($table) = @_;	119	my ($table) = @_;
114		120
…		…
117	new CFClient::Database	123	new CFClient::Database
118	-Env => $DB_ENV,	124	-Env => $DB_ENV,
119	-Filename => $table,	125	-Filename => $table,
120	# -Filename => "database",	126	# -Filename => "database",
121	# -Subname => $table,	127	# -Subname => $table,
		128	-Property => DB_CHKSUM,
122	-Flags => DB_CREATE \| DB_UPGRADE,	129	-Flags => DB_CREATE \| DB_UPGRADE,
123	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	130	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
		131	}
		132
		133	sub pod_to_pango($) {
		134	my ($pom) = @_;
		135
		136	$pom->present ("CFClient::PodToPango")
		137	}
		138
		139	sub pod_to_pango_list($) {
		140	my ($pom) = @_;
		141
		142	[
		143	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
		144	split /\n/, $pom->present ("CFClient::PodToPango")
		145	]
		146	}
		147
		148	package CFClient::PodToPango;
		149
		150	use base Pod::POM::View::Text;
		151
		152	our $indent = 0;
		153
		154	*view_seq_code =
		155	*view_seq_bold = sub { "<b>$_[1]</b>" };
		156	*view_seq_italic = sub { "<i>$_[1]</i>" };
		157	*view_seq_space =
		158	*view_seq_link =
		159	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		160
		161	sub view_seq_text {
		162	my $text = $_[1];
		163	$text =~ s/\s+/ /g;
		164	CFClient::UI::Label::escape ($text)
		165	}
		166
		167	sub view_item {
		168	("\t" x ($indent / 4))
		169	. $_[1]->title->present ($_[0])
		170	. "\n"
		171	. $_[1]->content->present ($_[0])
		172	}
		173
		174	sub view_verbatim {
		175	(join "",
		176	map +("\t" x ($indent / 2)) . "$_\n",
		177	split /\n/, CFClient::UI::Label::escape ($_[1]))
		178	. "\n"
		179	}
		180
		181	sub view_textblock {
		182	("\t" x ($indent / 2)) . "$_[1]\n\n"
		183	}
		184
		185	sub view_head1 {
		186	"<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		187	. $_[1]->content->present ($_[0])
		188	};
		189
		190	sub view_head2 {
		191	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		192	. $_[1]->content->present ($_[0])
		193	};
		194
		195	sub view_over {
		196	local $indent = $indent + $_[1]->indent;
		197	$_[1]->content->present ($_[0])
124	}	198	}
125		199
126	package CFClient::Database;	200	package CFClient::Database;
127		201
128	our @ISA = BerkeleyDB::Btree::;	202	our @ISA = BerkeleyDB::Btree::;
…		…
141	my ($db, $key, $data) = @_;	215	my ($db, $key, $data) = @_;
142		216
143	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	217	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
144		218
145	$db->db_put ($key => $data)	219	$db->db_put ($key => $data)
		220	}
		221
		222	package CFClient::Item;
		223
		224	sub desc_string {
		225	my ($self) = @_;
		226
		227	my $desc =
		228	$self->{nrof} < 2
		229	? $self->{name}
		230	: "$self->{nrof} × $self->{name_pl}";
		231
		232	$self->{flags} & Crossfire::Protocol::F_OPEN
		233	and $desc .= " (open)";
		234	$self->{flags} & Crossfire::Protocol::F_APPLIED
		235	and $desc .= " (applied)";
		236	$self->{flags} & Crossfire::Protocol::F_UNPAID
		237	and $desc .= " (unpaid)";
		238	$self->{flags} & Crossfire::Protocol::F_MAGIC
		239	and $desc .= " (magic)";
		240	$self->{flags} & Crossfire::Protocol::F_CURSED
		241	and $desc .= " (cursed)";
		242	$self->{flags} & Crossfire::Protocol::F_DAMNED
		243	and $desc .= " (damned)";
		244	$self->{flags} & Crossfire::Protocol::F_LOCKED
		245	and $desc .= " *";
		246
		247	$desc
		248	}
		249
		250	sub weight_string {
		251	my ($self) = @_;
		252
		253	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
		254
		255	$weight < 0 ? "?" : $weight * 0.001
		256	}
		257
		258	sub update_widgets {
		259	my ($self) = @_;
		260
		261	my $tooltip_std = "<small>"
		262	. "Left click - examine item\n"
		263	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		264	. "Middle click - apply\n"
		265	. "Right click - further options"
		266	. "</small>\n";
		267
		268	$self->{face_widget} \|\|= new CFClient::UI::Face can_events => 1, can_hover => 1;
		269	$self->{face_widget}{face} = $self->{face};
		270	$self->{face_widget}{anim} = $self->{anim};
		271	$self->{face_widget}{animspeed} = $self->{animespeed};
		272	$self->{face_widget}->set_tooltip (
		273	"<b>Face/Animation.</b>\n"
		274	. "Item uses face #$self->{face}. "
		275	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		276	. "\n\n$tooltip_std"
		277	);
		278
		279	$self->{desc_widget} \|\|= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1;
		280	$self->{desc_widget}->set_text (CFClient::Item::desc_string $self);
		281
		282	$self->{weight_widget} \|\|= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5;
		283	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
		284
		285	$self->{weight_widget}->set_tooltip (
		286	"<b>Weight</b>.\n"
		287	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		288	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		289	. "\n\n$tooltip_std"
		290	);
146	}	291	}
147		292
148	package CFClient::Texture;	293	package CFClient::Texture;
149		294
150	use strict;	295	use strict;
…		…
300	glGetError;	445	glGetError;
301		446
302	if (defined $data) {	447	if (defined $data) {
303	glTexImage2D GL_TEXTURE_2D, 0,	448	glTexImage2D GL_TEXTURE_2D, 0,
304	$self->{internalformat},	449	$self->{internalformat},
305	$tw, $th, # need to pad texture first	450	$tw, $th,
306	0,	451	0,
307	$self->{format},	452	$self->{format},
308	$self->{type},	453	$self->{type},
309	$data;	454	$data;
310	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",	455	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
…		…
316	$tw, $th,	461	$tw, $th,
317	0;	462	0;
318	CFClient::gl_check "copying to texture %dx%d if=%x",	463	CFClient::gl_check "copying to texture %dx%d if=%x",
319	$tw, $th, $self->{internalformat};	464	$tw, $th, $self->{internalformat};
320	}	465	}
		466
		467	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
321	}	468	}
322		469
323	sub DESTROY {	470	sub DESTROY {
324	my ($self) = @_;	471	my ($self) = @_;
325		472
…		…
327		474
328	glDeleteTexture delete $self->{name}	475	glDeleteTexture delete $self->{name}
329	if $self->{name};	476	if $self->{name};
330	}	477	}
331		478
332	sub restore_state{	479	sub restore_state {
333	$_->upload	480	$_->upload
334	for values %TEXTURES;	481	for values %TEXTURES;
335	};	482	}
336		483
337	1;	484	1;
338		485
339	=back	486	=back
340		487

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.50 by root, Thu May 11 23:41:45 2006 UTC vs. Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.50 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC