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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.33 by root, Sat Apr 15 01:13:45 2006 UTC vs.
Revision 1.63 by root, Thu May 25 16:35:42 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 SDL::OpenGL;	24	use utf8;
		25
		26	use Carp ();
		27	use AnyEvent ();
		28	use BerkeleyDB;
		29
		30	use CFClient::OpenGL;
25		31
26	our %GL_EXT;	32	our %GL_EXT;
27	our $GL_VERSION;	33	our $GL_VERSION;
28		34
29	our $GL_NPOT;	35	our $GL_NPOT;
		36	our $GL_DEBUG = 1;
30		37
31	sub gl_init {	38	sub gl_init {
32	$GL_VERSION = gl_version * 1;	39	$GL_VERSION = gl_version * 1;
33	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;	40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34		41
35	$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...
36		44
37	glEnable GL_TEXTURE_2D;
38	glEnable GL_COLOR_MATERIAL;	45	glDisable GL_COLOR_MATERIAL;
39	glShadeModel GL_FLAT;	46	glShadeModel GL_FLAT;
		47	glDisable GL_DITHER;
40	glDisable GL_DEPTH_TEST;	48	glDisable GL_DEPTH_TEST;
41	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	49	glDepthMask 0;
42
43	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;	50	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
44		51
45	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	}
46	}	62	}
47		63
48	sub find_rcfile($) {	64	sub find_rcfile($) {
49	my $path;	65	my $path;
50		66
51	for (@INC) {	67	for (grep !ref, @INC) {
52	$path = "$_/CFClient/resources/$_[0]";	68	$path = "$_/CFClient/resources/$_[0]";
53	return $path if -r $path;	69	return $path if -r $path;
54	}	70	}
55		71
56	die "FATAL: can't find required file $_[0]\n";	72	die "FATAL: can't find required file $_[0]\n";
…		…
86	}	102	}
87		103
88	close CFG;	104	close CFG;
89	}	105	}
90		106
		107	mkdir "$Crossfire::VARDIR/pclient", 0777;
		108
		109	our $DB_ENV = new BerkeleyDB::Env
		110	-Home => "$Crossfire::VARDIR/pclient",
		111	-Cachesize => 1_000_000,
		112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
		113	# -ErrPrefix => "DATABASE",
		114	-Verbose => 1,
		115	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,
		116	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
		117
		118	sub db_table($) {
		119	my ($table) = @_;
		120
		121	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		122
		123	new CFClient::Database
		124	-Env => $DB_ENV,
		125	-Filename => $table,
		126	# -Filename => "database",
		127	# -Subname => $table,
		128	-Property => DB_CHKSUM,
		129	-Flags => DB_CREATE \| DB_UPGRADE,
		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])
		198	}
		199
		200	package CFClient::Database;
		201
		202	our @ISA = BerkeleyDB::Btree::;
		203
		204	sub get($$) {
		205	my $data;
		206
		207	$_[0]->db_get ($_[1], $data) == 0
		208	? $data
		209	: ()
		210	}
		211
		212	my %DB_SYNC;
		213
		214	sub put($$$) {
		215	my ($db, $key, $data) = @_;
		216
		217	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		218
		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 = $main::OPENCONT;
		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 $main::OPENCONT $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	);
		347	}
		348
91	package CFClient::Texture;	349	package CFClient::Texture;
92		350
93	use strict;	351	use strict;
94		352
95	use Scalar::Util;	353	use Scalar::Util;
96		354
97	use SDL::OpenGL;	355	use CFClient::OpenGL;
98		356
99	my @textures;	357	my %TEXTURES;
100		358
101	sub new {	359	sub new {
102	my ($class, %data) = @_;	360	my ($class, %data) = @_;
103		361
104	my $self = bless {	362	my $self = bless {
…		…
106	format => GL_RGBA,	364	format => GL_RGBA,
107	type => GL_UNSIGNED_BYTE,	365	type => GL_UNSIGNED_BYTE,
108	%data,	366	%data,
109	}, $class;	367	}, $class;
110		368
111	push @textures, $self;	369	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112	Scalar::Util::weaken $textures[-1];
113		370
114	$self->upload;	371	$self->upload;
115		372
116	$self	373	$self
117	}	374	}
…		…
121		378
122	$class->new (image => $image, %arg)	379	$class->new (image => $image, %arg)
123	}	380	}
124		381
125	sub new_from_file {	382	sub new_from_file {
126	my ($class, $path) = @_;	383	my ($class, $path, %arg) = @_;
127		384
128	open my $fh, "<:raw", $path	385	open my $fh, "<:raw", $path
129	or die "$path: $!";	386	or die "$path: $!";
130		387
131	local $/;	388	local $/;
132	$class->new_from_image (<$fh>)	389	$class->new_from_image (<$fh>, %arg)
133	}	390	}
134		391
135	#sub new_from_surface {	392	#sub new_from_surface {
136	# my ($class, $surface) = @_;	393	# my ($class, $surface) = @_;
137	#	394	#
…		…
143	# h => $surface->height,	400	# h => $surface->height,
144	# )	401	# )
145	#}	402	#}
146		403
147	sub new_from_layout {	404	sub new_from_layout {
148	my ($class, $layout) = @_;	405	my ($class, $layout, %arg) = @_;
149		406
150	my ($w, $h, $data) = $layout->render;	407	my ($w, $h, $data, $format, $internalformat) = $layout->render;
151		408
152	$class->new (	409	$class->new (
153	w => $w,	410	w => $w,
154	h => $h,	411	h => $h,
155	data => $data,	412	data => $data,
156	internalformat => GL_ALPHA4,
157	format => GL_ALPHA,	413	format => $format,
		414	internalformat => $format,
158	type => GL_UNSIGNED_BYTE,	415	type => GL_UNSIGNED_BYTE,
		416	%arg,
159	)	417	)
160	}	418	}
161		419
162	sub new_from_opengl {	420	sub new_from_opengl {
163	my ($class, $w, $h, $cb) = @_;	421	my ($class, $w, $h, $cb) = @_;
164		422
165	$class->new (w => $w, h => $h, render_cb => $cb)	423	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
166	}	424	}
167		425
168	sub topot {	426	sub topot {
169	(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]
170	}	428	}
…		…
193	= CFClient::load_image_inline $self->{image};	451	= CFClient::load_image_inline $self->{image};
194	}	452	}
195		453
196	my ($tw, $th) = @$self{qw(w h)};	454	my ($tw, $th) = @$self{qw(w h)};
197		455
198	unless ($tw && $th) {	456	unless ($tw > 0 && $th > 0) {
199	$tw = $th = 1;	457	$tw = $th = 1;
200	$data = "\x00" x 64;	458	$data = "\x00" x 64;
201	}	459	}
202		460
203	$self->{minified} = [CFClient::average $tw, $th, $data]	461	$self->{minified} = [CFClient::average $tw, $th, $data]
…		…
206	unless ($GL_NPOT) {	464	unless ($GL_NPOT) {
207	# TODO: does not work for zero-sized textures	465	# TODO: does not work for zero-sized textures
208	$tw = topot $tw;	466	$tw = topot $tw;
209	$th = topot $th;	467	$th = topot $th;
210		468
211	if ($tw != $self->{w} \|\| $th != $self->{h} && defined $data) {	469	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
212	my $bpp = (length $data) / ($self->{w} * $self->{h});	470	my $bpp = (length $data) / ($self->{w} * $self->{h});
213	$data = pack "(a" . ($tw * $bpp) . ")*",	471	$data = pack "(a" . ($tw * $bpp) . ")*",
214	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	472	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
215	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	473	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
216	}	474	}
217	}	475	}
218		476
219	$self->{s} = $self->{w} / $tw;	477	$self->{s} = $self->{w} / $tw;
220	$self->{t} = $self->{h} / $th;	478	$self->{t} = $self->{h} / $th;
221		479
222	$self->{name} \|\|= (glGenTextures 1)->[0];	480	$self->{name} \|\|= glGenTexture;
223		481
224	glBindTexture GL_TEXTURE_2D, $self->{name};	482	glBindTexture GL_TEXTURE_2D, $self->{name};
225		483
226	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
227	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
228	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	484	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
229	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	485	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
		486
		487	if ($::FAST) {
		488	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_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;
		495	} else {
		496	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
		497	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		498	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
		499	}
230		500
		501	glGetError;
		502
231	if (defined $data) {	503	if (defined $data) {
232	glTexImage2D GL_TEXTURE_2D, 0,	504	glTexImage2D GL_TEXTURE_2D, 0,
233	$self->{internalformat},	505	$self->{internalformat},
234	$tw, $th, # need to pad texture first	506	$tw, $th,
235	0,	507	0,
236	$self->{format},	508	$self->{format},
237	$self->{type},	509	$self->{type},
238	$data;	510	$data;
239	glGetError and die;	511	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
		512	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
240	} else {	513	} else {
241	glCopyTexImage2D GL_TEXTURE_2D, 0,	514	glCopyTexImage2D GL_TEXTURE_2D, 0,
242	$self->{internalformat},	515	$self->{internalformat},
243	0, 0,	516	0, 0,
244	$tw, $th,	517	$tw, $th,
245	0;	518	0;
246	glGetError and die "glCopyTexImage2D $tw,$th";	519	CFClient::gl_check "copying to texture %dx%d if=%x",
		520	$tw, $th, $self->{internalformat};
247	}	521	}
		522
		523	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
248	}	524	}
249		525
250	sub DESTROY {	526	sub DESTROY {
251	my ($self) = @_;	527	my ($self) = @_;
252		528
253	return unless exists $self->{name};	529	delete $TEXTURES{$self+0};
254		530
255	glDeleteTextures delete $self->{name};	531	glDeleteTexture delete $self->{name}
		532	if $self->{name};
256	}	533	}
257		534
258	sub restore_state{	535	sub restore_state {
259	$_->upload	536	$_->upload
260	for grep $_, @textures;	537	for values %TEXTURES;
261	};	538	}
262		539
263	1;	540	1;
264		541
265	=back	542	=back
266		543

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.33 by root, Sat Apr 15 01:13:45 2006 UTC vs. Revision 1.63 by root, Thu May 25 16:35:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.33 by root, Sat Apr 15 01:13:45 2006 UTC vs.
Revision 1.63 by root, Thu May 25 16:35:42 2006 UTC