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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.74 by elmex, Mon May 29 19:49:33 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs. Revision 1.74 by elmex, Mon May 29 19:49:33 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.74 by elmex, Mon May 29 19:49:33 2006 UTC