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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.44 by root, Mon Apr 24 08:22:20 2006 UTC vs.
Revision 1.72 by root, Sat May 27 20:46:54 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;
27	use CFClient::OpenGL;
28
29	our %GL_EXT;
30	our $GL_VERSION;
31
32	our $GL_NPOT;
33
34	sub gl_init {
35	$GL_VERSION = gl_version * 1;
36	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37
38	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
39
40	glEnable GL_TEXTURE_2D;
41	glEnable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;
43	glDisable GL_DEPTH_TEST;
44	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
45
46	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47
48	CFClient::Texture::restore_state ();
49	}
50		29
51	sub find_rcfile($) {	30	sub find_rcfile($) {
52	my $path;	31	my $path;
53		32
54	for (@INC) {	33	for (grep !ref, @INC) {
55	$path = "$_/CFClient/resources/$_[0]";	34	$path = "$_/CFClient/resources/$_[0]";
56	return $path if -r $path;	35	return $path if -r $path;
57	}	36	}
58		37
59	die "FATAL: can't find required file $_[0]\n";	38	die "FATAL: can't find required file $_[0]\n";
…		…
97	-Home => "$Crossfire::VARDIR/pclient",	76	-Home => "$Crossfire::VARDIR/pclient",
98	-Cachesize => 1_000_000,	77	-Cachesize => 1_000_000,
99	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
100	# -ErrPrefix => "DATABASE",	79	# -ErrPrefix => "DATABASE",
101	-Verbose => 1,	80	-Verbose => 1,
102	-Flags => DB_CREATE \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	81	-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";	82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
104		83
105	sub db_table($) {	84	sub db_table($) {
106	my ($table) = @_;	85	my ($table) = @_;
107		86
…		…
110	new CFClient::Database	89	new CFClient::Database
111	-Env => $DB_ENV,	90	-Env => $DB_ENV,
112	-Filename => $table,	91	-Filename => $table,
113	# -Filename => "database",	92	# -Filename => "database",
114	# -Subname => $table,	93	# -Subname => $table,
		94	-Property => DB_CHKSUM,
115	-Flags => DB_CREATE \| DB_UPGRADE,	95	-Flags => DB_CREATE \| DB_UPGRADE,
116	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
		97	}
		98
		99	sub pod_to_pango($) {
		100	my ($pom) = @_;
		101
		102	$pom->present ("CFClient::PodToPango")
		103	}
		104
		105	sub pod_to_pango_list($) {
		106	my ($pom) = @_;
		107
		108	[
		109	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
		110	split /\n/, $pom->present ("CFClient::PodToPango")
		111	]
		112	}
		113
		114	package CFClient::PodToPango;
		115
		116	use base Pod::POM::View::Text;
		117
		118	our $indent = 0;
		119
		120	*view_seq_code =
		121	*view_seq_bold = sub { "<b>$_[1]</b>" };
		122	*view_seq_italic = sub { "<i>$_[1]</i>" };
		123	*view_seq_space =
		124	*view_seq_link =
		125	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		126
		127	sub view_seq_text {
		128	my $text = $_[1];
		129	$text =~ s/\s+/ /g;
		130	CFClient::UI::Label::escape ($text)
		131	}
		132
		133	sub view_item {
		134	("\t" x ($indent / 4))
		135	. $_[1]->title->present ($_[0])
		136	. "\n"
		137	. $_[1]->content->present ($_[0])
		138	}
		139
		140	sub view_verbatim {
		141	(join "",
		142	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		143	split /\n/, CFClient::UI::Label::escape ($_[1]))
		144	. "\n"
		145	}
		146
		147	sub view_textblock {
		148	("\t" x ($indent / 2)) . "$_[1]\n\n"
		149	}
		150
		151	sub view_head1 {
		152	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		153	. $_[1]->content->present ($_[0])
		154	};
		155
		156	sub view_head2 {
		157	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		158	. $_[1]->content->present ($_[0])
		159	};
		160
		161	sub view_head3 {
		162	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		163	. $_[1]->content->present ($_[0])
		164	};
		165
		166	sub view_over {
		167	local $indent = $indent + $_[1]->indent;
		168	$_[1]->content->present ($_[0])
117	}	169	}
118		170
119	package CFClient::Database;	171	package CFClient::Database;
120		172
121	our @ISA = BerkeleyDB::Btree::;	173	our @ISA = BerkeleyDB::Btree::;
…		…
136	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	188	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
137		189
138	$db->db_put ($key => $data)	190	$db->db_put ($key => $data)
139	}	191	}
140		192
141	package CFClient::Texture;	193	package CFClient::Item;
142		194
143	use strict;	195	use strict;
		196	use Crossfire::Protocol::Constants;
144		197
145	use Scalar::Util;	198	sub desc_string {
146
147	use CFClient::OpenGL;
148
149	my %TEXTURES;
150
151	sub new {
152	my ($class, %data) = @_;
153
154	my $self = bless {
155	internalformat => GL_RGBA,
156	format => GL_RGBA,
157	type => GL_UNSIGNED_BYTE,
158	%data,
159	}, $class;
160
161	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
162
163	$self->upload;
164
165	$self
166	}
167
168	sub new_from_image {
169	my ($class, $image, %arg) = @_;
170
171	$class->new (image => $image, %arg)
172	}
173
174	sub new_from_file {
175	my ($class, $path, %arg) = @_;
176
177	open my $fh, "<:raw", $path
178	or die "$path: $!";
179
180	local $/;
181	$class->new_from_image (<$fh>, %arg)
182	}
183
184	#sub new_from_surface {
185	# my ($class, $surface) = @_;
186	#
187	# $surface->rgba;
188	#
189	# $class->new (
190	# data => $surface->pixels,
191	# w => $surface->width,
192	# h => $surface->height,
193	# )
194	#}
195
196	sub new_from_layout {
197	my ($class, $layout, %arg) = @_;
198
199	my ($w, $h, $data) = $layout->render;
200
201	$class->new (
202	w => $w,
203	h => $h,
204	data => $data,
205	format => GL_ALPHA,
206	internalformat => GL_ALPHA,
207	type => GL_UNSIGNED_BYTE,
208	%arg,
209	)
210	}
211
212	sub new_from_opengl {
213	my ($class, $w, $h, $cb) = @_;
214
215	$class->new (w => $w, h => $h, render_cb => $cb)
216	}
217
218	sub topot {
219	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
220	}
221
222	sub upload {
223	my ($self) = @_;	199	my ($self) = @_;
224		200
225	return unless $GL_VERSION;	201	my $desc =
		202	$self->{nrof} < 2
		203	? $self->{name}
		204	: "$self->{nrof} × $self->{name_pl}";
226		205
227	my $data;	206	$self->{flags} & F_OPEN
		207	and $desc .= " (open)";
		208	$self->{flags} & F_APPLIED
		209	and $desc .= " (applied)";
		210	$self->{flags} & F_UNPAID
		211	and $desc .= " (unpaid)";
		212	$self->{flags} & F_MAGIC
		213	and $desc .= " (magic)";
		214	$self->{flags} & F_CURSED
		215	and $desc .= " (cursed)";
		216	$self->{flags} & F_DAMNED
		217	and $desc .= " (damned)";
		218	$self->{flags} & F_LOCKED
		219	and $desc .= " *";
228		220
229	if (exists $self->{data}) {	221	$desc
230	$data = $self->{data};	222	}
231		223
232	} elsif (exists $self->{render_cb}) {	224	sub weight_string {
233	glViewport 0, 0, $self->{w}, $self->{h};	225	my ($self) = @_;
234	glMatrixMode GL_PROJECTION;
235	glLoadIdentity;
236	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
237	glMatrixMode GL_MODELVIEW;
238	glLoadIdentity;
239	$self->{render_cb}->($self, $self->{w}, $self->{h});
240		226
241	} else {	227	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
242	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
243	= CFClient::load_image_inline $self->{image};
244	}
245		228
246	my ($tw, $th) = @$self{qw(w h)};	229	$weight < 0 ? "?" : $weight * 0.001
		230	}
247		231
248	unless ($tw && $th) {	232	sub update_widgets {
249	$tw = $th = 1;	233	my ($self) = @_;
250	$data = "\x00" x 64;
251	}
252		234
253	$self->{minified} = [CFClient::average $tw, $th, $data]	235	my $button_cb = sub {
254	if $self->{minify};	236	my (undef, $ev, $x, $y) = @_;
255		237
256	unless ($GL_NPOT) {	238	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
257	# TODO: does not work for zero-sized textures	239	my $targ = $::CONN->{player}{tag};
258	$tw = topot $tw;
259	$th = topot $th;
260		240
261	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	241	if ($self->{container} == $::CONN->{player}{tag}) {
262	my $bpp = (length $data) / ($self->{w} * $self->{h});	242	$targ = $::CONN->{open_container};
263	$data = pack "(a" . ($tw * $bpp) . ")*",	243	}
264	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	244
265	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	245	$::CONN->send ("move $targ $self->{tag} 0");
		246	} elsif ($ev->{button} == 1) {
		247	$::CONN->send ("examine $self->{tag}");
		248	} elsif ($ev->{button} == 2) {
		249	$::CONN->send ("apply $self->{tag}");
		250	} elsif ($ev->{button} == 3) {
		251	my @menu_items = (
		252	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		253	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		254	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		255	(
		256	$self->{flags} & F_LOCKED
		257	? (
		258	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		259	)
		260	: (
		261	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		262	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		263	)
		264	),
		265	);
		266
		267	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
266	}	268	}
		269
		270	1
267	}	271	};
268		272
269	$self->{s} = $self->{w} / $tw;	273	my $tooltip_std = "<small>"
270	$self->{t} = $self->{h} / $th;	274	. "Left click - examine item\n"
		275	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		276	. "Middle click - apply\n"
		277	. "Right click - further options"
		278	. "</small>\n";
271		279
272	glGetError;	280	$self->{face_widget} \|\|= new CFClient::UI::Face
273		281	can_events => 1,
274	$self->{name} \|\|= glGenTexture;	282	can_hover => 1,
275		283	anim => $self->{anim},
276	glBindTexture GL_TEXTURE_2D, $self->{name};	284	animspeed => $self->{animspeed}, # TODO# must be set at creation time
277		285	on_button_down => $button_cb,
278	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
280
281	if ($::FAST) {
282	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
283	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
284	} else {
285	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
286	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;
288	}	286	;
		287	$self->{face_widget}{face} = $self->{face};
		288	$self->{face_widget}{anim} = $self->{anim};
		289	$self->{face_widget}{animspeed} = $self->{animspeed};
		290	$self->{face_widget}->set_tooltip (
		291	"<b>Face/Animation.</b>\n"
		292	. "Item uses face #$self->{face}. "
		293	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		294	. "\n\n$tooltip_std"
		295	);
289		296
290	if (defined $data) {	297	$self->{desc_widget} \|\|= new CFClient::UI::Label
291	glTexImage2D GL_TEXTURE_2D, 0,	298	can_events => 1,
292	$self->{internalformat},	299	can_hover => 1,
293	$tw, $th, # need to pad texture first	300	ellipsise => 2,
294	0,	301	align => -1,
295	$self->{format},	302	on_button_down => $button_cb,
296	$self->{type},
297	$data;
298	if (my $error = glGetError) {
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};
301	}
302	} else {
303	glCopyTexImage2D GL_TEXTURE_2D, 0,
304	$self->{internalformat},
305	0, 0,
306	$tw, $th,
307	0;
308	if (my $error = glGetError) {
309	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
310	$error, $tw, $th, $self->{internalformat};
311	}
312	}	303	;
313	}	304	my $desc = CFClient::Item::desc_string $self;
		305	$self->{desc_widget}->set_text ($desc);
		306	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
314		307
315	sub DESTROY {	308	$self->{weight_widget} \|\|= new CFClient::UI::Label
316	my ($self) = @_;	309	can_events => 1,
		310	can_hover => 1,
		311	ellipsise => 0,
		312	align => 0,
		313	on_button_down => $button_cb,
		314	;
		315	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
317		316
318	delete $TEXTURES{$self+0};	317	$self->{weight_widget}->set_tooltip (
319		318	"<b>Weight</b>.\n"
320	glDeleteTexture delete $self->{name}	319	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
321	if $self->{name};	320	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		321	. "\n\n$tooltip_std"
		322	);
322	}	323	}
323
324	sub restore_state{
325	$_->upload
326	for values %TEXTURES;
327	};
328		324
329	1;	325	1;
330		326
331	=back	327	=back
332		328

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.44 by root, Mon Apr 24 08:22:20 2006 UTC vs. Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.44 by root, Mon Apr 24 08:22:20 2006 UTC vs.
Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC