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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC

1	=head1 NAME	1	=head1 NAME
2		2
3	CFClient - undocumented utility garbage for our crossfire client	3	DC - undocumented utility garbage for our deliantra client
4		4
5	=head1 SYNOPSIS	5	=head1 SYNOPSIS
6		6
7	use CFClient;	7	use DC;
8		8
9	=head1 DESCRIPTION	9	=head1 DESCRIPTION
10		10
11	=over 4	11	=over 4
12		12
13	=cut	13	=cut
14		14
15	package CFClient;	15	package DC;
		16
		17	use Carp ();
		18
		19	our $VERSION;
16		20
17	BEGIN {	21	BEGIN {
18	$VERSION = '0.1';	22	$VERSION = '3.0';
19		23
20	use XSLoader;	24	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	25	XSLoader::load "Deliantra::Client", $VERSION;
22	}	26	}
23		27
24	use utf8;	28	use utf8;
		29	use strict qw(vars subs);
25		30
26	use Carp ();	31	use Socket ();
27	use AnyEvent ();	32	use AnyEvent ();
28	use BerkeleyDB;	33	use AnyEvent::Util ();
		34	use Pod::POM ();
		35	use File::Path ();
		36	use Storable (); # finally
		37	use Fcntl ();
		38	use JSON::XS qw(encode_json decode_json);
		39	use Guard qw(guard);
29		40
30	use CFClient::OpenGL;	41	# modules to support other DC::* packages
		42	use List::Util ();
		43	use IO::AIO ();
		44	use Coro::AIO ();
		45	use AnyEvent::AIO ();
31		46
32	our %GL_EXT;	47	use Deliantra::Util ();
33	our $GL_VERSION;	48	use Deliantra::Protocol::Constants ();
34		49
35	our $GL_NPOT;	50	=item shorten $string[, $maxlength]
36	our $GL_DEBUG = 1;
37		51
38	sub gl_init {	52	=cut
39	$GL_VERSION = gl_version * 1;
40	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41		53
42	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	54	sub shorten($;$) {
43	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...	55	my ($str, $len) = @_;
44		56	substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
45	glDisable GL_COLOR_MATERIAL;	57	$str
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	}	58	}
54		59
55	sub gl_check {	60	sub asxml($) {
56	return unless $GL_DEBUG;	61	local $_ = $_[0];
57		62
58	if (my $error = glGetError) {	63	s/&/&/g;
59	my ($format, @args) = @_;	64	s/>/>/g;
60	Carp::cluck sprintf "opengl error %x while $format", $error, @args;	65	s/</</g;
		66
		67	$_
		68	}
		69
		70	sub background(&;&) {
		71	my ($bg, $cb) = @_;
		72
		73	my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
		74	or die "unable to create background socketpair: $!";
		75
		76	my $pid = fork;
		77
		78	if (defined $pid && !$pid) {
		79	local $SIG{__DIE__};
		80
		81	open STDOUT, ">&", $fh_w;
		82	open STDERR, ">&", $fh_w;
		83	close $fh_r;
		84	close $fh_w;
		85
		86	$\| = 1;
		87
		88	eval { $bg->() };
		89
		90	if ($@) {
		91	my $msg = $@;
		92	$msg =~ s/\n+/\n/;
		93	warn "FATAL: $msg";
		94	DC::_exit 1;
		95	}
		96
		97	# win32 is fucked up, of course. exit will clean stuff up,
		98	# which destroys our database etc. _exit will exit ALL
		99	# forked processes, because of the dreaded fork emulation.
		100	DC::_exit 0;
		101	}
		102
		103	close $fh_w;
		104
		105	my $buffer;
		106
		107	my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
		108	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		109	undef $w;
		110	$cb->();
		111	return;
		112	}
		113
		114	while ($buffer =~ s/^(.*)\n//) {
		115	my $line = $1;
		116	$line =~ s/\s+$//;
		117	utf8::decode $line;
		118	if ($line =~ /^\x{e877}json_msg (.*)$/s) {
		119	$cb->(JSON::XS->new->allow_nonref->decode ($1));
		120	} else {
		121	::message ({
		122	markup => "background($pid): " . DC::asxml $line,
		123	});
		124	}
		125	}
61	}	126	});
		127	}
		128
		129	sub background_msg {
		130	my ($msg) = @_;
		131
		132	$msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
		133	$msg =~ s/\n//g;
		134	utf8::encode $msg;
		135	print $msg, "\n";
		136	}
		137
		138	package DC;
		139
		140	our $RC_THEME;
		141	our %THEME;
		142	our @RC_PATH;
		143	our $RC_BASE;
		144
		145	for (grep !ref, @INC) {
		146	$RC_BASE = "$_/Deliantra/Client/private/resources";
		147	last if -d $RC_BASE;
62	}	148	}
63		149
64	sub find_rcfile($) {	150	sub find_rcfile($) {
65	my $path;	151	my $path;
66		152
67	for (grep !ref, @INC) {	153	for (@RC_PATH, "") {
68	$path = "$_/CFClient/resources/$_[0]";	154	$path = "$RC_BASE/$_/$_[0]";
69	return $path if -r $path;	155	return $path if -e $path;
70	}	156	}
71		157
72	die "FATAL: can't find required file $_[0]\n";	158	die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
73	}	159	}
74		160
75	sub read_cfg {	161	sub load_json($) {
76	my ($file) = @_;	162	my ($file) = @_;
77		163
78	open CFG, $file	164	open my $fh, $file
79	or return;	165	or return;
80		166
81	my $CFG;
82
83	local $/;	167	local $/;
84	$CFG = eval <CFG>;	168	eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
85
86	$::CFG = $CFG;
87
88	close CFG;
89	}	169	}
90		170
		171	sub set_theme($) {
		172	return if $RC_THEME eq $_[0];
		173	$RC_THEME = $_[0];
		174
		175	# kind of hacky, find the main theme file, then load all theme files and merge them
		176
		177	%THEME = ();
		178	@RC_PATH = "theme-$RC_THEME";
		179
		180	my $theme = load_json find_rcfile "theme.json"
		181	or die "FATAL: theme resource file not found";
		182
		183	@RC_PATH = @{ $theme->{path} } if $theme->{path};
		184
		185	for (@RC_PATH, "") {
		186	my $theme = load_json "$RC_BASE/$_/theme.json"
		187	or next;
		188
		189	%THEME = ( %$theme, %THEME );
		190	}
		191	}
		192
91	sub write_cfg {	193	sub read_cfg($) {
92	my ($file) = @_;	194	my ($file) = @_;
93		195
94	open CFG, ">$file"	196	$::CFG = (load_json $file) \|\| (load_json "$file.bak");
		197	}
		198
		199	sub write_cfg($) {
		200	my $file = "$Deliantra::VARDIR/client.cf";
		201
		202	$::CFG->{VERSION} = $::VERSION;
		203	$::CFG->{layout} = DC::UI::get_layout ();
		204
		205	open my $fh, ">:utf8", "$file~"
95	or return;	206	or return;
96		207	print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
97	{
98	require Data::Dumper;
99	local $Data::Dumper::Purity = 1;
100	$::CFG->{VERSION} = $::VERSION;
101	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
102	}
103
104	close CFG;	208	close $fh;
105	}
106		209
107	mkdir "$Crossfire::VARDIR/pclient", 0777;	210	rename $file, "$file.bak";
		211	rename "$file~", $file;
		212	}
108		213
109	our $DB_ENV = new BerkeleyDB::Env	214	sub load_cfg() {
110	-Home => "$Crossfire::VARDIR/pclient",	215	if (-e "$Deliantra::VARDIR/client.cf") {
111	-Cachesize => 1_000_000,	216	DC::read_cfg "$Deliantra::VARDIR/client.cf";
112	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	217	} else {
113	# -ErrPrefix => "DATABASE",	218	$::CFG = { cfg_schema => 1, db_schema => 1 };
114	-Verbose => 1,	219	}
115	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	220	}
116	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
117		221
118	sub db_table($) {	222	sub save_cfg() {
119	my ($table) = @_;	223	write_cfg "$Deliantra::VARDIR/client.cf";
		224	}
120		225
121	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	226	sub upgrade_cfg() {
		227	my %DEF_CFG = (
		228	config_autosave => 1,
		229	sdl_mode => undef,
		230	fullscreen => 1,
		231	fast => 0,
		232	force_opengl11 => undef,
		233	disable_alpha => 0,
		234	smooth_movement => 1,
		235	smooth_transitions => 1,
		236	texture_compression => 1,
		237	map_scale => 1,
		238	fow_enable => 1,
		239	fow_intensity => 0,
		240	fow_texture => 0,
		241	map_smoothing => 1,
		242	gui_fontsize => 1,
		243	log_fontsize => 0.7,
		244	gauge_fontsize => 1,
		245	gauge_size => 0.35,
		246	stat_fontsize => 0.7,
		247	mapsize => 100,
		248	audio_enable => 1,
		249	audio_hw_channels => 0,
		250	audio_hw_frequency => 0,
		251	audio_hw_chunksize => 0,
		252	audio_mix_channels => 8,
		253	effects_enable => 1,
		254	effects_volume => 1,
		255	bgm_enable => 1,
		256	bgm_volume => 0.5,
		257	output_rate => "",
		258	pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
		259	\| Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
		260	\| Deliantra::Protocol::Constants::PICKUP_VALUABLES,
		261	inv_sort => "mtime",
		262	default => "profile", # default profile
		263	show_tips => 1,
		264	logview_max_par => 1000,
		265	shift_fire_stop => 0,
		266	uitheme => "wood",
		267	map_shift_x => -24, # arbitrary
		268	map_shift_y => +24, # arbitrary
		269	);
		270
		271	while (my ($k, $v) = each %DEF_CFG) {
		272	$::CFG->{$k} = $v unless exists $::CFG->{$k};
		273	}
		274
		275	if ($::CFG->{cfg_schema} < 1) {
		276	for my $profile (values %{ $::CFG->{profile} }) {
		277	$profile->{password} = unpack "H*", Deliantra::Util::hash_pw $profile->{password};
		278	}
		279	$::CFG->{cfg_schema} = 1;
		280	}
		281	}
		282
		283	sub http_proxy {
		284	my @proxy = win32_proxy_info;
		285
		286	if (@proxy) {
		287	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		288	} elsif (exists $ENV{http_proxy}) {
		289	$ENV{http_proxy}
		290	} else {
		291	()
		292	}
		293	}
		294
		295	sub set_proxy {
		296	my $proxy = http_proxy
		297	or return;
		298
		299	$ENV{http_proxy} = $proxy;
		300	}
		301
		302	sub lwp_useragent {
		303	require LWP::UserAgent;
122		304
123	new CFClient::Database	305	DC::set_proxy;
124	-Env => $DB_ENV,
125	-Filename => $table,
126	# -Filename => "database",
127	# -Subname => $table,
128	-Property => DB_CHKSUM,
129	-Flags => DB_CREATE \| DB_UPGRADE,
130	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
131	}
132		306
133	sub pod_to_pango($) {	307	my $ua = LWP::UserAgent->new (
		308	agent => "deliantra $VERSION",
		309	keep_alive => 1,
		310	env_proxy => 1,
		311	timeout => 30,
		312	);
		313	}
		314
		315	sub lwp_check($) {
134	my ($pom) = @_;	316	my ($res) = @_;
135		317
136	$pom->present ("CFClient::PodToPango")	318	$res->is_error
137	}	319	and die $res->status_line;
138		320
139	sub pod_to_pango_list($) {	321	$res
		322	}
		323
		324	sub fh_nonblocking($$) {
140	my ($pom) = @_;	325	my ($fh, $nb) = @_;
141		326
		327	if ($^O eq "MSWin32") {
		328	$nb = (! ! $nb) + 0;
		329	ioctl $fh, 0x8004667e, \$nb; # FIONBIO
		330	} else {
		331	fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
142	[	332	}
143	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
144	split /\n/, $pom->present ("CFClient::PodToPango")
145	]
146	}	333	}
147		334
148	package CFClient::PodToPango;	335	package DC::Layout;
149		336
150	use base Pod::POM::View::Text;	337	$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
151		338	glyph_cache_restore;
152	our $indent = 0;
153
154	*view_seq_code =
155	*view_seq_bold = sub { "<b>$_[1]</b>" };
156	*view_seq_italic = sub { "<i>$_[1]</i>" };
157	*view_seq_space =
158	*view_seq_link =
159	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
160
161	sub view_seq_text {
162	my $text = $_[1];
163	$text =~ s/\s+/ /g;
164	CFClient::UI::Label::escape ($text)
165	}
166
167	sub view_item {
168	("\t" x ($indent / 4))
169	. $_[1]->title->present ($_[0])
170	. "\n"
171	. $_[1]->content->present ($_[0])
172	}
173
174	sub view_verbatim {
175	(join "",
176	map +("\t" x ($indent / 2)) . "$_\n",
177	split /\n/, CFClient::UI::Label::escape ($_[1]))
178	. "\n"
179	}
180
181	sub view_textblock {
182	("\t" x ($indent / 2)) . "$_[1]\n\n"
183	}
184
185	sub view_head1 {
186	"<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187	. $_[1]->content->present ($_[0])
188	};	339	};
189		340
190	sub view_head2 {	341	$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
191	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	342	glyph_cache_backup;
192	. $_[1]->content->present ($_[0])
193	};	343	};
194
195	sub view_over {
196	local $indent = $indent + $_[1]->indent;
197	$_[1]->content->present ($_[0])
198	}
199
200	package CFClient::Database;
201
202	our @ISA = BerkeleyDB::Btree::;
203
204	sub get($$) {
205	my $data;
206
207	$_[0]->db_get ($_[1], $data) == 0
208	? $data
209	: ()
210	}
211
212	my %DB_SYNC;
213
214	sub put($$$) {
215	my ($db, $key, $data) = @_;
216
217	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
218
219	$db->db_put ($key => $data)
220	}
221
222	package CFClient::Item;
223
224	sub desc_string {
225	my ($self) = @_;
226
227	my $desc =
228	$self->{nrof} < 2
229	? $self->{name}
230	: "$self->{nrof} × $self->{name_pl}";
231
232	$self->{flags} & Crossfire::Protocol::F_OPEN
233	and $desc .= " (open)";
234	$self->{flags} & Crossfire::Protocol::F_APPLIED
235	and $desc .= " (applied)";
236	$self->{flags} & Crossfire::Protocol::F_UNPAID
237	and $desc .= " (unpaid)";
238	$self->{flags} & Crossfire::Protocol::F_MAGIC
239	and $desc .= " (magic)";
240	$self->{flags} & Crossfire::Protocol::F_CURSED
241	and $desc .= " (cursed)";
242	$self->{flags} & Crossfire::Protocol::F_DAMNED
243	and $desc .= " (damned)";
244	$self->{flags} & Crossfire::Protocol::F_LOCKED
245	and $desc .= " *";
246
247	$desc
248	}
249
250	sub weight_string {
251	my ($self) = @_;
252
253	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
254
255	$weight < 0 ? "?" : $weight * 0.001
256	}
257
258	sub update_widgets {
259	my ($self) = @_;
260
261	my $tooltip_std = "<small>"
262	. "Left click - examine item\n"
263	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
264	. "Middle click - apply\n"
265	. "Right click - further options"
266	. "</small>\n";
267
268	$self->{face_widget} \|\|= new CFClient::UI::Face can_events => 1, can_hover => 1;
269	$self->{face_widget}{face} = $self->{face};
270	$self->{face_widget}{anim} = $self->{anim};
271	$self->{face_widget}{animspeed} = $self->{animespeed};
272	$self->{face_widget}->set_tooltip (
273	"<b>Face/Animation.</b>\n"
274	. "Item uses face #$self->{face}. "
275	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
276	. "\n\n$tooltip_std"
277	);
278
279	$self->{desc_widget} \|\|= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1;
280	$self->{desc_widget}->set_text (CFClient::Item::desc_string $self);
281
282	$self->{weight_widget} \|\|= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5;
283	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
284
285	$self->{weight_widget}->set_tooltip (
286	"<b>Weight</b>.\n"
287	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
288	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
289	. "\n\n$tooltip_std"
290	);
291	}
292
293	package CFClient::Texture;
294
295	use strict;
296
297	use Scalar::Util;
298
299	use CFClient::OpenGL;
300
301	my %TEXTURES;
302
303	sub new {
304	my ($class, %data) = @_;
305
306	my $self = bless {
307	internalformat => GL_RGBA,
308	format => GL_RGBA,
309	type => GL_UNSIGNED_BYTE,
310	%data,
311	}, $class;
312
313	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
314
315	$self->upload;
316
317	$self
318	}
319
320	sub new_from_image {
321	my ($class, $image, %arg) = @_;
322
323	$class->new (image => $image, %arg)
324	}
325
326	sub new_from_file {
327	my ($class, $path, %arg) = @_;
328
329	open my $fh, "<:raw", $path
330	or die "$path: $!";
331
332	local $/;
333	$class->new_from_image (<$fh>, %arg)
334	}
335
336	#sub new_from_surface {
337	# my ($class, $surface) = @_;
338	#
339	# $surface->rgba;
340	#
341	# $class->new (
342	# data => $surface->pixels,
343	# w => $surface->width,
344	# h => $surface->height,
345	# )
346	#}
347
348	sub new_from_layout {
349	my ($class, $layout, %arg) = @_;
350
351	my ($w, $h, $data, $format, $internalformat) = $layout->render;
352
353	$class->new (
354	w => $w,
355	h => $h,
356	data => $data,
357	format => $format,
358	internalformat => $format,
359	type => GL_UNSIGNED_BYTE,
360	%arg,
361	)
362	}
363
364	sub new_from_opengl {
365	my ($class, $w, $h, $cb) = @_;
366
367	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
368	}
369
370	sub topot {
371	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
372	}
373
374	sub upload {
375	my ($self) = @_;
376
377	return unless $GL_VERSION;
378
379	my $data;
380
381	if (exists $self->{data}) {
382	$data = $self->{data};
383
384	} elsif (exists $self->{render_cb}) {
385	glViewport 0, 0, $self->{w}, $self->{h};
386	glMatrixMode GL_PROJECTION;
387	glLoadIdentity;
388	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
389	glMatrixMode GL_MODELVIEW;
390	glLoadIdentity;
391	$self->{render_cb}->($self, $self->{w}, $self->{h});
392
393	} else {
394	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
395	= CFClient::load_image_inline $self->{image};
396	}
397
398	my ($tw, $th) = @$self{qw(w h)};
399
400	unless ($tw > 0 && $th > 0) {
401	$tw = $th = 1;
402	$data = "\x00" x 64;
403	}
404
405	$self->{minified} = [CFClient::average $tw, $th, $data]
406	if $self->{minify};
407
408	unless ($GL_NPOT) {
409	# TODO: does not work for zero-sized textures
410	$tw = topot $tw;
411	$th = topot $th;
412
413	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {
414	my $bpp = (length $data) / ($self->{w} * $self->{h});
415	$data = pack "(a" . ($tw * $bpp) . ")*",
416	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
417	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
418	}
419	}
420
421	$self->{s} = $self->{w} / $tw;
422	$self->{t} = $self->{h} / $th;
423
424	$self->{name} \|\|= glGenTexture;
425
426	glBindTexture GL_TEXTURE_2D, $self->{name};
427
428	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
429	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
430
431	if ($::FAST) {
432	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
433	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
434	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
435	# alternatively check for 0x8191
436	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
437	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
438	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
439	} else {
440	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
441	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
442	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
443	}
444
445	glGetError;
446
447	if (defined $data) {
448	glTexImage2D GL_TEXTURE_2D, 0,
449	$self->{internalformat},
450	$tw, $th,
451	0,
452	$self->{format},
453	$self->{type},
454	$data;
455	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
456	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
457	} else {
458	glCopyTexImage2D GL_TEXTURE_2D, 0,
459	$self->{internalformat},
460	0, 0,
461	$tw, $th,
462	0;
463	CFClient::gl_check "copying to texture %dx%d if=%x",
464	$tw, $th, $self->{internalformat};
465	}
466
467	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
468	}
469
470	sub DESTROY {
471	my ($self) = @_;
472
473	delete $TEXTURES{$self+0};
474
475	glDeleteTexture delete $self->{name}
476	if $self->{name};
477	}
478
479	sub restore_state {
480	$_->upload
481	for values %TEXTURES;
482	}
483		344
484	1;	345	1;
485		346
486	=back	347	=back
487		348

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs. Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.62 by root, Thu May 25 16:24:43 2006 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 2012 UTC