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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.59 by elmex, Tue May 23 17:30:18 2006 UTC vs. Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.59 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC