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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.41 by root, Wed Apr 19 23:37:48 2006 UTC vs. Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.41 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC