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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs. Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC