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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs.
Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC

…		…
24	use utf8;	24	use utf8;
25		25
26	use Carp ();	26	use Carp ();
27	use AnyEvent ();	27	use AnyEvent ();
28	use BerkeleyDB;	28	use BerkeleyDB;
		29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
29		32
30	use CFClient::OpenGL;	33	our %STAT_TOOLTIP = (
		34	Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
		35	Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
		36	Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
		37	Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",
		38	Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
		39	Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
		40	Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
31		41
32	our %GL_EXT;	42	Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
33	our $GL_VERSION;	43	Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
		44	Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
		45	Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
		46	Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
		47	WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
		48	);
34		49
35	our $GL_NPOT;	50	=item guard { BLOCK }
36	our $GL_DEBUG = 1;
37		51
38	sub gl_init {	52	Returns an object that executes the given block as soon as it is destroyed.
39	$GL_VERSION = gl_version * 1;
40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41		53
42	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	54	=cut
43	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
44		55
45	glDisable GL_COLOR_MATERIAL;	56	sub guard(&) {
46	glShadeModel GL_FLAT;	57	bless \(my $cb = $_[0]), "CFClient::Guard"
47	glDisable GL_DITHER;
48	glDisable GL_DEPTH_TEST;
49	glDepthMask 0;
50	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
51
52	CFClient::Texture::restore_state ();
53	}	58	}
54		59
55	sub gl_check {	60	sub CFClient::Guard::DESTROY {
56	return unless $GL_DEBUG;	61	${$_[0]}->()
57
58	if (my $error = glGetError) {
59	my ($format, @args) = @_;
60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
61	}
62	}	62	}
		63
		64	package CFClient::PodToPango;
		65
		66	use base Pod::POM::View::Text;
		67
		68	our $VERSION = 1; # bump if resultant formatting changes
		69
		70	our $indent = 0;
		71
		72	*view_seq_code =
		73	*view_seq_bold = sub { "<b>$_[1]</b>" };
		74	*view_seq_italic = sub { "<i>$_[1]</i>" };
		75	*view_seq_space =
		76	*view_seq_link =
		77	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		78
		79	sub view_seq_text {
		80	my $text = $_[1];
		81	$text =~ s/\s+/ /g;
		82	CFClient::UI::Label::escape ($text)
		83	}
		84
		85	sub view_item {
		86	("\t" x ($indent / 4))
		87	. $_[1]->title->present ($_[0])
		88	. "\n\n"
		89	. $_[1]->content->present ($_[0])
		90	}
		91
		92	sub view_verbatim {
		93	(join "",
		94	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		95	split /\n/, CFClient::UI::Label::escape ($_[1]))
		96	. "\n"
		97	}
		98
		99	sub view_textblock {
		100	("\t" x ($indent / 2)) . "$_[1]\n\n"
		101	}
		102
		103	sub view_head1 {
		104	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		105	. $_[1]->content->present ($_[0])
		106	};
		107
		108	sub view_head2 {
		109	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		110	. $_[1]->content->present ($_[0])
		111	};
		112
		113	sub view_head3 {
		114	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		115	. $_[1]->content->present ($_[0])
		116	};
		117
		118	sub view_over {
		119	local $indent = $indent + $_[1]->indent;
		120	$_[1]->content->present ($_[0])
		121	}
		122
		123	package CFClient::Database;
		124
		125	our @ISA = BerkeleyDB::Btree::;
		126
		127	sub get($$) {
		128	my $data;
		129
		130	$_[0]->db_get ($_[1], $data) == 0
		131	? $data
		132	: ()
		133	}
		134
		135	my %DB_SYNC;
		136
		137	sub put($$$) {
		138	my ($db, $key, $data) = @_;
		139
		140	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		141
		142	$db->db_put ($key => $data)
		143	}
		144
		145	package CFClient;
63		146
64	sub find_rcfile($) {	147	sub find_rcfile($) {
65	my $path;	148	my $path;
66		149
67	for (grep !ref, @INC) {	150	for (grep !ref, @INC) {
…		…
102	}	185	}
103		186
104	close CFG;	187	close CFG;
105	}	188	}
106		189
		190	our $DB_ENV;
		191
		192	{
		193	use strict;
		194
107	mkdir "$Crossfire::VARDIR/pclient", 0777;	195	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		196	my $recover = $BerkeleyDB::db_version >= 4.4
		197	? eval "DB_REGISTER \| DB_RECOVER"
		198	: 0;
108		199
109	our $DB_ENV = new BerkeleyDB::Env	200	$DB_ENV = new BerkeleyDB::Env
110	-Home => "$Crossfire::VARDIR/pclient",	201	-Home => "$Crossfire::VARDIR/cfplus",
111	-Cachesize => 1_000_000,	202	-Cachesize => 1_000_000,
112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	203	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113	# -ErrPrefix => "DATABASE",	204	# -ErrPrefix => "DATABASE",
114	-Verbose => 1,	205	-Verbose => 1,
115	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	206	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		207	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
116	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	208	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		209	}
117		210
118	sub db_table($) {	211	sub db_table($) {
119	my ($table) = @_;	212	my ($table) = @_;
120		213
121	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	214	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122		215
123	new CFClient::Database	216	new CFClient::Database
124	-Env => $DB_ENV,	217	-Env => $DB_ENV,
125	-Filename => $table,	218	-Filename => $table,
126	# -Filename => "database",	219	# -Filename => "database",
127	# -Subname => $table,	220	# -Subname => $table,
128	-Property => DB_CHKSUM,	221	-Property => DB_CHKSUM,
129	-Flags => DB_CREATE \| DB_UPGRADE,	222	-Flags => DB_CREATE \| DB_UPGRADE,
130	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	223	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		224	}
		225
		226	my $pod_cache = db_table "pod_cache";
		227
		228	sub load_pod($$$$) {
		229	my ($path, $filtertype, $filterversion, $filtercb) = @_;
		230
		231	stat $path
		232	or die "$path: $!";
		233
		234	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
		235
		236	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
		237
		238	return $pom if $chash eq $phash;
		239
		240	my $pod = do {
		241	local $/;
		242	open my $pod, "<:utf8", $_[0]
		243	or die "$_[0]: $!";
		244	<$pod>
		245	};
		246
		247	#utf8::downgrade $pod;
		248
		249	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
		250
		251	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
		252
		253	$pom
131	}	254	}
132		255
133	sub pod_to_pango($) {	256	sub pod_to_pango($) {
134	my ($pom) = @_;	257	my ($pom) = @_;
135		258
…		…
143	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	266	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
144	split /\n/, $pom->present ("CFClient::PodToPango")	267	split /\n/, $pom->present ("CFClient::PodToPango")
145	]	268	]
146	}	269	}
147		270
148	package CFClient::PodToPango;	271	package CFClient::Layout;
149		272
150	use base Pod::POM::View::Text;	273	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
151		274	reset_glyph_cache;
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	};	275	};
189		276
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;	277	package CFClient::Item;
		278
		279	use strict;
		280	use Crossfire::Protocol::Constants;
		281
		282	my $last_enter_count = 1;
223		283
224	sub desc_string {	284	sub desc_string {
225	my ($self) = @_;	285	my ($self) = @_;
226		286
227	my $desc =	287	my $desc =
228	$self->{nrof} < 2	288	$self->{nrof} < 2
229	? $self->{name}	289	? $self->{name}
230	: "$self->{nrof} × $self->{name_pl}";	290	: "$self->{nrof} × $self->{name_pl}";
231		291
232	$self->{flags} & Crossfire::Protocol::F_OPEN	292	$self->{flags} & F_OPEN
233	and $desc .= " (open)";	293	and $desc .= " (open)";
234	$self->{flags} & Crossfire::Protocol::F_APPLIED	294	$self->{flags} & F_APPLIED
235	and $desc .= " (applied)";	295	and $desc .= " (applied)";
236	$self->{flags} & Crossfire::Protocol::F_UNPAID	296	$self->{flags} & F_UNPAID
237	and $desc .= " (unpaid)";	297	and $desc .= " (unpaid)";
238	$self->{flags} & Crossfire::Protocol::F_MAGIC	298	$self->{flags} & F_MAGIC
239	and $desc .= " (magic)";	299	and $desc .= " (magic)";
240	$self->{flags} & Crossfire::Protocol::F_CURSED	300	$self->{flags} & F_CURSED
241	and $desc .= " (cursed)";	301	and $desc .= " (cursed)";
242	$self->{flags} & Crossfire::Protocol::F_DAMNED	302	$self->{flags} & F_DAMNED
243	and $desc .= " (damned)";	303	and $desc .= " (damned)";
244	$self->{flags} & Crossfire::Protocol::F_LOCKED	304	$self->{flags} & F_LOCKED
245	and $desc .= " *";	305	and $desc .= " *";
246		306
247	$desc	307	$desc
248	}	308	}
249		309
…		…
253	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	313	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
254		314
255	$weight < 0 ? "?" : $weight * 0.001	315	$weight < 0 ? "?" : $weight * 0.001
256	}	316	}
257		317
		318	sub do_n_dialog {
		319	my ($cb) = @_;
		320
		321	my $w = new CFClient::UI::FancyFrame
		322	on_delete => sub { $_[0]->destroy; 1 },
		323	has_close_button => 1,
		324	;
		325
		326	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		327	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		328	$vb->add (my $entry = new CFClient::UI::Entry
		329	text => $last_enter_count,
		330	on_activate => sub {
		331	my ($entry) = @_;
		332	$last_enter_count = $entry->get_text;
		333	$cb->($last_enter_count);
		334	$w->hide;
		335	$w->destroy;
		336
		337	0
		338	},
		339	on_escape => sub { $w->destroy; 1 },
		340	);
		341	$entry->grab_focus;
		342	$w->show;
		343	}
		344
258	sub update_widgets {	345	sub update_widgets {
259	my ($self) = @_;	346	my ($self) = @_;
		347
		348	# necessary to avoid cyclic references
		349	Scalar::Util::weaken $self;
		350
		351	my $button_cb = sub {
		352	my (undef, $ev, $x, $y) = @_;
		353
		354	my $targ = $::CONN->{player}{tag};
		355
		356	if ($self->{container} == $::CONN->{player}{tag}) {
		357	$targ = $::CONN->{open_container};
		358	}
		359
		360	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		361	$::CONN->send ("move $targ $self->{tag} 0")
		362	if $targ \|\| !($self->{flags} & F_LOCKED);
		363	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		364	$self->{flags} & F_LOCKED
		365	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		366	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
		367	} elsif ($ev->{button} == 1) {
		368	$::CONN->send ("examine $self->{tag}");
		369	} elsif ($ev->{button} == 2) {
		370	$::CONN->send ("apply $self->{tag}");
		371	} elsif ($ev->{button} == 3) {
		372	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		373	if ($self->{container} == $::CONN->{open_container}) {
		374	$move_prefix = "take";
		375	}
		376
		377	my @menu_items = (
		378	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		379	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		380	["ignite/thaw", # first try of an easier use of flint&steel
		381	sub {
		382	$::CONN->send ("mark ". pack "N", $self->{tag});
		383	$::CONN->send ("command apply flint and steel");
		384	}
		385	],
		386	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		387	(
		388	$self->{flags} & F_LOCKED
		389	? (
		390	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		391	)
		392	: (
		393	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		394	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
		395	["$move_prefix <n>",
		396	sub {
		397	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		398	}
		399	]
		400	)
		401	),
		402	);
		403
		404	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		405	}
		406
		407	1
		408	};
260		409
261	my $tooltip_std = "<small>"	410	my $tooltip_std = "<small>"
262	. "Left click - examine item\n"	411	. "Left click - examine item\n"
263	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	412	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
264	. "Middle click - apply\n"	413	. "Middle click - apply\n"
		414	. "Shift-Middle click - lock/unlock\n"
265	. "Right click - further options"	415	. "Right click - further options"
266	. "</small>\n";	416	. "</small>\n";
267		417
268	$self->{face_widget} \|\|= new CFClient::UI::Face can_events => 1, can_hover => 1;	418	$self->{face_widget} \|\|= new CFClient::UI::Face
		419	can_events => 1,
		420	can_hover => 1,
		421	anim => $self->{anim},
		422	animspeed => $self->{animspeed}, # TODO# must be set at creation time
		423	on_button_down => $button_cb,
		424	;
269	$self->{face_widget}{face} = $self->{face};	425	$self->{face_widget}{face} = $self->{face};
270	$self->{face_widget}{anim} = $self->{anim};	426	$self->{face_widget}{anim} = $self->{anim};
271	$self->{face_widget}{animspeed} = $self->{animespeed};	427	$self->{face_widget}{animspeed} = $self->{animspeed};
272	$self->{face_widget}->set_tooltip (	428	$self->{face_widget}->set_tooltip (
273	"<b>Face/Animation.</b>\n"	429	"<b>Face/Animation.</b>\n"
274	. "Item uses face #$self->{face}. "	430	. "Item uses face #$self->{face}. "
275	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")	431	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
276	. "\n\n$tooltip_std"	432	. "\n\n$tooltip_std"
277	);	433	);
278		434
279	$self->{desc_widget} \|\|= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1;	435	$self->{desc_widget} \|\|= new CFClient::UI::Label
280	$self->{desc_widget}->set_text (CFClient::Item::desc_string $self);	436	can_events => 1,
		437	can_hover => 1,
		438	ellipsise => 2,
		439	align => -1,
		440	on_button_down => $button_cb,
		441	;
		442	my $desc = CFClient::Item::desc_string $self;
		443	$self->{desc_widget}->set_text ($desc);
		444	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
281		445
282	$self->{weight_widget} \|\|= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5;	446	$self->{weight_widget} \|\|= new CFClient::UI::Label
		447	can_events => 1,
		448	can_hover => 1,
		449	ellipsise => 0,
		450	align => 0,
		451	on_button_down => $button_cb,
		452	;
283	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	453	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
284		454
285	$self->{weight_widget}->set_tooltip (	455	$self->{weight_widget}->set_tooltip (
286	"<b>Weight</b>.\n"	456	"<b>Weight</b>.\n"
287	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")	457	. ($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. ")	458	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
289	. "\n\n$tooltip_std"	459	. "\n\n$tooltip_std"
290	);	460	);
291	}	461	}
292		462
293	package CFClient::Texture;
294
295	use strict;
296
297	use Scalar::Util;
298
299	use CFClient::OpenGL;
300
301	my %TEXTURES;
302
303	sub new {
304	my ($class, %data) = @_;
305
306	my $self = bless {
307	internalformat => GL_RGBA,
308	format => GL_RGBA,
309	type => GL_UNSIGNED_BYTE,
310	%data,
311	}, $class;
312
313	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
314
315	$self->upload;
316
317	$self
318	}
319
320	sub new_from_image {
321	my ($class, $image, %arg) = @_;
322
323	$class->new (image => $image, %arg)
324	}
325
326	sub new_from_file {
327	my ($class, $path, %arg) = @_;
328
329	open my $fh, "<:raw", $path
330	or die "$path: $!";
331
332	local $/;
333	$class->new_from_image (<$fh>, %arg)
334	}
335
336	#sub new_from_surface {
337	# my ($class, $surface) = @_;
338	#
339	# $surface->rgba;
340	#
341	# $class->new (
342	# data => $surface->pixels,
343	# w => $surface->width,
344	# h => $surface->height,
345	# )
346	#}
347
348	sub new_from_layout {
349	my ($class, $layout, %arg) = @_;
350
351	my ($w, $h, $data, $format, $internalformat) = $layout->render;
352
353	$class->new (
354	w => $w,
355	h => $h,
356	data => $data,
357	format => $format,
358	internalformat => $format,
359	type => GL_UNSIGNED_BYTE,
360	%arg,
361	)
362	}
363
364	sub new_from_opengl {
365	my ($class, $w, $h, $cb) = @_;
366
367	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
368	}
369
370	sub topot {
371	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
372	}
373
374	sub upload {
375	my ($self) = @_;
376
377	return unless $GL_VERSION;
378
379	my $data;
380
381	if (exists $self->{data}) {
382	$data = $self->{data};
383
384	} elsif (exists $self->{render_cb}) {
385	glViewport 0, 0, $self->{w}, $self->{h};
386	glMatrixMode GL_PROJECTION;
387	glLoadIdentity;
388	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
389	glMatrixMode GL_MODELVIEW;
390	glLoadIdentity;
391	$self->{render_cb}->($self, $self->{w}, $self->{h});
392
393	} else {
394	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
395	= CFClient::load_image_inline $self->{image};
396	}
397
398	my ($tw, $th) = @$self{qw(w h)};
399
400	unless ($tw > 0 && $th > 0) {
401	$tw = $th = 1;
402	$data = "\x00" x 64;
403	}
404
405	$self->{minified} = [CFClient::average $tw, $th, $data]
406	if $self->{minify};
407
408	unless ($GL_NPOT) {
409	# TODO: does not work for zero-sized textures
410	$tw = topot $tw;
411	$th = topot $th;
412
413	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
414	my $bpp = (length $data) / ($self->{w} * $self->{h});
415	$data = pack "(a" . ($tw * $bpp) . ")*",
416	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
417	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
418	}
419	}
420
421	$self->{s} = $self->{w} / $tw;
422	$self->{t} = $self->{h} / $th;
423
424	$self->{name} \|\|= glGenTexture;
425
426	glBindTexture GL_TEXTURE_2D, $self->{name};
427
428	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 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	}
444
445	glGetError;
446
447	if (defined $data) {
448	glTexImage2D GL_TEXTURE_2D, 0,
449	$self->{internalformat},
450	$tw, $th,
451	0,
452	$self->{format},
453	$self->{type},
454	$data;
455	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
456	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
457	} else {
458	glCopyTexImage2D GL_TEXTURE_2D, 0,
459	$self->{internalformat},
460	0, 0,
461	$tw, $th,
462	0;
463	CFClient::gl_check "copying to texture %dx%d if=%x",
464	$tw, $th, $self->{internalformat};
465	}
466
467	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
468	}
469
470	sub DESTROY {
471	my ($self) = @_;
472
473	delete $TEXTURES{$self+0};
474
475	glDeleteTexture delete $self->{name}
476	if $self->{name};
477	}
478
479	sub restore_state {
480	$_->upload
481	for values %TEXTURES;
482	}
483
484	1;	463	1;
485		464
486	=back	465	=back
487		466
488	=head1 AUTHOR	467	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs. Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs.
Revision 1.104 by root, Sun Jul 23 11:09:57 2006 UTC