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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.40 by root, Tue Apr 18 01:51:06 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
		26	use Carp ();
24	use AnyEvent;	27	use AnyEvent ();
25	use BerkeleyDB;	28	use BerkeleyDB;
26	use SDL::OpenGL;	29
		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::;
…		…
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)
138	}	220	}
139		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	);
		291	}
		292
140	package CFClient::Texture;	293	package CFClient::Texture;
141		294
142	use strict;	295	use strict;
143		296
144	use Scalar::Util;	297	use Scalar::Util;
145		298
146	use SDL::OpenGL;	299	use CFClient::OpenGL;
147		300
148	my %TEXTURES;	301	my %TEXTURES;
149		302
150	sub new {	303	sub new {
151	my ($class, %data) = @_;	304	my ($class, %data) = @_;
…		…
169		322
170	$class->new (image => $image, %arg)	323	$class->new (image => $image, %arg)
171	}	324	}
172		325
173	sub new_from_file {	326	sub new_from_file {
174	my ($class, $path) = @_;	327	my ($class, $path, %arg) = @_;
175		328
176	open my $fh, "<:raw", $path	329	open my $fh, "<:raw", $path
177	or die "$path: $!";	330	or die "$path: $!";
178		331
179	local $/;	332	local $/;
180	$class->new_from_image (<$fh>)	333	$class->new_from_image (<$fh>, %arg)
181	}	334	}
182		335
183	#sub new_from_surface {	336	#sub new_from_surface {
184	# my ($class, $surface) = @_;	337	# my ($class, $surface) = @_;
185	#	338	#
…		…
191	# h => $surface->height,	344	# h => $surface->height,
192	# )	345	# )
193	#}	346	#}
194		347
195	sub new_from_layout {	348	sub new_from_layout {
196	my ($class, $layout) = @_;	349	my ($class, $layout, %arg) = @_;
197		350
198	my ($w, $h, $data) = $layout->render;	351	my ($w, $h, $data, $format, $internalformat) = $layout->render;
199		352
200	$class->new (	353	$class->new (
201	w => $w,	354	w => $w,
202	h => $h,	355	h => $h,
203	data => $data,	356	data => $data,
204	internalformat => GL_ALPHA4,
205	format => GL_ALPHA,	357	format => $format,
		358	internalformat => $format,
206	type => GL_UNSIGNED_BYTE,	359	type => GL_UNSIGNED_BYTE,
		360	%arg,
207	)	361	)
208	}	362	}
209		363
210	sub new_from_opengl {	364	sub new_from_opengl {
211	my ($class, $w, $h, $cb) = @_;	365	my ($class, $w, $h, $cb) = @_;
212		366
213	$class->new (w => $w, h => $h, render_cb => $cb)	367	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
214	}	368	}
215		369
216	sub topot {	370	sub topot {
217	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]	371	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
218	}	372	}
…		…
241	= CFClient::load_image_inline $self->{image};	395	= CFClient::load_image_inline $self->{image};
242	}	396	}
243		397
244	my ($tw, $th) = @$self{qw(w h)};	398	my ($tw, $th) = @$self{qw(w h)};
245		399
246	unless ($tw && $th) {	400	unless ($tw > 0 && $th > 0) {
247	$tw = $th = 1;	401	$tw = $th = 1;
248	$data = "\x00" x 64;	402	$data = "\x00" x 64;
249	}	403	}
250		404
251	$self->{minified} = [CFClient::average $tw, $th, $data]	405	$self->{minified} = [CFClient::average $tw, $th, $data]
…		…
254	unless ($GL_NPOT) {	408	unless ($GL_NPOT) {
255	# TODO: does not work for zero-sized textures	409	# TODO: does not work for zero-sized textures
256	$tw = topot $tw;	410	$tw = topot $tw;
257	$th = topot $th;	411	$th = topot $th;
258		412
259	if ($tw != $self->{w} \|\| $th != $self->{h} && defined $data) {	413	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
260	my $bpp = (length $data) / ($self->{w} * $self->{h});	414	my $bpp = (length $data) / ($self->{w} * $self->{h});
261	$data = pack "(a" . ($tw * $bpp) . ")*",	415	$data = pack "(a" . ($tw * $bpp) . ")*",
262	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	416	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
263	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	417	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
264	}	418	}
265	}	419	}
266		420
267	$self->{s} = $self->{w} / $tw;	421	$self->{s} = $self->{w} / $tw;
268	$self->{t} = $self->{h} / $th;	422	$self->{t} = $self->{h} / $th;
269		423
270	glGetError;
271
272	$self->{name} \|\|= (glGenTextures 1)->[0];	424	$self->{name} \|\|= glGenTexture;
273		425
274	glBindTexture GL_TEXTURE_2D, $self->{name};	426	glBindTexture GL_TEXTURE_2D, $self->{name};
275		427
276	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
277	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
278	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	428	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	429	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
		430
		431	if ($::FAST) {
		432	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
		433	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
		434	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
		435	# alternatively check for 0x8191
		436	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
		437	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		438	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
		439	} else {
		440	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
		441	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		442	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
		443	}
280		444
		445	glGetError;
		446
281	if (defined $data) {	447	if (defined $data) {
282	glTexImage2D GL_TEXTURE_2D, 0,	448	glTexImage2D GL_TEXTURE_2D, 0,
283	$self->{internalformat},	449	$self->{internalformat},
284	$tw, $th, # need to pad texture first	450	$tw, $th,
285	0,	451	0,
286	$self->{format},	452	$self->{format},
287	$self->{type},	453	$self->{type},
288	$data;	454	$data;
289	if (my $error = glGetError) {	455	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
290	warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
291	$error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};	456	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
292	}
293	} else {	457	} else {
294	glCopyTexImage2D GL_TEXTURE_2D, 0,	458	glCopyTexImage2D GL_TEXTURE_2D, 0,
295	$self->{internalformat},	459	$self->{internalformat},
296	0, 0,	460	0, 0,
297	$tw, $th,	461	$tw, $th,
298	0;	462	0;
299	glGetError and die "glCopyTexImage2D $tw,$th";	463	CFClient::gl_check "copying to texture %dx%d if=%x",
		464	$tw, $th, $self->{internalformat};
300	}	465	}
		466
		467	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
301	}	468	}
302		469
303	sub DESTROY {	470	sub DESTROY {
304	my ($self) = @_;	471	my ($self) = @_;
305		472
306	delete $TEXTURES{$self+0};	473	delete $TEXTURES{$self+0};
307		474
308	glDeleteTextures delete $self->{name}	475	glDeleteTexture delete $self->{name}
309	if $self->{name};	476	if $self->{name};
310	}	477	}
311		478
312	sub restore_state{	479	sub restore_state {
313	$_->upload	480	$_->upload
314	for values %TEXTURES;	481	for values %TEXTURES;
315	};	482	}
316		483
317	1;	484	1;
318		485
319	=back	486	=back
320		487

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.40 by root, Tue Apr 18 01:51:06 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.40 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC