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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.55 by root, Fri May 19 16:43:56 2006 UTC vs. Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.55 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC