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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.43 by root, Fri Apr 21 07:19:56 2006 UTC vs.
Revision 1.64 by elmex, Thu May 25 18:48:45 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
32	our $GL_NPOT;	35	our $GL_NPOT;
		36	our $GL_DEBUG = 1;
33		37
34	sub gl_init {	38	sub gl_init {
35	$GL_VERSION = gl_version * 1;	39	$GL_VERSION = gl_version * 1;
36	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37		41
38	$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...
39		44
40	glEnable GL_TEXTURE_2D;
41	glEnable GL_COLOR_MATERIAL;	45	glDisable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;	46	glShadeModel GL_FLAT;
		47	glDisable GL_DITHER;
43	glDisable GL_DEPTH_TEST;	48	glDisable GL_DEPTH_TEST;
44	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	49	glDepthMask 0;
45
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 ();
		53	}
		54
		55	sub gl_check {
		56	return unless $GL_DEBUG;
		57
		58	if (my $error = glGetError) {
		59	my ($format, @args) = @_;
		60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
		61	}
49	}	62	}
50		63
51	sub find_rcfile($) {	64	sub find_rcfile($) {
52	my $path;	65	my $path;
53		66
54	for (@INC) {	67	for (grep !ref, @INC) {
55	$path = "$_/CFClient/resources/$_[0]";	68	$path = "$_/CFClient/resources/$_[0]";
56	return $path if -r $path;	69	return $path if -r $path;
57	}	70	}
58		71
59	die "FATAL: can't find required file $_[0]\n";	72	die "FATAL: can't find required file $_[0]\n";
…		…
97	-Home => "$Crossfire::VARDIR/pclient",	110	-Home => "$Crossfire::VARDIR/pclient",
98	-Cachesize => 1_000_000,	111	-Cachesize => 1_000_000,
99	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
100	# -ErrPrefix => "DATABASE",	113	# -ErrPrefix => "DATABASE",
101	-Verbose => 1,	114	-Verbose => 1,
102	-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,
103	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";
104		117
105	sub db_table($) {	118	sub db_table($) {
106	my ($table) = @_;	119	my ($table) = @_;
107		120
…		…
110	new CFClient::Database	123	new CFClient::Database
111	-Env => $DB_ENV,	124	-Env => $DB_ENV,
112	-Filename => $table,	125	-Filename => $table,
113	# -Filename => "database",	126	# -Filename => "database",
114	# -Subname => $table,	127	# -Subname => $table,
		128	-Property => DB_CHKSUM,
115	-Flags => DB_CREATE \| DB_UPGRADE,	129	-Flags => DB_CREATE \| DB_UPGRADE,
116	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])
117	}	198	}
118		199
119	package CFClient::Database;	200	package CFClient::Database;
120		201
121	our @ISA = BerkeleyDB::Btree::;	202	our @ISA = BerkeleyDB::Btree::;
…		…
134	my ($db, $key, $data) = @_;	215	my ($db, $key, $data) = @_;
135		216
136	$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 });
137		218
138	$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->{animespeed};
		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	);
139	}	347	}
140		348
141	package CFClient::Texture;	349	package CFClient::Texture;
142		350
143	use strict;	351	use strict;
…		…
194	#}	402	#}
195		403
196	sub new_from_layout {	404	sub new_from_layout {
197	my ($class, $layout, %arg) = @_;	405	my ($class, $layout, %arg) = @_;
198		406
199	my ($w, $h, $data) = $layout->render;	407	my ($w, $h, $data, $format, $internalformat) = $layout->render;
200		408
201	$class->new (	409	$class->new (
202	w => $w,	410	w => $w,
203	h => $h,	411	h => $h,
204	data => $data,	412	data => $data,
205	internalformat => GL_ALPHA4,
206	format => GL_ALPHA,	413	format => $format,
		414	internalformat => $format,
207	type => GL_UNSIGNED_BYTE,	415	type => GL_UNSIGNED_BYTE,
208	%arg,	416	%arg,
209	)	417	)
210	}	418	}
211		419
212	sub new_from_opengl {	420	sub new_from_opengl {
213	my ($class, $w, $h, $cb) = @_;	421	my ($class, $w, $h, $cb) = @_;
214		422
215	$class->new (w => $w, h => $h, render_cb => $cb)	423	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
216	}	424	}
217		425
218	sub topot {	426	sub topot {
219	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]	427	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
220	}	428	}
…		…
243	= CFClient::load_image_inline $self->{image};	451	= CFClient::load_image_inline $self->{image};
244	}	452	}
245		453
246	my ($tw, $th) = @$self{qw(w h)};	454	my ($tw, $th) = @$self{qw(w h)};
247		455
248	unless ($tw && $th) {	456	unless ($tw > 0 && $th > 0) {
249	$tw = $th = 1;	457	$tw = $th = 1;
250	$data = "\x00" x 64;	458	$data = "\x00" x 64;
251	}	459	}
252		460
253	$self->{minified} = [CFClient::average $tw, $th, $data]	461	$self->{minified} = [CFClient::average $tw, $th, $data]
…		…
267	}	475	}
268		476
269	$self->{s} = $self->{w} / $tw;	477	$self->{s} = $self->{w} / $tw;
270	$self->{t} = $self->{h} / $th;	478	$self->{t} = $self->{h} / $th;
271		479
272	glGetError;
273
274	$self->{name} \|\|= glGenTexture;	480	$self->{name} \|\|= glGenTexture;
275		481
276	glBindTexture GL_TEXTURE_2D, $self->{name};	482	glBindTexture GL_TEXTURE_2D, $self->{name};
277		483
278	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	484	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	485	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
280		486
281	if ($::FAST) {	487	if ($::FAST) {
282	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;	488	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
283	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;	489	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
		490	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
		491	# alternatively check for 0x8191
		492	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
		493	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		494	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
284	} else {	495	} else {
285	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};	496	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
286	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	497	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
287	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;	498	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
288	}	499	}
289		500
		501	glGetError;
		502
290	if (defined $data) {	503	if (defined $data) {
291	glTexImage2D GL_TEXTURE_2D, 0,	504	glTexImage2D GL_TEXTURE_2D, 0,
292	$self->{internalformat},	505	$self->{internalformat},
293	$tw, $th, # need to pad texture first	506	$tw, $th,
294	0,	507	0,
295	$self->{format},	508	$self->{format},
296	$self->{type},	509	$self->{type},
297	$data;	510	$data;
298	if (my $error = glGetError) {	511	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
299	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
300	$error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};	512	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
301	}
302	} else {	513	} else {
303	glCopyTexImage2D GL_TEXTURE_2D, 0,	514	glCopyTexImage2D GL_TEXTURE_2D, 0,
304	$self->{internalformat},	515	$self->{internalformat},
305	0, 0,	516	0, 0,
306	$tw, $th,	517	$tw, $th,
307	0;	518	0;
308	if (my $error = glGetError) {	519	CFClient::gl_check "copying to texture %dx%d if=%x",
309	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
310	$error, $tw, $th, $self->{internalformat};	520	$tw, $th, $self->{internalformat};
311	}
312	}	521	}
		522
		523	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
313	}	524	}
314		525
315	sub DESTROY {	526	sub DESTROY {
316	my ($self) = @_;	527	my ($self) = @_;
317		528
…		…
319		530
320	glDeleteTexture delete $self->{name}	531	glDeleteTexture delete $self->{name}
321	if $self->{name};	532	if $self->{name};
322	}	533	}
323		534
324	sub restore_state{	535	sub restore_state {
325	$_->upload	536	$_->upload
326	for values %TEXTURES;	537	for values %TEXTURES;
327	};	538	}
328		539
329	1;	540	1;
330		541
331	=back	542	=back
332		543

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.43 by root, Fri Apr 21 07:19:56 2006 UTC vs. Revision 1.64 by elmex, Thu May 25 18:48:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.43 by root, Fri Apr 21 07:19:56 2006 UTC vs.
Revision 1.64 by elmex, Thu May 25 18:48:45 2006 UTC