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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.57 by root, Sun May 21 00:02:00 2006 UTC vs.
Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC

…		…
18	$VERSION = '0.1';	18	$VERSION = '0.1';
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
		23
		24	use utf8;
23		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent ();	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
27
28	use CFClient::OpenGL;
29
30	our %GL_EXT;
31	our $GL_VERSION;
32
33	our $GL_NPOT;
34	our $GL_DEBUG = 1;
35
36	sub gl_init {
37	$GL_VERSION = gl_version * 1;
38	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39
40	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
41
42	glDisable GL_COLOR_MATERIAL;
43	glShadeModel GL_FLAT;
44	glDisable GL_DITHER;
45	glDisable GL_DEPTH_TEST;
46	glDepthMask 0;
47	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
48
49	CFClient::Texture::restore_state ();
50	}
51
52	sub gl_check {
53	return unless $GL_DEBUG;
54
55	if (my $error = glGetError) {
56	Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
57	}
58	}
59		29
60	sub find_rcfile($) {	30	sub find_rcfile($) {
61	my $path;	31	my $path;
62		32
63	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
106	-Home => "$Crossfire::VARDIR/pclient",	76	-Home => "$Crossfire::VARDIR/pclient",
107	-Cachesize => 1_000_000,	77	-Cachesize => 1_000_000,
108	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
109	# -ErrPrefix => "DATABASE",	79	# -ErrPrefix => "DATABASE",
110	-Verbose => 1,	80	-Verbose => 1,
111	-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,
112	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";
113		83
114	sub db_table($) {	84	sub db_table($) {
115	my ($table) = @_;	85	my ($table) = @_;
116		86
…		…
130	my ($pom) = @_;	100	my ($pom) = @_;
131		101
132	$pom->present ("CFClient::PodToPango")	102	$pom->present ("CFClient::PodToPango")
133	}	103	}
134		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
135	package CFClient::PodToPango;	114	package CFClient::PodToPango;
136		115
137	use base Pod::POM::View::Text;	116	use base Pod::POM::View::Text;
138		117
139	our $indent = 0;	118	our $indent = 0;
…		…
158	. $_[1]->content->present ($_[0])	137	. $_[1]->content->present ($_[0])
159	}	138	}
160		139
161	sub view_verbatim {	140	sub view_verbatim {
162	(join "",	141	(join "",
163	map +("\t" x ($indent / 2)) . "$_\n",	142	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
164	split /\n/, CFClient::UI::Label::escape ($_[1]))	143	split /\n/, CFClient::UI::Label::escape ($_[1]))
165	. "\n"	144	. "\n"
166	}	145	}
167		146
168	sub view_textblock {	147	sub view_textblock {
169	("\t" x ($indent / 2)) . "$_[1]\n\n"	148	("\t" x ($indent / 2)) . "$_[1]\n\n"
170	}	149	}
171		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
172	sub view_head2 {	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 {
173	"<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"	162	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
174	. $_[1]->content->present ($_[0])	163	. $_[1]->content->present ($_[0])
175	};	164	};
176		165
177	sub view_over {	166	sub view_over {
178	local $indent = $indent + $_[1]->indent;	167	local $indent = $indent + $_[1]->indent;
…		…
199	$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 });
200		189
201	$db->db_put ($key => $data)	190	$db->db_put ($key => $data)
202	}	191	}
203		192
204	package CFClient::Texture;	193	package CFClient::Item;
205		194
206	use strict;	195	use strict;
		196	use Crossfire::Protocol::Constants;
207		197
208	use Scalar::Util;	198	sub desc_string {
209
210	use CFClient::OpenGL;
211
212	my %TEXTURES;
213
214	sub new {
215	my ($class, %data) = @_;
216
217	my $self = bless {
218	internalformat => GL_RGBA,
219	format => GL_RGBA,
220	type => GL_UNSIGNED_BYTE,
221	%data,
222	}, $class;
223
224	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
225
226	$self->upload;
227
228	$self
229	}
230
231	sub new_from_image {
232	my ($class, $image, %arg) = @_;
233
234	$class->new (image => $image, %arg)
235	}
236
237	sub new_from_file {
238	my ($class, $path, %arg) = @_;
239
240	open my $fh, "<:raw", $path
241	or die "$path: $!";
242
243	local $/;
244	$class->new_from_image (<$fh>, %arg)
245	}
246
247	#sub new_from_surface {
248	# my ($class, $surface) = @_;
249	#
250	# $surface->rgba;
251	#
252	# $class->new (
253	# data => $surface->pixels,
254	# w => $surface->width,
255	# h => $surface->height,
256	# )
257	#}
258
259	sub new_from_layout {
260	my ($class, $layout, %arg) = @_;
261
262	my ($w, $h, $data, $format, $internalformat) = $layout->render;
263
264	$class->new (
265	w => $w,
266	h => $h,
267	data => $data,
268	format => $format,
269	internalformat => $format,
270	type => GL_UNSIGNED_BYTE,
271	%arg,
272	)
273	}
274
275	sub new_from_opengl {
276	my ($class, $w, $h, $cb) = @_;
277
278	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
279	}
280
281	sub topot {
282	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
283	}
284
285	sub upload {
286	my ($self) = @_;	199	my ($self) = @_;
287		200
288	return unless $GL_VERSION;	201	my $desc =
		202	$self->{nrof} < 2
		203	? $self->{name}
		204	: "$self->{nrof} × $self->{name_pl}";
289		205
290	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 .= " *";
291		220
292	if (exists $self->{data}) {	221	$desc
293	$data = $self->{data};	222	}
294		223
295	} elsif (exists $self->{render_cb}) {	224	sub weight_string {
296	glViewport 0, 0, $self->{w}, $self->{h};	225	my ($self) = @_;
297	glMatrixMode GL_PROJECTION;
298	glLoadIdentity;
299	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
300	glMatrixMode GL_MODELVIEW;
301	glLoadIdentity;
302	$self->{render_cb}->($self, $self->{w}, $self->{h});
303		226
304	} else {	227	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
305	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
306	= CFClient::load_image_inline $self->{image};
307	}
308		228
309	my ($tw, $th) = @$self{qw(w h)};	229	$weight < 0 ? "?" : $weight * 0.001
		230	}
310		231
311	unless ($tw > 0 && $th > 0) {	232	sub update_widgets {
312	$tw = $th = 1;	233	my ($self) = @_;
313	$data = "\x00" x 64;
314	}
315		234
316	$self->{minified} = [CFClient::average $tw, $th, $data]	235	my $button_cb = sub {
317	if $self->{minify};	236	my (undef, $ev, $x, $y) = @_;
318		237
319	unless ($GL_NPOT) {	238	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
320	# TODO: does not work for zero-sized textures	239	my $targ = $::CONN->{player}{tag};
321	$tw = topot $tw;
322	$th = topot $th;
323		240
324	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	241	if ($self->{container} == $::CONN->{player}{tag}) {
325	my $bpp = (length $data) / ($self->{w} * $self->{h});	242	$targ = $::CONN->{open_container};
326	$data = pack "(a" . ($tw * $bpp) . ")*",	243	}
327	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	244
328	$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);
329	}	268	}
		269
		270	1
330	}	271	};
331		272
332	$self->{s} = $self->{w} / $tw;	273	my $tooltip_std = "<small>"
333	$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";
334		279
335	$self->{name} \|\|= glGenTexture;	280	$self->{face_widget} \|\|= new CFClient::UI::Face
336		281	can_events => 1,
337	glBindTexture GL_TEXTURE_2D, $self->{name};	282	can_hover => 1,
338		283	anim => $self->{anim},
339	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	284	animspeed => $self->{animspeed}, # TODO# must be set at creation time
340	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	285	on_button_down => $button_cb,
341
342	if ($::FAST) {
343	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
344	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
345	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
346	# alternatively check for 0x8191
347	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
348	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
349	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
350	} else {
351	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
352	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
353	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
354	}	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	);
355		296
356	glGetError;	297	$self->{desc_widget} \|\|= new CFClient::UI::Label
357		298	can_events => 1,
358	if (defined $data) {	299	can_hover => 1,
359	glTexImage2D GL_TEXTURE_2D, 0,	300	ellipsise => 2,
360	$self->{internalformat},	301	align => -1,
361	$tw, $th,	302	on_button_down => $button_cb,
362	0,
363	$self->{format},
364	$self->{type},
365	$data;
366	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
367	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
368	} else {
369	glCopyTexImage2D GL_TEXTURE_2D, 0,
370	$self->{internalformat},
371	0, 0,
372	$tw, $th,
373	0;
374	CFClient::gl_check "copying to texture %dx%d if=%x",
375	$tw, $th, $self->{internalformat};
376	}	303	;
		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");
377		307
378	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side	308	$self->{weight_widget} \|\|= new CFClient::UI::Label
379	}	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);
380		316
381	sub DESTROY {	317	$self->{weight_widget}->set_tooltip (
382	my ($self) = @_;	318	"<b>Weight</b>.\n"
383		319	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
384	delete $TEXTURES{$self+0};	320	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
385		321	. "\n\n$tooltip_std"
386	glDeleteTexture delete $self->{name}	322	);
387	if $self->{name};
388	}
389
390	sub restore_state {
391	$_->upload
392	for values %TEXTURES;
393	}	323	}
394		324
395	1;	325	1;
396		326
397	=back	327	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.57 by root, Sun May 21 00:02:00 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.57 by root, Sun May 21 00:02:00 2006 UTC vs.
Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC