[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.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	$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	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
106	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
107	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
108	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
109	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
110	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
111	-Verbose => 1,	89	-Verbose => 1,
112	-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,
113	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	}
114		94
115	sub db_table($) {	95	sub db_table($) {
116	my ($table) = @_;	96	my ($table) = @_;
117		97
118	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
119		99
120	new CFClient::Database	100	new CFClient::Database
121	-Env => $DB_ENV,	101	-Env => $DB_ENV,
122	-Filename => $table,	102	-Filename => $table,
123	# -Filename => "database",	103	# -Filename => "database",
124	# -Subname => $table,	104	# -Subname => $table,
125	-Property => DB_CHKSUM,	105	-Property => DB_CHKSUM,
126	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
127	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
128	}	108	}
129		109
130	sub pod_to_pango($) {	110	sub pod_to_pango($) {
131	my ($pom) = @_;	111	my ($pom) = @_;
132		112
133	$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	]
134	}	123	}
135		124
136	package CFClient::PodToPango;	125	package CFClient::PodToPango;
137		126
138	use base Pod::POM::View::Text;	127	use base Pod::POM::View::Text;
…		…
159	. $_[1]->content->present ($_[0])	148	. $_[1]->content->present ($_[0])
160	}	149	}
161		150
162	sub view_verbatim {	151	sub view_verbatim {
163	(join "",	152	(join "",
164	map +("\t" x ($indent / 2)) . "$_\n",	153	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
165	split /\n/, CFClient::UI::Label::escape ($_[1]))	154	split /\n/, CFClient::UI::Label::escape ($_[1]))
166	. "\n"	155	. "\n"
167	}	156	}
168		157
169	sub view_textblock {	158	sub view_textblock {
170	("\t" x ($indent / 2)) . "$_[1]\n\n"	159	("\t" x ($indent / 2)) . "$_[1]\n\n"
171	}	160	}
172		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
173	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 {
174	"<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"	173	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175	. $_[1]->content->present ($_[0])	174	. $_[1]->content->present ($_[0])
176	};	175	};
177		176
178	sub view_over {	177	sub view_over {
179	local $indent = $indent + $_[1]->indent;	178	local $indent = $indent + $_[1]->indent;
…		…
200	$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 });
201		200
202	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
203	}	202	}
204		203
205	package CFClient::Texture;	204	package CFClient::Item;
206		205
207	use strict;	206	use strict;
		207	use Crossfire::Protocol::Constants;
208		208
209	use Scalar::Util;	209	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) = @_;	210	my ($self) = @_;
288		211
289	return unless $GL_VERSION;	212	my $desc =
		213	$self->{nrof} < 2
		214	? $self->{name}
		215	: "$self->{nrof} × $self->{name_pl}";
290		216
291	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 .= " *";
292		231
293	if (exists $self->{data}) {	232	$desc
294	$data = $self->{data};	233	}
295		234
296	} elsif (exists $self->{render_cb}) {	235	sub weight_string {
297	glViewport 0, 0, $self->{w}, $self->{h};	236	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		237
305	} else {	238	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
306	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})	239
307	= 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++
308	}	482	}
		483	}
309		484
310	my ($tw, $th) = @$self{qw(w h)};	485	# if $show is 1 the recorder will be shown
		486	sub start {
		487	my ($show) = @_;
311		488
312	unless ($tw > 0 && $th > 0) {	489	$RECORD_WINDOW->show if $show;
313	$tw = $th = 1;	490
314	$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;
315	}	512	}
		513	}
316		514
317	$self->{minified} = [CFClient::average $tw, $th, $data]	515	sub make_window {
318	if $self->{minify};	516	$RECORD_WINDOW = new CFClient::UI::FancyFrame
		517	req_y => 1,
		518	req_x => -1,
		519	title => "Action Recorder";
319		520
320	unless ($GL_NPOT) {	521	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
321	# TODO: does not work for zero-sized textures	522	$vb->add ($REC_BTN = new CFClient::UI::Button
322	$tw = topot $tw;	523	text => "start recording",
323	$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) = @_;
324		531
325	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	532	unless ($btn->{recording}) {
326	my $bpp = (length $data) / ($self->{w} * $self->{h});	533	start;
327	$data = pack "(a" . ($tw * $bpp) . ")*",	534	} else {
328	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	535	stop;
329	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	536	}
330	}	537	});
331	}	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	});
332		545
333	$self->{s} = $self->{w} / $tw;	546	$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	}	547	}
395		548
396	1;	549	1;
397		550
398	=back	551	=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.80 by elmex, Tue May 30 08:12:50 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.80 by elmex, Tue May 30 08:12:50 2006 UTC