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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.65 by root, Thu May 25 21:18:09 2006 UTC

…		…
18	$VERSION = '0.1';	18	$VERSION = '0.1';
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
		23
		24	use utf8;
23		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent ();	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
27		29
…		…
36	sub gl_init {	38	sub gl_init {
37	$GL_VERSION = gl_version * 1;	39	$GL_VERSION = gl_version * 1;
38	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39		41
40	$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...
41		44
42	glDisable GL_COLOR_MATERIAL;	45	glDisable GL_COLOR_MATERIAL;
43	glShadeModel GL_FLAT;	46	glShadeModel GL_FLAT;
44	glDisable GL_DITHER;	47	glDisable GL_DITHER;
45	glDisable GL_DEPTH_TEST;	48	glDisable GL_DEPTH_TEST;
		49	glDepthMask 0;
46	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;	50	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47		51
48	CFClient::Texture::restore_state ();	52	CFClient::Texture::restore_state ();
49	}	53	}
50		54
51	sub gl_check {	55	sub gl_check {
52	return unless $GL_DEBUG;	56	return unless $GL_DEBUG;
53		57
54	if (my $error = glGetError) {	58	if (my $error = glGetError) {
		59	my ($format, @args) = @_;
55	Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;	60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
56	}	61	}
57	}	62	}
58		63
59	sub find_rcfile($) {	64	sub find_rcfile($) {
60	my $path;	65	my $path;
…		…
105	-Home => "$Crossfire::VARDIR/pclient",	110	-Home => "$Crossfire::VARDIR/pclient",
106	-Cachesize => 1_000_000,	111	-Cachesize => 1_000_000,
107	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
108	# -ErrPrefix => "DATABASE",	113	# -ErrPrefix => "DATABASE",
109	-Verbose => 1,	114	-Verbose => 1,
110	-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,
111	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";
112		117
113	sub db_table($) {	118	sub db_table($) {
114	my ($table) = @_;	119	my ($table) = @_;
115		120
…		…
129	my ($pom) = @_;	134	my ($pom) = @_;
130		135
131	$pom->present ("CFClient::PodToPango")	136	$pom->present ("CFClient::PodToPango")
132	}	137	}
133		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
134	package CFClient::PodToPango;	148	package CFClient::PodToPango;
135		149
136	use base Pod::POM::View::Text;	150	use base Pod::POM::View::Text;
137		151
138	our $indent = 0;	152	our $indent = 0;
…		…
155	. $_[1]->title->present ($_[0])	169	. $_[1]->title->present ($_[0])
156	. "\n"	170	. "\n"
157	. $_[1]->content->present ($_[0])	171	. $_[1]->content->present ($_[0])
158	}	172	}
159		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
160	sub view_textblock {	181	sub view_textblock {
161	("\t" x ($indent / 2)) . "$_[1]\n\n"	182	("\t" x ($indent / 2)) . "$_[1]\n\n"
162	}	183	}
163		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
164	sub view_head2 {	190	sub view_head2 {
165	"<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"	191	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
166	. $_[1]->content->present ($_[0])	192	. $_[1]->content->present ($_[0])
167	};	193	};
168		194
169	sub view_over {	195	sub view_over {
170	local $indent = $indent + $_[1]->indent;	196	local $indent = $indent + $_[1]->indent;
…		…
189	my ($db, $key, $data) = @_;	215	my ($db, $key, $data) = @_;
190		216
191	$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 });
192		218
193	$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 $button_cb = sub {
		262	my (undef, $ev, $x, $y) = @_;
		263
		264	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		265	my $targ = $::CONN->{player}{tag};
		266
		267	if ($self->{container} == $::CONN->{player}{tag}) {
		268	$targ = $::CONN->{open_container};
		269	}
		270
		271	$::CONN->send ("move $targ $self->{tag} 0");
		272	} elsif ($ev->{button} == 1) {
		273	$::CONN->send ("examine $self->{tag}");
		274	} elsif ($ev->{button} == 2) {
		275	$::CONN->send ("apply $self->{tag}");
		276	} elsif ($ev->{button} == 3) {
		277	my @menu_items = (
		278	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		279	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		280	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		281	(
		282	$self->{flags} & Crossfire::Protocol::F_LOCKED
		283	? (
		284	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		285	)
		286	: (
		287	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		288	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		289	)
		290	),
		291	);
		292
		293	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		294	}
		295
		296	1
		297	};
		298
		299	my $tooltip_std = "<small>"
		300	. "Left click - examine item\n"
		301	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		302	. "Middle click - apply\n"
		303	. "Right click - further options"
		304	. "</small>\n";
		305
		306	$self->{face_widget} \|\|= new CFClient::UI::Face
		307	can_events => 1,
		308	can_hover => 1,
		309	connect_button_down => $button_cb,
		310	;
		311	$self->{face_widget}{face} = $self->{face};
		312	$self->{face_widget}{anim} = $self->{anim};
		313	$self->{face_widget}{animspeed} = $self->{animspeed};
		314	$self->{face_widget}->set_tooltip (
		315	"<b>Face/Animation.</b>\n"
		316	. "Item uses face #$self->{face}. "
		317	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		318	. "\n\n$tooltip_std"
		319	);
		320
		321	$self->{desc_widget} \|\|= new CFClient::UI::Label
		322	can_events => 1,
		323	can_hover => 1,
		324	ellipsise => 2,
		325	xalign => 0,
		326	connect_button_down => $button_cb,
		327	;
		328	my $desc = CFClient::Item::desc_string $self;
		329	$self->{desc_widget}->set_text ($desc);
		330	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
		331
		332	$self->{weight_widget} \|\|= new CFClient::UI::Label
		333	can_events => 1,
		334	can_hover => 1,
		335	ellipsise => 0,
		336	xalign => 0.5,
		337	connect_button_down => $button_cb,
		338	;
		339	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
		340
		341	$self->{weight_widget}->set_tooltip (
		342	"<b>Weight</b>.\n"
		343	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		344	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		345	. "\n\n$tooltip_std"
		346	);
194	}	347	}
195		348
196	package CFClient::Texture;	349	package CFClient::Texture;
197		350
198	use strict;	351	use strict;
…		…
348	glGetError;	501	glGetError;
349		502
350	if (defined $data) {	503	if (defined $data) {
351	glTexImage2D GL_TEXTURE_2D, 0,	504	glTexImage2D GL_TEXTURE_2D, 0,
352	$self->{internalformat},	505	$self->{internalformat},
353	$tw, $th, # need to pad texture first	506	$tw, $th,
354	0,	507	0,
355	$self->{format},	508	$self->{format},
356	$self->{type},	509	$self->{type},
357	$data;	510	$data;
358	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",	511	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
…		…
364	$tw, $th,	517	$tw, $th,
365	0;	518	0;
366	CFClient::gl_check "copying to texture %dx%d if=%x",	519	CFClient::gl_check "copying to texture %dx%d if=%x",
367	$tw, $th, $self->{internalformat};	520	$tw, $th, $self->{internalformat};
368	}	521	}
		522
		523	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
369	}	524	}
370		525
371	sub DESTROY {	526	sub DESTROY {
372	my ($self) = @_;	527	my ($self) = @_;
373		528
…		…
375		530
376	glDeleteTexture delete $self->{name}	531	glDeleteTexture delete $self->{name}
377	if $self->{name};	532	if $self->{name};
378	}	533	}
379		534
380	sub restore_state{	535	sub restore_state {
381	$_->upload	536	$_->upload
382	for values %TEXTURES;	537	for values %TEXTURES;
383	};	538	}
384		539
385	1;	540	1;
386		541
387	=back	542	=back
388		543

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.65 by root, Thu May 25 21:18:09 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.65 by root, Thu May 25 21:18:09 2006 UTC