[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.68 by root, Thu May 25 21:48:22 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
		26	use Carp ();
24	use AnyEvent;	27	use AnyEvent ();
25	use BerkeleyDB;	28	use BerkeleyDB;
		29
26	use CFClient::OpenGL;	30	use CFClient::OpenGL;
27		31
28	our %GL_EXT;	32	our %GL_EXT;
29	our $GL_VERSION;	33	our $GL_VERSION;
30		34
31	our $GL_NPOT;	35	our $GL_NPOT;
		36	our $GL_DEBUG = 1;
32		37
33	sub gl_init {	38	sub gl_init {
34	$GL_VERSION = gl_version * 1;	39	$GL_VERSION = gl_version * 1;
35	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36		41
37	$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...
38		44
39	glEnable GL_TEXTURE_2D;
40	glEnable GL_COLOR_MATERIAL;	45	glDisable GL_COLOR_MATERIAL;
41	glShadeModel GL_FLAT;	46	glShadeModel GL_FLAT;
		47	glDisable GL_DITHER;
42	glDisable GL_DEPTH_TEST;	48	glDisable GL_DEPTH_TEST;
43	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	49	glDepthMask 0;
44
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 ();
		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	}
48	}	62	}
49		63
50	sub find_rcfile($) {	64	sub find_rcfile($) {
51	my $path;	65	my $path;
52		66
53	for (@INC) {	67	for (grep !ref, @INC) {
54	$path = "$_/CFClient/resources/$_[0]";	68	$path = "$_/CFClient/resources/$_[0]";
55	return $path if -r $path;	69	return $path if -r $path;
56	}	70	}
57		71
58	die "FATAL: can't find required file $_[0]\n";	72	die "FATAL: can't find required file $_[0]\n";
…		…
96	-Home => "$Crossfire::VARDIR/pclient",	110	-Home => "$Crossfire::VARDIR/pclient",
97	-Cachesize => 1_000_000,	111	-Cachesize => 1_000_000,
98	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99	# -ErrPrefix => "DATABASE",	113	# -ErrPrefix => "DATABASE",
100	-Verbose => 1,	114	-Verbose => 1,
101	-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,
102	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";
103		117
104	sub db_table($) {	118	sub db_table($) {
105	my ($table) = @_;	119	my ($table) = @_;
106		120
…		…
109	new CFClient::Database	123	new CFClient::Database
110	-Env => $DB_ENV,	124	-Env => $DB_ENV,
111	-Filename => $table,	125	-Filename => $table,
112	# -Filename => "database",	126	# -Filename => "database",
113	# -Subname => $table,	127	# -Subname => $table,
		128	-Property => DB_CHKSUM,
114	-Flags => DB_CREATE \| DB_UPGRADE,	129	-Flags => DB_CREATE \| DB_UPGRADE,
115	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])
116	}	198	}
117		199
118	package CFClient::Database;	200	package CFClient::Database;
119		201
120	our @ISA = BerkeleyDB::Btree::;	202	our @ISA = BerkeleyDB::Btree::;
…		…
133	my ($db, $key, $data) = @_;	215	my ($db, $key, $data) = @_;
134		216
135	$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 });
136		218
137	$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	anim => $self->{anim},
		310	animspeed => $self->{animspeed}, # TODO# must be set at creation time
		311	connect_button_down => $button_cb,
		312	;
		313	$self->{face_widget}{face} = $self->{face};
		314	$self->{face_widget}{anim} = $self->{anim};
		315	$self->{face_widget}{animspeed} = $self->{animspeed};
		316	$self->{face_widget}->set_tooltip (
		317	"<b>Face/Animation.</b>\n"
		318	. "Item uses face #$self->{face}. "
		319	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		320	. "\n\n$tooltip_std"
		321	);
		322
		323	$self->{desc_widget} \|\|= new CFClient::UI::Label
		324	can_events => 1,
		325	can_hover => 1,
		326	ellipsise => 2,
		327	align => -1,
		328	connect_button_down => $button_cb,
		329	;
		330	my $desc = CFClient::Item::desc_string $self;
		331	$self->{desc_widget}->set_text ($desc);
		332	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
		333
		334	$self->{weight_widget} \|\|= new CFClient::UI::Label
		335	can_events => 1,
		336	can_hover => 1,
		337	ellipsise => 0,
		338	align => 0,
		339	connect_button_down => $button_cb,
		340	;
		341	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
		342
		343	$self->{weight_widget}->set_tooltip (
		344	"<b>Weight</b>.\n"
		345	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		346	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		347	. "\n\n$tooltip_std"
		348	);
138	}	349	}
139		350
140	package CFClient::Texture;	351	package CFClient::Texture;
141		352
142	use strict;	353	use strict;
…		…
193	#}	404	#}
194		405
195	sub new_from_layout {	406	sub new_from_layout {
196	my ($class, $layout, %arg) = @_;	407	my ($class, $layout, %arg) = @_;
197		408
198	my ($w, $h, $data) = $layout->render;	409	my ($w, $h, $data, $format, $internalformat) = $layout->render;
199		410
200	$class->new (	411	$class->new (
201	w => $w,	412	w => $w,
202	h => $h,	413	h => $h,
203	data => $data,	414	data => $data,
204	internalformat => GL_ALPHA4,
205	format => GL_ALPHA,	415	format => $format,
		416	internalformat => $format,
206	type => GL_UNSIGNED_BYTE,	417	type => GL_UNSIGNED_BYTE,
207	%arg,	418	%arg,
208	)	419	)
209	}	420	}
210		421
211	sub new_from_opengl {	422	sub new_from_opengl {
212	my ($class, $w, $h, $cb) = @_;	423	my ($class, $w, $h, $cb) = @_;
213		424
214	$class->new (w => $w, h => $h, render_cb => $cb)	425	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
215	}	426	}
216		427
217	sub topot {	428	sub topot {
218	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]	429	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
219	}	430	}
…		…
242	= CFClient::load_image_inline $self->{image};	453	= CFClient::load_image_inline $self->{image};
243	}	454	}
244		455
245	my ($tw, $th) = @$self{qw(w h)};	456	my ($tw, $th) = @$self{qw(w h)};
246		457
247	unless ($tw && $th) {	458	unless ($tw > 0 && $th > 0) {
248	$tw = $th = 1;	459	$tw = $th = 1;
249	$data = "\x00" x 64;	460	$data = "\x00" x 64;
250	}	461	}
251		462
252	$self->{minified} = [CFClient::average $tw, $th, $data]	463	$self->{minified} = [CFClient::average $tw, $th, $data]
…		…
255	unless ($GL_NPOT) {	466	unless ($GL_NPOT) {
256	# TODO: does not work for zero-sized textures	467	# TODO: does not work for zero-sized textures
257	$tw = topot $tw;	468	$tw = topot $tw;
258	$th = topot $th;	469	$th = topot $th;
259		470
260	if ($tw != $self->{w} \|\| $th != $self->{h} && defined $data) {	471	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
261	my $bpp = (length $data) / ($self->{w} * $self->{h});	472	my $bpp = (length $data) / ($self->{w} * $self->{h});
262	$data = pack "(a" . ($tw * $bpp) . ")*",	473	$data = pack "(a" . ($tw * $bpp) . ")*",
263	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	474	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	475	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265	}	476	}
266	}	477	}
267		478
268	$self->{s} = $self->{w} / $tw;	479	$self->{s} = $self->{w} / $tw;
269	$self->{t} = $self->{h} / $th;	480	$self->{t} = $self->{h} / $th;
270		481
271	glGetError;
272
273	$self->{name} \|\|= glGenTexture;	482	$self->{name} \|\|= glGenTexture;
274		483
275	glBindTexture GL_TEXTURE_2D, $self->{name};	484	glBindTexture GL_TEXTURE_2D, $self->{name};
276		485
277	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	486	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
278	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	487	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279		488
280	if ($::FAST) {	489	if ($::FAST) {
281	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;	490	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;	491	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
		492	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
		493	# alternatively check for 0x8191
		494	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
		495	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		496	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
283	} else {	497	} else {
284	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};	498	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	499	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;	500	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
287	}	501	}
288		502
		503	glGetError;
		504
289	if (defined $data) {	505	if (defined $data) {
290	glTexImage2D GL_TEXTURE_2D, 0,	506	glTexImage2D GL_TEXTURE_2D, 0,
291	$self->{internalformat},	507	$self->{internalformat},
292	$tw, $th, # need to pad texture first	508	$tw, $th,
293	0,	509	0,
294	$self->{format},	510	$self->{format},
295	$self->{type},	511	$self->{type},
296	$data;	512	$data;
297	if (my $error = glGetError) {	513	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
298	warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299	$error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};	514	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300	}
301	} else {	515	} else {
302	glCopyTexImage2D GL_TEXTURE_2D, 0,	516	glCopyTexImage2D GL_TEXTURE_2D, 0,
303	$self->{internalformat},	517	$self->{internalformat},
304	0, 0,	518	0, 0,
305	$tw, $th,	519	$tw, $th,
306	0;	520	0;
307	glGetError and die "glCopyTexImage2D $tw,$th";	521	CFClient::gl_check "copying to texture %dx%d if=%x",
		522	$tw, $th, $self->{internalformat};
308	}	523	}
		524
		525	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
309	}	526	}
310		527
311	sub DESTROY {	528	sub DESTROY {
312	my ($self) = @_;	529	my ($self) = @_;
313		530
…		…
315		532
316	glDeleteTexture delete $self->{name}	533	glDeleteTexture delete $self->{name}
317	if $self->{name};	534	if $self->{name};
318	}	535	}
319		536
320	sub restore_state{	537	sub restore_state {
321	$_->upload	538	$_->upload
322	for values %TEXTURES;	539	for values %TEXTURES;
323	};	540	}
324		541
325	1;	542	1;
326		543
327	=back	544	=back
328		545

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.68 by root, Thu May 25 21:48:22 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.68 by root, Thu May 25 21:48:22 2006 UTC