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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.75 by root, Mon May 29 21:10:47 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	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
42
43	glDisable GL_COLOR_MATERIAL;
44	glShadeModel GL_FLAT;
45	glDisable GL_DITHER;
46	glDisable GL_DEPTH_TEST;
47	glDepthMask 0;
48	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
49
50	CFClient::Texture::restore_state ();
51	}
52
53	sub gl_check {
54	return unless $GL_DEBUG;
55
56	if (my $error = glGetError) {
57	my ($format, @args) = @_;
58	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
59	}
60	}
61		29
62	sub find_rcfile($) {	30	sub find_rcfile($) {
63	my $path;	31	my $path;
64		32
65	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
100	}	68	}
101		69
102	close CFG;	70	close CFG;
103	}	71	}
104		72
105	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
106		74
107	our $DB_ENV = new BerkeleyDB::Env	75	our $DB_ENV = new BerkeleyDB::Env
108	-Home => "$Crossfire::VARDIR/pclient",	76	-Home => "$Crossfire::VARDIR/cfplus",
109	-Cachesize => 1_000_000,	77	-Cachesize => 1_000_000,
110	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	78	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
111	# -ErrPrefix => "DATABASE",	79	# -ErrPrefix => "DATABASE",
112	-Verbose => 1,	80	-Verbose => 1,
113	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,
114	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	82	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
115		83
116	sub db_table($) {	84	sub db_table($) {
117	my ($table) = @_;	85	my ($table) = @_;
118		86
119	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
…		…
169	. $_[1]->content->present ($_[0])	137	. $_[1]->content->present ($_[0])
170	}	138	}
171		139
172	sub view_verbatim {	140	sub view_verbatim {
173	(join "",	141	(join "",
174	map +("\t" x ($indent / 2)) . "$_\n",	142	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
175	split /\n/, CFClient::UI::Label::escape ($_[1]))	143	split /\n/, CFClient::UI::Label::escape ($_[1]))
176	. "\n"	144	. "\n"
177	}	145	}
178		146
179	sub view_textblock {	147	sub view_textblock {
180	("\t" x ($indent / 2)) . "$_[1]\n\n"	148	("\t" x ($indent / 2)) . "$_[1]\n\n"
181	}	149	}
182		150
183	sub view_head1 {	151	sub view_head1 {
184	"<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	152	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
185	. $_[1]->content->present ($_[0])	153	. $_[1]->content->present ($_[0])
186	};	154	};
187		155
188	sub view_head2 {	156	sub view_head2 {
189	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	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"
190	. $_[1]->content->present ($_[0])	163	. $_[1]->content->present ($_[0])
191	};	164	};
192		165
193	sub view_over {	166	sub view_over {
194	local $indent = $indent + $_[1]->indent;	167	local $indent = $indent + $_[1]->indent;
…		…
215	$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 });
216		189
217	$db->db_put ($key => $data)	190	$db->db_put ($key => $data)
218	}	191	}
219		192
220	package CFClient::Texture;	193	package CFClient::Item;
221		194
222	use strict;	195	use strict;
		196	use Crossfire::Protocol::Constants;
223		197
224	use Scalar::Util;	198	sub desc_string {
225
226	use CFClient::OpenGL;
227
228	my %TEXTURES;
229
230	sub new {
231	my ($class, %data) = @_;
232
233	my $self = bless {
234	internalformat => GL_RGBA,
235	format => GL_RGBA,
236	type => GL_UNSIGNED_BYTE,
237	%data,
238	}, $class;
239
240	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
241
242	$self->upload;
243
244	$self
245	}
246
247	sub new_from_image {
248	my ($class, $image, %arg) = @_;
249
250	$class->new (image => $image, %arg)
251	}
252
253	sub new_from_file {
254	my ($class, $path, %arg) = @_;
255
256	open my $fh, "<:raw", $path
257	or die "$path: $!";
258
259	local $/;
260	$class->new_from_image (<$fh>, %arg)
261	}
262
263	#sub new_from_surface {
264	# my ($class, $surface) = @_;
265	#
266	# $surface->rgba;
267	#
268	# $class->new (
269	# data => $surface->pixels,
270	# w => $surface->width,
271	# h => $surface->height,
272	# )
273	#}
274
275	sub new_from_layout {
276	my ($class, $layout, %arg) = @_;
277
278	my ($w, $h, $data, $format, $internalformat) = $layout->render;
279
280	$class->new (
281	w => $w,
282	h => $h,
283	data => $data,
284	format => $format,
285	internalformat => $format,
286	type => GL_UNSIGNED_BYTE,
287	%arg,
288	)
289	}
290
291	sub new_from_opengl {
292	my ($class, $w, $h, $cb) = @_;
293
294	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
295	}
296
297	sub topot {
298	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
299	}
300
301	sub upload {
302	my ($self) = @_;	199	my ($self) = @_;
303		200
304	return unless $GL_VERSION;	201	my $desc =
		202	$self->{nrof} < 2
		203	? $self->{name}
		204	: "$self->{nrof} × $self->{name_pl}";
305		205
306	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 .= " *";
307		220
308	if (exists $self->{data}) {	221	$desc
309	$data = $self->{data};	222	}
310		223
311	} elsif (exists $self->{render_cb}) {	224	sub weight_string {
312	glViewport 0, 0, $self->{w}, $self->{h};	225	my ($self) = @_;
313	glMatrixMode GL_PROJECTION;
314	glLoadIdentity;
315	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
316	glMatrixMode GL_MODELVIEW;
317	glLoadIdentity;
318	$self->{render_cb}->($self, $self->{w}, $self->{h});
319		226
320	} else {	227	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
321	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})	228
322	= CFClient::load_image_inline $self->{image};	229	$weight < 0 ? "?" : $weight * 0.001
		230	}
		231
		232	sub update_widgets {
		233	my ($self) = @_;
		234
		235	my $button_cb = sub {
		236	my (undef, $ev, $x, $y) = @_;
		237
		238	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		239	my $targ = $::CONN->{player}{tag};
		240
		241	if ($self->{container} == $::CONN->{player}{tag}) {
		242	$targ = $::CONN->{open_container};
		243	}
		244
		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);
		268	}
		269
		270	1
		271	};
		272
		273	my $tooltip_std = "<small>"
		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";
		279
		280	$self->{face_widget} \|\|= new CFClient::UI::Face
		281	can_events => 1,
		282	can_hover => 1,
		283	anim => $self->{anim},
		284	animspeed => $self->{animspeed}, # TODO# must be set at creation time
		285	on_button_down => $button_cb,
		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	);
		296
		297	$self->{desc_widget} \|\|= new CFClient::UI::Label
		298	can_events => 1,
		299	can_hover => 1,
		300	ellipsise => 2,
		301	align => -1,
		302	on_button_down => $button_cb,
		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");
		307
		308	$self->{weight_widget} \|\|= new CFClient::UI::Label
		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);
		316
		317	$self->{weight_widget}->set_tooltip (
		318	"<b>Weight</b>.\n"
		319	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		320	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		321	. "\n\n$tooltip_std"
		322	);
		323	}
		324
		325	package CFClient::Recorder;
		326
		327	our $RECORD_WINDOW;
		328
		329	my $CMDBOX;
		330	my $CURRENT_CMDS;
		331	my $REC_BTN;
		332
		333	my @ALLOWED_MODIFIER_KEYS = (
		334	(CFClient::SDLK_LSHIFT) => "LSHIFT",
		335	(CFClient::SDLK_LCTRL ) => "LCTRL",
		336	(CFClient::SDLK_LALT ) => "LALT",
		337	(CFClient::SDLK_LMETA ) => "LMETA",
		338
		339	(CFClient::SDLK_RSHIFT) => "RSHIFT",
		340	(CFClient::SDLK_RCTRL ) => "RCTRL",
		341	(CFClient::SDLK_RALT ) => "RALT",
		342	(CFClient::SDLK_RMETA ) => "RMETA",
		343	);
		344
		345	my %ALLOWED_MODIFIERS = (
		346	(CFClient::KMOD_LSHIFT) => "LSHIFT",
		347	(CFClient::KMOD_LCTRL ) => "LCTRL",
		348	(CFClient::KMOD_LALT ) => "LALT",
		349	(CFClient::KMOD_LMETA ) => "LMETA",
		350
		351	(CFClient::KMOD_RSHIFT) => "RSHIFT",
		352	(CFClient::KMOD_RCTRL ) => "RCTRL",
		353	(CFClient::KMOD_RALT ) => "RALT",
		354	(CFClient::KMOD_RMETA ) => "RMETA",
		355	);
		356
		357	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
		358	my @DIRECT_BIND_KEYS = (
		359	CFClient::SDLK_F1,
		360	CFClient::SDLK_F2,
		361	CFClient::SDLK_F3,
		362	CFClient::SDLK_F4,
		363	CFClient::SDLK_F5,
		364	CFClient::SDLK_F6,
		365	CFClient::SDLK_F7,
		366	CFClient::SDLK_F8,
		367	CFClient::SDLK_F9,
		368	CFClient::SDLK_F10,
		369	CFClient::SDLK_F11,
		370	CFClient::SDLK_F12,
		371	CFClient::SDLK_F13,
		372	CFClient::SDLK_F14,
		373	CFClient::SDLK_F15,
		374	);
		375
		376	# this binding dialog asks for a key-combo to be pressed
		377	# and if successful it binds the modifier+symbol to the
		378	# supplied actions in $cmd.
		379	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
		380	sub open_binding_dialog {
		381	my ($cmd) = @_;
		382
		383	my $w = new CFClient::UI::FancyFrame
		384	title => "Bind Action";
		385
		386	$w->add (my $vb = new CFClient::UI::VBox);
		387	$vb->add (new CFClient::UI::Label
		388	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		389	."You can only bind 0-9 and F1-F15 without modifiers."
		390	);
		391	$vb->add (my $entry = new CFClient::UI::Entry
		392	text => "",
		393	on_key_down => sub {
		394	my ($entry, $ev) = @_;
		395
		396	my $mod = $ev->{mod};
		397	my $sym = $ev->{sym};
		398
		399	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		400	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		401	return;
		402	}
		403
		404	if ($mod == CFClient::KMOD_NONE
		405	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		406	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		407	{
		408	$::STATUSBOX->add (
		409	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		410	." directly without modifier! It would damage the completer handling."
		411	);
		412	return;
		413	}
		414
		415	$entry->focus_out;
		416
		417	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
		418	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
		419
		420	$w->destroy
		421	});
		422
		423	$entry->focus_in;
		424	$w->center;
		425	$w->show;
		426	}
		427
		428	sub keycombo_to_name {
		429	my ($mod, $sym) = @_;
		430
		431	my $mods = join '+',
		432	map { $ALLOWED_MODIFIERS{$_} }
		433	grep { $_ & $mod }
		434	keys %ALLOWED_MODIFIERS;
		435	$mods .= "+" if $mods ne '';
		436
		437	return $mods . CFClient::SDL_GetKeyName ($sym);
		438	}
		439
		440	sub clear_command_list {
		441	$CMDBOX->clear () if $CMDBOX;
		442	}
		443
		444	sub set_command_list {
		445	my ($list) = @_;
		446
		447	return unless $CMDBOX;
		448
		449	$CMDBOX->clear ();
		450	$CURRENT_CMDS = $list;
		451
		452	my $idx = 0;
		453
		454	for (@$list) {
		455	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
		456
		457	my $i = $idx;
		458	$hb->add (new CFClient::UI::Button
		459	text => "delete",
		460	tooltip => "Deletes the action from the record",
		461	on_activate => sub {
		462	$CMDBOX->remove ($hb);
		463	$list->[$i] = undef;
		464	});
		465
		466	$hb->add (new CFClient::UI::Label text => $_);
		467
		468	$idx++
323	}	469	}
		470	}
324		471
325	my ($tw, $th) = @$self{qw(w h)};	472	# if $show is 1 the recorder will be shown
		473	sub start {
		474	my ($show) = @_;
326		475
327	unless ($tw > 0 && $th > 0) {	476	$RECORD_WINDOW->show if $show;
328	$tw = $th = 1;	477
329	$data = "\x00" x 64;	478	$REC_BTN->set_text ("stop recording");
		479	$REC_BTN->{recording} = 1;
		480	clear_command_list;
		481	$::CONN->start_record;
		482	}
		483
		484	# if $autobind is 1 the recorder will be automatically
		485	# jump into the binding query and hide the recorder window
		486	sub stop {
		487	my ($autobind) = @_;
		488
		489	$REC_BTN->set_text ("start recording");
		490	$REC_BTN->{recording} = 0;
		491
		492	my $rec = $::CONN->stop_record;
		493	return unless ref $rec eq 'ARRAY';
		494	set_command_list ($rec);
		495
		496	if ($autobind) {
		497	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
		498	$RECORD_WINDOW->hide;
330	}	499	}
		500	}
331		501
332	$self->{minified} = [CFClient::average $tw, $th, $data]	502	sub make_window {
333	if $self->{minify};	503	$RECORD_WINDOW = new CFClient::UI::FancyFrame
		504	req_y => 1,
		505	req_x => -1,
		506	title => "Action Recorder";
334		507
335	unless ($GL_NPOT) {	508	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
336	# TODO: does not work for zero-sized textures	509	$vb->add ($REC_BTN = new CFClient::UI::Button
337	$tw = topot $tw;	510	text => "start recording",
338	$th = topot $th;	511	tooltip => "Start/Stops recording of actions."
		512	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
		513	."All subsequent actions after the recording started will be captured."
		514	."The actions are displayed after the record was stopped."
		515	."To bind the action you have to click on the 'Bind' button",
		516	on_activate => sub {
		517	my ($btn) = @_;
339		518
340	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	519	unless ($btn->{recording}) {
341	my $bpp = (length $data) / ($self->{w} * $self->{h});	520	start;
342	$data = pack "(a" . ($tw * $bpp) . ")*",	521	} else {
343	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	522	stop;
344	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	523	}
345	}	524	});
346	}	525	$vb->add ($CMDBOX = new CFClient::UI::VBox);
		526	$vb->add (new CFClient::UI::Button
		527	text => "bind",
		528	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		529	on_activate => sub {
		530	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
		531	});
347		532
348	$self->{s} = $self->{w} / $tw;	533	$RECORD_WINDOW
349	$self->{t} = $self->{h} / $th;
350
351	$self->{name} \|\|= glGenTexture;
352
353	glBindTexture GL_TEXTURE_2D, $self->{name};
354
355	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
356	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
357
358	if ($::FAST) {
359	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
360	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
361	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
362	# alternatively check for 0x8191
363	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
364	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
365	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
366	} else {
367	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
368	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
369	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
370	}
371
372	glGetError;
373
374	if (defined $data) {
375	glTexImage2D GL_TEXTURE_2D, 0,
376	$self->{internalformat},
377	$tw, $th,
378	0,
379	$self->{format},
380	$self->{type},
381	$data;
382	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
383	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
384	} else {
385	glCopyTexImage2D GL_TEXTURE_2D, 0,
386	$self->{internalformat},
387	0, 0,
388	$tw, $th,
389	0;
390	CFClient::gl_check "copying to texture %dx%d if=%x",
391	$tw, $th, $self->{internalformat};
392	}
393
394	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
395	}
396
397	sub DESTROY {
398	my ($self) = @_;
399
400	delete $TEXTURES{$self+0};
401
402	glDeleteTexture delete $self->{name}
403	if $self->{name};
404	}
405
406	sub restore_state {
407	$_->upload
408	for values %TEXTURES;
409	}	534	}
410		535
411	1;	536	1;
412		537
413	=back	538	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs. Revision 1.75 by root, Mon May 29 21:10:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.75 by root, Mon May 29 21:10:47 2006 UTC