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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.48 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.79 by root, Tue May 30 02:55:45 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
34	sub gl_init {
35	$GL_VERSION = gl_version * 1;
36	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37
38	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
39
40	glEnable GL_TEXTURE_2D;
41	glEnable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;
43	glDisable GL_DEPTH_TEST;
44	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
45
46	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47
48	CFClient::Texture::restore_state ();
49	}
50		29
51	sub find_rcfile($) {	30	sub find_rcfile($) {
52	my $path;	31	my $path;
53		32
54	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
89	}	68	}
90		69
91	close CFG;	70	close CFG;
92	}	71	}
93		72
94	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
95		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
96	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
97	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
98	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
99	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
100	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
101	-Verbose => 1,	89	-Verbose => 1,
102	-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,
103	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	}
104		94
105	sub db_table($) {	95	sub db_table($) {
106	my ($table) = @_;	96	my ($table) = @_;
107		97
108	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
109		99
110	new CFClient::Database	100	new CFClient::Database
111	-Env => $DB_ENV,	101	-Env => $DB_ENV,
112	-Filename => $table,	102	-Filename => $table,
113	# -Filename => "database",	103	# -Filename => "database",
114	# -Subname => $table,	104	# -Subname => $table,
		105	-Property => DB_CHKSUM,
115	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
116	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])
117	}	180	}
118		181
119	package CFClient::Database;	182	package CFClient::Database;
120		183
121	our @ISA = BerkeleyDB::Btree::;	184	our @ISA = BerkeleyDB::Btree::;
…		…
136	$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 });
137		200
138	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
139	}	202	}
140		203
141	package CFClient::Texture;	204	package CFClient::Item;
142		205
143	use strict;	206	use strict;
		207	use Crossfire::Protocol::Constants;
144		208
145	use Scalar::Util;	209	sub desc_string {
146
147	use CFClient::OpenGL;
148
149	my %TEXTURES;
150
151	sub new {
152	my ($class, %data) = @_;
153
154	my $self = bless {
155	internalformat => GL_RGBA,
156	format => GL_RGBA,
157	type => GL_UNSIGNED_BYTE,
158	%data,
159	}, $class;
160
161	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
162
163	$self->upload;
164
165	$self
166	}
167
168	sub new_from_image {
169	my ($class, $image, %arg) = @_;
170
171	$class->new (image => $image, %arg)
172	}
173
174	sub new_from_file {
175	my ($class, $path, %arg) = @_;
176
177	open my $fh, "<:raw", $path
178	or die "$path: $!";
179
180	local $/;
181	$class->new_from_image (<$fh>, %arg)
182	}
183
184	#sub new_from_surface {
185	# my ($class, $surface) = @_;
186	#
187	# $surface->rgba;
188	#
189	# $class->new (
190	# data => $surface->pixels,
191	# w => $surface->width,
192	# h => $surface->height,
193	# )
194	#}
195
196	sub new_from_layout {
197	my ($class, $layout, %arg) = @_;
198
199	my ($w, $h, $data) = $layout->render;
200
201	$class->new (
202	w => $w,
203	h => $h,
204	data => $data,
205	format => GL_ALPHA,
206	internalformat => GL_ALPHA,
207	type => GL_UNSIGNED_BYTE,
208	%arg,
209	)
210	}
211
212	sub new_from_opengl {
213	my ($class, $w, $h, $cb) = @_;
214
215	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
216	}
217
218	sub topot {
219	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
220	}
221
222	sub upload {
223	my ($self) = @_;	210	my ($self) = @_;
224		211
225	return unless $GL_VERSION;	212	my $desc =
		213	$self->{nrof} < 2
		214	? $self->{name}
		215	: "$self->{nrof} × $self->{name_pl}";
226		216
227	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 .= " *";
228		231
229	if (exists $self->{data}) {	232	$desc
230	$data = $self->{data};	233	}
231		234
232	} elsif (exists $self->{render_cb}) {	235	sub weight_string {
233	glViewport 0, 0, $self->{w}, $self->{h};	236	my ($self) = @_;
234	glMatrixMode GL_PROJECTION;
235	glLoadIdentity;
236	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
237	glMatrixMode GL_MODELVIEW;
238	glLoadIdentity;
239	$self->{render_cb}->($self, $self->{w}, $self->{h});
240		237
241	} else {	238	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
242	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})	239
243	= 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
		398	$w->add (my $vb = new CFClient::UI::VBox);
		399	$vb->add (new CFClient::UI::Label
		400	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		401	."You can only bind 0-9 and F1-F15 without modifiers."
		402	);
		403	$vb->add (my $entry = new CFClient::UI::Entry
		404	text => "",
		405	on_key_down => sub {
		406	my ($entry, $ev) = @_;
		407
		408	my $mod = $ev->{mod};
		409	my $sym = $ev->{sym};
		410
		411	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		412	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		413	return;
		414	}
		415
		416	if ($mod == CFClient::KMOD_NONE
		417	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		418	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		419	{
		420	$::STATUSBOX->add (
		421	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		422	." directly without modifier! It would damage the completer handling."
		423	);
		424	return;
		425	}
		426
		427	$entry->focus_out;
		428
		429	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
		430	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
		431
		432	$w->destroy
		433	});
		434
		435	$entry->focus_in;
		436	$w->center;
		437	$w->show;
		438	}
		439
		440	sub keycombo_to_name {
		441	my ($mod, $sym) = @_;
		442
		443	my $mods = join '+',
		444	map { $ALLOWED_MODIFIERS{$_} }
		445	grep { $_ & $mod }
		446	keys %ALLOWED_MODIFIERS;
		447	$mods .= "+" if $mods ne '';
		448
		449	return $mods . CFClient::SDL_GetKeyName ($sym);
		450	}
		451
		452	sub clear_command_list {
		453	$CMDBOX->clear () if $CMDBOX;
		454	}
		455
		456	sub set_command_list {
		457	my ($list) = @_;
		458
		459	return unless $CMDBOX;
		460
		461	$CMDBOX->clear ();
		462	$CURRENT_CMDS = $list;
		463
		464	my $idx = 0;
		465
		466	for (@$list) {
		467	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
		468
		469	my $i = $idx;
		470	$hb->add (new CFClient::UI::Button
		471	text => "delete",
		472	tooltip => "Deletes the action from the record",
		473	on_activate => sub {
		474	$CMDBOX->remove ($hb);
		475	$list->[$i] = undef;
		476	});
		477
		478	$hb->add (new CFClient::UI::Label text => $_);
		479
		480	$idx++
244	}	481	}
		482	}
245		483
246	my ($tw, $th) = @$self{qw(w h)};	484	# if $show is 1 the recorder will be shown
		485	sub start {
		486	my ($show) = @_;
247		487
248	unless ($tw > 0 && $th > 0) {	488	$RECORD_WINDOW->show if $show;
249	$tw = $th = 1;	489
250	$data = "\x00" x 64;	490	$REC_BTN->set_text ("stop recording");
		491	$REC_BTN->{recording} = 1;
		492	clear_command_list;
		493	$::CONN->start_record;
		494	}
		495
		496	# if $autobind is 1 the recorder will be automatically
		497	# jump into the binding query and hide the recorder window
		498	sub stop {
		499	my ($autobind) = @_;
		500
		501	$REC_BTN->set_text ("start recording");
		502	$REC_BTN->{recording} = 0;
		503
		504	my $rec = $::CONN->stop_record;
		505	return unless ref $rec eq 'ARRAY';
		506	set_command_list ($rec);
		507
		508	if ($autobind) {
		509	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
		510	$RECORD_WINDOW->hide;
251	}	511	}
		512	}
252		513
253	$self->{minified} = [CFClient::average $tw, $th, $data]	514	sub make_window {
254	if $self->{minify};	515	$RECORD_WINDOW = new CFClient::UI::FancyFrame
		516	req_y => 1,
		517	req_x => -1,
		518	title => "Action Recorder";
255		519
256	unless ($GL_NPOT) {	520	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
257	# TODO: does not work for zero-sized textures	521	$vb->add ($REC_BTN = new CFClient::UI::Button
258	$tw = topot $tw;	522	text => "start recording",
259	$th = topot $th;	523	tooltip => "Start/Stops recording of actions."
		524	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
		525	."All subsequent actions after the recording started will be captured."
		526	."The actions are displayed after the record was stopped."
		527	."To bind the action you have to click on the 'Bind' button",
		528	on_activate => sub {
		529	my ($btn) = @_;
260		530
261	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	531	unless ($btn->{recording}) {
262	my $bpp = (length $data) / ($self->{w} * $self->{h});	532	start;
263	$data = pack "(a" . ($tw * $bpp) . ")*",	533	} else {
264	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;	534	stop;
265	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});	535	}
266	}	536	});
267	}	537	$vb->add ($CMDBOX = new CFClient::UI::VBox);
268		538	$vb->add (new CFClient::UI::Button
269	$self->{s} = $self->{w} / $tw;	539	text => "bind",
270	$self->{t} = $self->{h} / $th;	540	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
271		541	on_activate => sub {
272	$self->{name} \|\|= glGenTexture;	542	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
273
274	glBindTexture GL_TEXTURE_2D, $self->{name};
275
276	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
277	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
278
279	if ($::FAST) {
280	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
281	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
282	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
283	# alternatively check for 0x8191
284	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
285	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
287	} else {
288	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
289	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
290	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
291	}
292
293	glGetError;
294
295	if (defined $data) {
296	glTexImage2D GL_TEXTURE_2D, 0,
297	$self->{internalformat},
298	$tw, $th, # need to pad texture first
299	0,
300	$self->{format},
301	$self->{type},
302	$data;
303	if (my $error = glGetError) {
304	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
305	$error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
306	}	543	});
307	} else {
308	glCopyTexImage2D GL_TEXTURE_2D, 0,
309	$self->{internalformat},
310	0, 0,
311	$tw, $th,
312	0;
313	if (my $error = glGetError) {
314	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
315	$error, $tw, $th, $self->{internalformat};
316	}
317	}
318	}
319		544
320	sub DESTROY {	545	$RECORD_WINDOW
321	my ($self) = @_;
322
323	delete $TEXTURES{$self+0};
324
325	glDeleteTexture delete $self->{name}
326	if $self->{name};
327	}	546	}
328
329	sub restore_state{
330	$_->upload
331	for values %TEXTURES;
332	};
333		547
334	1;	548	1;
335		549
336	=back	550	=back
337		551

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.48 by root, Tue Apr 25 11:18:48 2006 UTC vs. Revision 1.79 by root, Tue May 30 02:55:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.48 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.79 by root, Tue May 30 02:55:45 2006 UTC