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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.69 by root, Thu May 25 23:06:05 2006 UTC vs.
Revision 1.79 by root, Tue May 30 02:55:45 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
30	use CFClient::OpenGL;
31
32	our %GL_EXT;
33	our $GL_VERSION;
34
35	our $GL_NPOT;
36	our $GL_DEBUG = 1;
37
38	sub gl_init {
39	$GL_VERSION = gl_version * 1;
40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41
42	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
43	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
44
45	glDisable GL_COLOR_MATERIAL;
46	glShadeModel GL_FLAT;
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	}
54
55	sub gl_check {
56	return unless $GL_DEBUG;
57
58	if (my $error = glGetError) {
59	my ($format, @args) = @_;
60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
61	}
62	}
63		29
64	sub find_rcfile($) {	30	sub find_rcfile($) {
65	my $path;	31	my $path;
66		32
67	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
102	}	68	}
103		69
104	close CFG;	70	close CFG;
105	}	71	}
106		72
107	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
108		74
		75	our $DB_ENV;
		76
		77	{
		78	use strict;
		79
		80	my $recover = $BerkeleyDB::db_version >= 4.4
		81	? eval "DB_REGISTER \| DB_RECOVER"
		82	: 0;
		83
109	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
110	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
111	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
114	-Verbose => 1,	89	-Verbose => 1,
115	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	90	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		91	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
116	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	92	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		93	}
117		94
118	sub db_table($) {	95	sub db_table($) {
119	my ($table) = @_;	96	my ($table) = @_;
120		97
121	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122		99
123	new CFClient::Database	100	new CFClient::Database
124	-Env => $DB_ENV,	101	-Env => $DB_ENV,
125	-Filename => $table,	102	-Filename => $table,
126	# -Filename => "database",	103	# -Filename => "database",
127	# -Subname => $table,	104	# -Subname => $table,
128	-Property => DB_CHKSUM,	105	-Property => DB_CHKSUM,
129	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
130	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131	}	108	}
132		109
133	sub pod_to_pango($) {	110	sub pod_to_pango($) {
134	my ($pom) = @_;	111	my ($pom) = @_;
135		112
…		…
224	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
225	}	202	}
226		203
227	package CFClient::Item;	204	package CFClient::Item;
228		205
		206	use strict;
		207	use Crossfire::Protocol::Constants;
		208
229	sub desc_string {	209	sub desc_string {
230	my ($self) = @_;	210	my ($self) = @_;
231		211
232	my $desc =	212	my $desc =
233	$self->{nrof} < 2	213	$self->{nrof} < 2
234	? $self->{name}	214	? $self->{name}
235	: "$self->{nrof} × $self->{name_pl}";	215	: "$self->{nrof} × $self->{name_pl}";
236		216
237	$self->{flags} & Crossfire::Protocol::F_OPEN	217	$self->{flags} & F_OPEN
238	and $desc .= " (open)";	218	and $desc .= " (open)";
239	$self->{flags} & Crossfire::Protocol::F_APPLIED	219	$self->{flags} & F_APPLIED
240	and $desc .= " (applied)";	220	and $desc .= " (applied)";
241	$self->{flags} & Crossfire::Protocol::F_UNPAID	221	$self->{flags} & F_UNPAID
242	and $desc .= " (unpaid)";	222	and $desc .= " (unpaid)";
243	$self->{flags} & Crossfire::Protocol::F_MAGIC	223	$self->{flags} & F_MAGIC
244	and $desc .= " (magic)";	224	and $desc .= " (magic)";
245	$self->{flags} & Crossfire::Protocol::F_CURSED	225	$self->{flags} & F_CURSED
246	and $desc .= " (cursed)";	226	and $desc .= " (cursed)";
247	$self->{flags} & Crossfire::Protocol::F_DAMNED	227	$self->{flags} & F_DAMNED
248	and $desc .= " (damned)";	228	and $desc .= " (damned)";
249	$self->{flags} & Crossfire::Protocol::F_LOCKED	229	$self->{flags} & F_LOCKED
250	and $desc .= " *";	230	and $desc .= " *";
251		231
252	$desc	232	$desc
253	}	233	}
254		234
…		…
271		251
272	if ($self->{container} == $::CONN->{player}{tag}) {	252	if ($self->{container} == $::CONN->{player}{tag}) {
273	$targ = $::CONN->{open_container};	253	$targ = $::CONN->{open_container};
274	}	254	}
275		255
276	$::CONN->send ("move $targ $self->{tag} 0");	256	$::CONN->send ("move $targ $self->{tag} 0")
		257	if $targ \|\| !($self->{flags} & F_LOCKED);
277	} elsif ($ev->{button} == 1) {	258	} elsif ($ev->{button} == 1) {
278	$::CONN->send ("examine $self->{tag}");	259	$::CONN->send ("examine $self->{tag}");
279	} elsif ($ev->{button} == 2) {	260	} elsif ($ev->{button} == 2) {
280	$::CONN->send ("apply $self->{tag}");	261	$::CONN->send ("apply $self->{tag}");
281	} elsif ($ev->{button} == 3) {	262	} elsif ($ev->{button} == 3) {
282	my @menu_items = (	263	my @menu_items = (
283	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	264	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
284	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	265	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
285	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	266	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
286	(	267	(
287	$self->{flags} & Crossfire::Protocol::F_LOCKED	268	$self->{flags} & F_LOCKED
288	? (	269	? (
289	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	270	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
290	)	271	)
291	: (	272	: (
292	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	273	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
…		…
311	$self->{face_widget} \|\|= new CFClient::UI::Face	292	$self->{face_widget} \|\|= new CFClient::UI::Face
312	can_events => 1,	293	can_events => 1,
313	can_hover => 1,	294	can_hover => 1,
314	anim => $self->{anim},	295	anim => $self->{anim},
315	animspeed => $self->{animspeed}, # TODO# must be set at creation time	296	animspeed => $self->{animspeed}, # TODO# must be set at creation time
316	connect_button_down => $button_cb,	297	on_button_down => $button_cb,
317	;	298	;
318	$self->{face_widget}{face} = $self->{face};	299	$self->{face_widget}{face} = $self->{face};
319	$self->{face_widget}{anim} = $self->{anim};	300	$self->{face_widget}{anim} = $self->{anim};
320	$self->{face_widget}{animspeed} = $self->{animspeed};	301	$self->{face_widget}{animspeed} = $self->{animspeed};
321	$self->{face_widget}->set_tooltip (	302	$self->{face_widget}->set_tooltip (
…		…
328	$self->{desc_widget} \|\|= new CFClient::UI::Label	309	$self->{desc_widget} \|\|= new CFClient::UI::Label
329	can_events => 1,	310	can_events => 1,
330	can_hover => 1,	311	can_hover => 1,
331	ellipsise => 2,	312	ellipsise => 2,
332	align => -1,	313	align => -1,
333	connect_button_down => $button_cb,	314	on_button_down => $button_cb,
334	;	315	;
335	my $desc = CFClient::Item::desc_string $self;	316	my $desc = CFClient::Item::desc_string $self;
336	$self->{desc_widget}->set_text ($desc);	317	$self->{desc_widget}->set_text ($desc);
337	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	318	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
338		319
339	$self->{weight_widget} \|\|= new CFClient::UI::Label	320	$self->{weight_widget} \|\|= new CFClient::UI::Label
340	can_events => 1,	321	can_events => 1,
341	can_hover => 1,	322	can_hover => 1,
342	ellipsise => 0,	323	ellipsise => 0,
343	align => 0,	324	align => 0,
344	connect_button_down => $button_cb,	325	on_button_down => $button_cb,
345	;	326	;
346	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	327	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
347		328
348	$self->{weight_widget}->set_tooltip (	329	$self->{weight_widget}->set_tooltip (
349	"<b>Weight</b>.\n"	330	"<b>Weight</b>.\n"
…		…
351	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	332	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
352	. "\n\n$tooltip_std"	333	. "\n\n$tooltip_std"
353	);	334	);
354	}	335	}
355		336
356	package CFClient::Texture;	337	package CFClient::Recorder;
357		338
358	use strict;	339	our $RECORD_WINDOW;
359		340
360	use Scalar::Util;	341	my $CMDBOX;
		342	my $CURRENT_CMDS;
		343	my $REC_BTN;
361		344
362	use CFClient::OpenGL;	345	my @ALLOWED_MODIFIER_KEYS = (
		346	(CFClient::SDLK_LSHIFT) => "LSHIFT",
		347	(CFClient::SDLK_LCTRL ) => "LCTRL",
		348	(CFClient::SDLK_LALT ) => "LALT",
		349	(CFClient::SDLK_LMETA ) => "LMETA",
363		350
364	my %TEXTURES;	351	(CFClient::SDLK_RSHIFT) => "RSHIFT",
		352	(CFClient::SDLK_RCTRL ) => "RCTRL",
		353	(CFClient::SDLK_RALT ) => "RALT",
		354	(CFClient::SDLK_RMETA ) => "RMETA",
		355	);
365		356
366	sub new {	357	my %ALLOWED_MODIFIERS = (
		358	(CFClient::KMOD_LSHIFT) => "LSHIFT",
		359	(CFClient::KMOD_LCTRL ) => "LCTRL",
		360	(CFClient::KMOD_LALT ) => "LALT",
		361	(CFClient::KMOD_LMETA ) => "LMETA",
		362
		363	(CFClient::KMOD_RSHIFT) => "RSHIFT",
		364	(CFClient::KMOD_RCTRL ) => "RCTRL",
		365	(CFClient::KMOD_RALT ) => "RALT",
		366	(CFClient::KMOD_RMETA ) => "RMETA",
		367	);
		368
		369	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
		370	my @DIRECT_BIND_KEYS = (
		371	CFClient::SDLK_F1,
		372	CFClient::SDLK_F2,
		373	CFClient::SDLK_F3,
		374	CFClient::SDLK_F4,
		375	CFClient::SDLK_F5,
		376	CFClient::SDLK_F6,
		377	CFClient::SDLK_F7,
		378	CFClient::SDLK_F8,
		379	CFClient::SDLK_F9,
		380	CFClient::SDLK_F10,
		381	CFClient::SDLK_F11,
		382	CFClient::SDLK_F12,
		383	CFClient::SDLK_F13,
		384	CFClient::SDLK_F14,
		385	CFClient::SDLK_F15,
		386	);
		387
		388	# this binding dialog asks for a key-combo to be pressed
		389	# and if successful it binds the modifier+symbol to the
		390	# supplied actions in $cmd.
		391	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
		392	sub open_binding_dialog {
367	my ($class, %data) = @_;	393	my ($cmd) = @_;
368		394
369	my $self = bless {	395	my $w = new CFClient::UI::FancyFrame
370	internalformat => GL_RGBA,	396	title => "Bind Action";
371	format => GL_RGBA,
372	type => GL_UNSIGNED_BYTE,
373	%data,
374	}, $class;
375		397
376	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);	398	$w->add (my $vb = new CFClient::UI::VBox);
377		399	$vb->add (new CFClient::UI::Label
378	$self->upload;	400	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
379		401	."You can only bind 0-9 and F1-F15 without modifiers."
380	$self
381	}
382
383	sub new_from_image {
384	my ($class, $image, %arg) = @_;
385
386	$class->new (image => $image, %arg)
387	}
388
389	sub new_from_file {
390	my ($class, $path, %arg) = @_;
391
392	open my $fh, "<:raw", $path
393	or die "$path: $!";
394
395	local $/;
396	$class->new_from_image (<$fh>, %arg)
397	}
398
399	#sub new_from_surface {
400	# my ($class, $surface) = @_;
401	#
402	# $surface->rgba;
403	#
404	# $class->new (
405	# data => $surface->pixels,
406	# w => $surface->width,
407	# h => $surface->height,
408	# )
409	#}
410
411	sub new_from_layout {
412	my ($class, $layout, %arg) = @_;
413
414	my ($w, $h, $data, $format, $internalformat) = $layout->render;
415
416	$class->new (
417	w => $w,
418	h => $h,
419	data => $data,
420	format => $format,
421	internalformat => $format,
422	type => GL_UNSIGNED_BYTE,
423	%arg,
424	)	402	);
425	}	403	$vb->add (my $entry = new CFClient::UI::Entry
		404	text => "",
		405	on_key_down => sub {
		406	my ($entry, $ev) = @_;
426		407
427	sub new_from_opengl {	408	my $mod = $ev->{mod};
428	my ($class, $w, $h, $cb) = @_;	409	my $sym = $ev->{sym};
429		410
430	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)	411	# XXX: This seems a little bit hackisch to me, but i have to ignore them
431	}	412	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		413	return;
		414	}
432		415
433	sub topot {	416	if ($mod == CFClient::KMOD_NONE
434	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]	417	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
435	}	418	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		419	{
		420	$::STATUSBOX->add (
		421	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		422	." directly without modifier! It would damage the completer handling."
		423	);
		424	return;
		425	}
436		426
437	sub upload {	427	$entry->focus_out;
		428
		429	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
		430	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
		431
		432	$w->destroy
		433	});
		434
		435	$entry->focus_in;
		436	$w->center;
		437	$w->show;
		438	}
		439
		440	sub keycombo_to_name {
		441	my ($mod, $sym) = @_;
		442
		443	my $mods = join '+',
		444	map { $ALLOWED_MODIFIERS{$_} }
		445	grep { $_ & $mod }
		446	keys %ALLOWED_MODIFIERS;
		447	$mods .= "+" if $mods ne '';
		448
		449	return $mods . CFClient::SDL_GetKeyName ($sym);
		450	}
		451
		452	sub clear_command_list {
		453	$CMDBOX->clear () if $CMDBOX;
		454	}
		455
		456	sub set_command_list {
438	my ($self) = @_;	457	my ($list) = @_;
439		458
440	return unless $GL_VERSION;	459	return unless $CMDBOX;
441		460
442	my $data;	461	$CMDBOX->clear ();
		462	$CURRENT_CMDS = $list;
443		463
444	if (exists $self->{data}) {	464	my $idx = 0;
445	$data = $self->{data};
446		465
447	} elsif (exists $self->{render_cb}) {	466	for (@$list) {
448	glViewport 0, 0, $self->{w}, $self->{h};	467	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
449	glMatrixMode GL_PROJECTION;
450	glLoadIdentity;
451	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
452	glMatrixMode GL_MODELVIEW;
453	glLoadIdentity;
454	$self->{render_cb}->($self, $self->{w}, $self->{h});
455		468
456	} else {	469	my $i = $idx;
457	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})	470	$hb->add (new CFClient::UI::Button
458	= CFClient::load_image_inline $self->{image};	471	text => "delete",
		472	tooltip => "Deletes the action from the record",
		473	on_activate => sub {
		474	$CMDBOX->remove ($hb);
		475	$list->[$i] = undef;
		476	});
		477
		478	$hb->add (new CFClient::UI::Label text => $_);
		479
		480	$idx++
459	}	481	}
		482	}
460		483
461	my ($tw, $th) = @$self{qw(w h)};	484	# if $show is 1 the recorder will be shown
		485	sub start {
		486	my ($show) = @_;
462		487
463	unless ($tw > 0 && $th > 0) {	488	$RECORD_WINDOW->show if $show;
464	$tw = $th = 1;	489
465	$data = "\x00" x 64;	490	$REC_BTN->set_text ("stop recording");
		491	$REC_BTN->{recording} = 1;
		492	clear_command_list;
		493	$::CONN->start_record;
		494	}
		495
		496	# if $autobind is 1 the recorder will be automatically
		497	# jump into the binding query and hide the recorder window
		498	sub stop {
		499	my ($autobind) = @_;
		500
		501	$REC_BTN->set_text ("start recording");
		502	$REC_BTN->{recording} = 0;
		503
		504	my $rec = $::CONN->stop_record;
		505	return unless ref $rec eq 'ARRAY';
		506	set_command_list ($rec);
		507
		508	if ($autobind) {
		509	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
		510	$RECORD_WINDOW->hide;
466	}	511	}
		512	}
467		513
468	$self->{minified} = [CFClient::average $tw, $th, $data]	514	sub make_window {
469	if $self->{minify};	515	$RECORD_WINDOW = new CFClient::UI::FancyFrame
		516	req_y => 1,
		517	req_x => -1,
		518	title => "Action Recorder";
470		519
471	unless ($GL_NPOT) {	520	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
472	# TODO: does not work for zero-sized textures	521	$vb->add ($REC_BTN = new CFClient::UI::Button
473	$tw = topot $tw;	522	text => "start recording",
474	$th = topot $th;	523	tooltip => "Start/Stops recording of actions."
		524	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
		525	."All subsequent actions after the recording started will be captured."
		526	."The actions are displayed after the record was stopped."
		527	."To bind the action you have to click on the 'Bind' button",
		528	on_activate => sub {
		529	my ($btn) = @_;
475		530
476	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	531	unless ($btn->{recording}) {
477	my $bpp = (length $data) / ($self->{w} * $self->{h});	532	start;
478	$data = pack "(a" . ($tw * $bpp) . ")*",	533	} else {
479	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	534	stop;
480	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	535	}
481	}	536	});
482	}	537	$vb->add ($CMDBOX = new CFClient::UI::VBox);
		538	$vb->add (new CFClient::UI::Button
		539	text => "bind",
		540	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		541	on_activate => sub {
		542	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
		543	});
483		544
484	$self->{s} = $self->{w} / $tw;	545	$RECORD_WINDOW
485	$self->{t} = $self->{h} / $th;
486
487	$self->{name} \|\|= glGenTexture;
488
489	glBindTexture GL_TEXTURE_2D, $self->{name};
490
491	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
492	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
493
494	if ($::FAST) {
495	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
496	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
497	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
498	# alternatively check for 0x8191
499	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
500	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
501	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
502	} else {
503	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
504	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
505	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
506	}
507
508	glGetError;
509
510	if (defined $data) {
511	glTexImage2D GL_TEXTURE_2D, 0,
512	$self->{internalformat},
513	$tw, $th,
514	0,
515	$self->{format},
516	$self->{type},
517	$data;
518	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
519	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
520	} else {
521	glCopyTexImage2D GL_TEXTURE_2D, 0,
522	$self->{internalformat},
523	0, 0,
524	$tw, $th,
525	0;
526	CFClient::gl_check "copying to texture %dx%d if=%x",
527	$tw, $th, $self->{internalformat};
528	}
529
530	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
531	}
532
533	sub DESTROY {
534	my ($self) = @_;
535
536	delete $TEXTURES{$self+0};
537
538	glDeleteTexture delete $self->{name}
539	if $self->{name};
540	}
541
542	sub restore_state {
543	$_->upload
544	for values %TEXTURES;
545	}	546	}
546		547
547	1;	548	1;
548		549
549	=back	550	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.69 by root, Thu May 25 23:06:05 2006 UTC vs. Revision 1.79 by root, Tue May 30 02:55:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.69 by root, Thu May 25 23:06:05 2006 UTC vs.
Revision 1.79 by root, Tue May 30 02:55:45 2006 UTC