ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.66 by root, Thu May 25 21:18:47 2006 UTC vs.
Revision 1.87 by root, Mon Jun 5 05:23:19 2006 UTC

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29 29use Pod::POM;
30use CFClient::OpenGL;
31
32our %GL_EXT;
33our $GL_VERSION;
34
35our $GL_NPOT;
36our $GL_DEBUG = 1;
37
38sub gl_init {
39 $GL_VERSION = gl_version * 1;
40 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41
42 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
43 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
44
45 glDisable GL_COLOR_MATERIAL;
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}
54
55sub gl_check {
56 return unless $GL_DEBUG;
57
58 if (my $error = glGetError) {
59 my ($format, @args) = @_;
60 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
61 }
62}
63 30
64sub find_rcfile($) { 31sub find_rcfile($) {
65 my $path; 32 my $path;
66 33
67 for (grep !ref, @INC) { 34 for (grep !ref, @INC) {
… …
102 } 69 }
103 70
104 close CFG; 71 close CFG;
105} 72}
106 73
74sub load_pod($) {
75 my $pod = do {
76 local $/;
77 open my $pod, "<:utf8", $_[0]
78 or die "$_[0]: $!";
79 <$pod>
80 };
81
82 Pod::POM->new->parse_text ($pod);
83}
84
85our $DB_ENV;
86
87{
88 use strict;
89
107mkdir "$Crossfire::VARDIR/pclient", 0777; 90 mkdir "$Crossfire::VARDIR/cfplus", 0777;
91 my $recover = $BerkeleyDB::db_version >= 4.4
92 ? eval "DB_REGISTER | DB_RECOVER"
93 : 0;
108 94
109our $DB_ENV = new BerkeleyDB::Env 95 $DB_ENV = new BerkeleyDB::Env
110 -Home => "$Crossfire::VARDIR/pclient", 96 -Home => "$Crossfire::VARDIR/cfplus",
111 -Cachesize => 1_000_000, 97 -Cachesize => 1_000_000,
112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 98 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113# -ErrPrefix => "DATABASE", 99# -ErrPrefix => "DATABASE",
114 -Verbose => 1, 100 -Verbose => 1,
115 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 101 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
102 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
116 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 103 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
104}
117 105
118sub db_table($) { 106sub db_table($) {
119 my ($table) = @_; 107 my ($table) = @_;
120 108
121 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 109 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122 110
123 new CFClient::Database 111 new CFClient::Database
124 -Env => $DB_ENV, 112 -Env => $DB_ENV,
125 -Filename => $table, 113 -Filename => $table,
126# -Filename => "database", 114# -Filename => "database",
127# -Subname => $table, 115# -Subname => $table,
128 -Property => DB_CHKSUM, 116 -Property => DB_CHKSUM,
129 -Flags => DB_CREATE | DB_UPGRADE, 117 -Flags => DB_CREATE | DB_UPGRADE,
130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 118 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131} 119}
132 120
133sub pod_to_pango($) { 121sub pod_to_pango($) {
134 my ($pom) = @_; 122 my ($pom) = @_;
135 123
… …
171 . $_[1]->content->present ($_[0]) 159 . $_[1]->content->present ($_[0])
172} 160}
173 161
174sub view_verbatim { 162sub view_verbatim {
175 (join "", 163 (join "",
176 map +("\t" x ($indent / 2)) . "$_\n", 164 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1])) 165 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n" 166 . "\n"
179} 167}
180 168
181sub view_textblock { 169sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n" 170 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183} 171}
184 172
185sub view_head1 { 173sub view_head1 {
186 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 174 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0]) 175 . $_[1]->content->present ($_[0])
188}; 176};
189 177
190sub view_head2 { 178sub view_head2 {
191 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 179 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
180 . $_[1]->content->present ($_[0])
181};
182
183sub view_head3 {
184 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0]) 185 . $_[1]->content->present ($_[0])
193}; 186};
194 187
195sub view_over { 188sub view_over {
196 local $indent = $indent + $_[1]->indent; 189 local $indent = $indent + $_[1]->indent;
… …
218 211
219 $db->db_put ($key => $data) 212 $db->db_put ($key => $data)
220} 213}
221 214
222package CFClient::Item; 215package CFClient::Item;
216
217use strict;
218use Crossfire::Protocol::Constants;
219
220my $last_enter_count = 1;
223 221
224sub desc_string { 222sub desc_string {
225 my ($self) = @_; 223 my ($self) = @_;
226 224
227 my $desc = 225 my $desc =
228 $self->{nrof} < 2 226 $self->{nrof} < 2
229 ? $self->{name} 227 ? $self->{name}
230 : "$self->{nrof} × $self->{name_pl}"; 228 : "$self->{nrof} × $self->{name_pl}";
231 229
232 $self->{flags} & Crossfire::Protocol::F_OPEN 230 $self->{flags} & F_OPEN
233 and $desc .= " (open)"; 231 and $desc .= " (open)";
234 $self->{flags} & Crossfire::Protocol::F_APPLIED 232 $self->{flags} & F_APPLIED
235 and $desc .= " (applied)"; 233 and $desc .= " (applied)";
236 $self->{flags} & Crossfire::Protocol::F_UNPAID 234 $self->{flags} & F_UNPAID
237 and $desc .= " (unpaid)"; 235 and $desc .= " (unpaid)";
238 $self->{flags} & Crossfire::Protocol::F_MAGIC 236 $self->{flags} & F_MAGIC
239 and $desc .= " (magic)"; 237 and $desc .= " (magic)";
240 $self->{flags} & Crossfire::Protocol::F_CURSED 238 $self->{flags} & F_CURSED
241 and $desc .= " (cursed)"; 239 and $desc .= " (cursed)";
242 $self->{flags} & Crossfire::Protocol::F_DAMNED 240 $self->{flags} & F_DAMNED
243 and $desc .= " (damned)"; 241 and $desc .= " (damned)";
244 $self->{flags} & Crossfire::Protocol::F_LOCKED 242 $self->{flags} & F_LOCKED
245 and $desc .= " *"; 243 and $desc .= " *";
246 244
247 $desc 245 $desc
248} 246}
249 247
… …
253 my $weight = ($self->{nrof} || 1) * $self->{weight}; 251 my $weight = ($self->{nrof} || 1) * $self->{weight};
254 252
255 $weight < 0 ? "?" : $weight * 0.001 253 $weight < 0 ? "?" : $weight * 0.001
256} 254}
257 255
256sub do_n_dialog {
257 my ($cb) = @_;
258
259 my $w = new CFClient::UI::FancyFrame;
260 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
261 $vb->add (new CFClient::UI::Label text => "Enter item count:");
262 $vb->add (my $entry = new CFClient::UI::Entry
263 text => $last_enter_count,
264 on_activate => sub {
265 my ($entry) = @_;
266 $last_enter_count = $entry->get_text;
267 $cb->($last_enter_count);
268 $w->hide;
269 $w = undef;
270 }
271 );
272 $entry->focus_in;
273 $w->show;
274
275}
276
258sub update_widgets { 277sub update_widgets {
259 my ($self) = @_; 278 my ($self) = @_;
260 279
261 my $button_cb = sub { 280 my $button_cb = sub {
262 my (undef, $ev, $x, $y) = @_; 281 my (undef, $ev, $x, $y) = @_;
263 282
283 my $targ = $::CONN->{player}{tag};
284
285 if ($self->{container} == $::CONN->{player}{tag}) {
286 $targ = $::CONN->{open_container};
287 }
288
264 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 289 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
265 my $targ = $::CONN->{player}{tag};
266
267 if ($self->{container} == $::CONN->{player}{tag}) {
268 $targ = $::CONN->{open_container};
269 }
270
271 $::CONN->send ("move $targ $self->{tag} 0"); 290 $::CONN->send ("move $targ $self->{tag} 0")
291 if $targ || !($self->{flags} & F_LOCKED);
292 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
293 $self->{flags} & F_LOCKED
294 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
295 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
272 } elsif ($ev->{button} == 1) { 296 } elsif ($ev->{button} == 1) {
273 $::CONN->send ("examine $self->{tag}"); 297 $::CONN->send ("examine $self->{tag}");
274 } elsif ($ev->{button} == 2) { 298 } elsif ($ev->{button} == 2) {
275 $::CONN->send ("apply $self->{tag}"); 299 $::CONN->send ("apply $self->{tag}");
276 } elsif ($ev->{button} == 3) { 300 } elsif ($ev->{button} == 3) {
277 my @menu_items = ( 301 my @menu_items = (
278 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 302 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
279 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 303 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
280 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 304 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
281 ( 305 (
282 $self->{flags} & Crossfire::Protocol::F_LOCKED 306 $self->{flags} & F_LOCKED
283 ? ( 307 ? (
284 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 308 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
285 ) 309 )
286 : ( 310 : (
287 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 311 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
288 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 312 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
313 ["move n",
314 sub {
315 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
316 }
317 ]
289 ) 318 )
290 ), 319 ),
291 ); 320 );
292 321
293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 322 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
298 327
299 my $tooltip_std = "<small>" 328 my $tooltip_std = "<small>"
300 . "Left click - examine item\n" 329 . "Left click - examine item\n"
301 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 330 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
302 . "Middle click - apply\n" 331 . "Middle click - apply\n"
332 . "Shift-Middle click - lock/unlock\n"
303 . "Right click - further options" 333 . "Right click - further options"
304 . "</small>\n"; 334 . "</small>\n";
305 335
306 $self->{face_widget} ||= new CFClient::UI::Face 336 $self->{face_widget} ||= new CFClient::UI::Face
307 can_events => 1, 337 can_events => 1,
308 can_hover => 1, 338 can_hover => 1,
339 anim => $self->{anim},
309 animspeed => $self->{animspeed}, # TODO# must be set at creation time 340 animspeed => $self->{animspeed}, # TODO# must be set at creation time
310 connect_button_down => $button_cb, 341 on_button_down => $button_cb,
311 ; 342 ;
312 $self->{face_widget}{face} = $self->{face}; 343 $self->{face_widget}{face} = $self->{face};
313 $self->{face_widget}{anim} = $self->{anim}; 344 $self->{face_widget}{anim} = $self->{anim};
314 $self->{face_widget}{animspeed} = $self->{animspeed}; 345 $self->{face_widget}{animspeed} = $self->{animspeed};
315 $self->{face_widget}->set_tooltip ( 346 $self->{face_widget}->set_tooltip (
… …
321 352
322 $self->{desc_widget} ||= new CFClient::UI::Label 353 $self->{desc_widget} ||= new CFClient::UI::Label
323 can_events => 1, 354 can_events => 1,
324 can_hover => 1, 355 can_hover => 1,
325 ellipsise => 2, 356 ellipsise => 2,
326 xalign => 0, 357 align => -1,
327 connect_button_down => $button_cb, 358 on_button_down => $button_cb,
328 ; 359 ;
329 my $desc = CFClient::Item::desc_string $self; 360 my $desc = CFClient::Item::desc_string $self;
330 $self->{desc_widget}->set_text ($desc); 361 $self->{desc_widget}->set_text ($desc);
331 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 362 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
332 363
333 $self->{weight_widget} ||= new CFClient::UI::Label 364 $self->{weight_widget} ||= new CFClient::UI::Label
334 can_events => 1, 365 can_events => 1,
335 can_hover => 1, 366 can_hover => 1,
336 ellipsise => 0, 367 ellipsise => 0,
337 xalign => 0.5, 368 align => 0,
338 connect_button_down => $button_cb, 369 on_button_down => $button_cb,
339 ; 370 ;
340 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 371 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
341 372
342 $self->{weight_widget}->set_tooltip ( 373 $self->{weight_widget}->set_tooltip (
343 "<b>Weight</b>.\n" 374 "<b>Weight</b>.\n"
… …
345 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 376 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
346 . "\n\n$tooltip_std" 377 . "\n\n$tooltip_std"
347 ); 378 );
348} 379}
349 380
350package CFClient::Texture; 381package CFClient::Binder;
351 382
352use strict; 383my @ALLOWED_MODIFIER_KEYS = (
384 CFClient::SDLK_LSHIFT,
385 CFClient::SDLK_LCTRL ,
386 CFClient::SDLK_LALT ,
387 CFClient::SDLK_LMETA ,
353 388
354use Scalar::Util; 389 CFClient::SDLK_RSHIFT,
390 CFClient::SDLK_RCTRL ,
391 CFClient::SDLK_RALT ,
392 CFClient::SDLK_RMETA ,
393);
355 394
356use CFClient::OpenGL; 395my %ALLOWED_MODIFIERS = (
396 CFClient::KMOD_LSHIFT => "LSHIFT",
397 CFClient::KMOD_LCTRL => "LCTRL",
398 CFClient::KMOD_LALT => "LALT",
399 CFClient::KMOD_LMETA => "LMETA",
357 400
358my %TEXTURES; 401 CFClient::KMOD_RSHIFT => "RSHIFT",
402 CFClient::KMOD_RCTRL => "RCTRL",
403 CFClient::KMOD_RALT => "RALT",
404 CFClient::KMOD_RMETA => "RMETA",
405);
359 406
360sub new { 407my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
361 my ($class, %data) = @_; 408my @DIRECT_BIND_KEYS = (
409 CFClient::SDLK_F1,
410 CFClient::SDLK_F2,
411 CFClient::SDLK_F3,
412 CFClient::SDLK_F4,
413 CFClient::SDLK_F5,
414 CFClient::SDLK_F6,
415 CFClient::SDLK_F7,
416 CFClient::SDLK_F8,
417 CFClient::SDLK_F9,
418 CFClient::SDLK_F10,
419 CFClient::SDLK_F11,
420 CFClient::SDLK_F12,
421 CFClient::SDLK_F13,
422 CFClient::SDLK_F14,
423 CFClient::SDLK_F15,
424);
362 425
363 my $self = bless { 426# this binding dialog asks for a key-combo to be pressed
364 internalformat => GL_RGBA, 427# and if successful it calls the $cb with $mod and $sym as args.
365 format => GL_RGBA, 428sub open_binding_dialog {
366 type => GL_UNSIGNED_BYTE, 429 my ($cb) = @_;
367 %data,
368 }, $class;
369 430
370 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 431 my $w = new CFClient::UI::FancyFrame
432 title => "Bind Action",
433 x => "center",
434 y => "center";
371 435
372 $self->upload; 436 $w->add (my $vb = new CFClient::UI::VBox);
373 437 $vb->add (new CFClient::UI::Label
374 $self 438 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
375} 439 ."You can only bind 0-9 and F1-F15 without modifiers."
376
377sub new_from_image {
378 my ($class, $image, %arg) = @_;
379
380 $class->new (image => $image, %arg)
381}
382
383sub new_from_file {
384 my ($class, $path, %arg) = @_;
385
386 open my $fh, "<:raw", $path
387 or die "$path: $!";
388
389 local $/;
390 $class->new_from_image (<$fh>, %arg)
391}
392
393#sub new_from_surface {
394# my ($class, $surface) = @_;
395#
396# $surface->rgba;
397#
398# $class->new (
399# data => $surface->pixels,
400# w => $surface->width,
401# h => $surface->height,
402# )
403#}
404
405sub new_from_layout {
406 my ($class, $layout, %arg) = @_;
407
408 my ($w, $h, $data, $format, $internalformat) = $layout->render;
409
410 $class->new (
411 w => $w,
412 h => $h,
413 data => $data,
414 format => $format,
415 internalformat => $format,
416 type => GL_UNSIGNED_BYTE,
417 %arg,
418 ) 440 );
419} 441 $vb->add (my $entry = new CFClient::UI::Entry
442 text => "",
443 on_key_down => sub {
444 my ($entry, $ev) = @_;
420 445
421sub new_from_opengl { 446 my $mod = $ev->{mod};
422 my ($class, $w, $h, $cb) = @_; 447 my $sym = $ev->{sym};
423 448
424 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 449 # XXX: This seems a little bit hackisch to me, but i have to ignore them
425} 450 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
451 return;
452 }
426 453
427sub topot { 454 if ($mod == CFClient::KMOD_NONE
428 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 455 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
429} 456 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
457 {
458 $::STATUSBOX->add (
459 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
460 ." directly without modifier! It would damage the completer handling."
461 );
462 return;
463 }
430 464
431sub upload { 465 $entry->focus_out;
432 my ($self) = @_;
433 466
434 return unless $GL_VERSION; 467 $cb->($mod, $sym);
435 468
436 my $data; 469 $w->destroy
437
438 if (exists $self->{data}) {
439 $data = $self->{data};
440
441 } elsif (exists $self->{render_cb}) {
442 glViewport 0, 0, $self->{w}, $self->{h};
443 glMatrixMode GL_PROJECTION;
444 glLoadIdentity;
445 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
446 glMatrixMode GL_MODELVIEW;
447 glLoadIdentity;
448 $self->{render_cb}->($self, $self->{w}, $self->{h});
449
450 } else {
451 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
452 = CFClient::load_image_inline $self->{image};
453 }
454
455 my ($tw, $th) = @$self{qw(w h)};
456
457 unless ($tw > 0 && $th > 0) {
458 $tw = $th = 1;
459 $data = "\x00" x 64;
460 }
461
462 $self->{minified} = [CFClient::average $tw, $th, $data]
463 if $self->{minify};
464
465 unless ($GL_NPOT) {
466 # TODO: does not work for zero-sized textures
467 $tw = topot $tw;
468 $th = topot $th;
469
470 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
471 my $bpp = (length $data) / ($self->{w} * $self->{h});
472 $data = pack "(a" . ($tw * $bpp) . ")*",
473 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
474 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
475 } 470 });
476 }
477 471
478 $self->{s} = $self->{w} / $tw; 472 $entry->focus_in;
479 $self->{t} = $self->{h} / $th; 473 $w->show;
480
481 $self->{name} ||= glGenTexture;
482
483 glBindTexture GL_TEXTURE_2D, $self->{name};
484
485 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
486 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
487
488 if ($::FAST) {
489 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
490 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
491 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
492 # alternatively check for 0x8191
493 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
494 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
495 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
496 } else {
497 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
498 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
499 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
500 }
501
502 glGetError;
503
504 if (defined $data) {
505 glTexImage2D GL_TEXTURE_2D, 0,
506 $self->{internalformat},
507 $tw, $th,
508 0,
509 $self->{format},
510 $self->{type},
511 $data;
512 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
513 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
514 } else {
515 glCopyTexImage2D GL_TEXTURE_2D, 0,
516 $self->{internalformat},
517 0, 0,
518 $tw, $th,
519 0;
520 CFClient::gl_check "copying to texture %dx%d if=%x",
521 $tw, $th, $self->{internalformat};
522 }
523
524 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
525} 474}
526 475
527sub DESTROY { 476sub keycombo_to_name {
528 my ($self) = @_; 477 my ($mod, $sym) = @_;
529 478
530 delete $TEXTURES{$self+0}; 479 my $mods = join '+',
480 map { $ALLOWED_MODIFIERS{$_} }
481 grep { ($_ + 0) & ($mod + 0) }
482 keys %ALLOWED_MODIFIERS;
483 $mods .= "+" if $mods ne '';
531 484
532 glDeleteTexture delete $self->{name} 485 return $mods . CFClient::SDL_GetKeyName ($sym);
533 if $self->{name};
534} 486}
535 487
536sub restore_state { 488package CFClient::Pickup;
537 $_->upload 489# some pickup constants
538 for values %TEXTURES; 490sub PU_NOTHING { 0x00000000 }
539} 491
492sub PU_DEBUG { 0x10000000 }
493sub PU_INHIBIT { 0x20000000 }
494sub PU_STOP { 0x40000000 }
495sub PU_NEWMODE { 0x80000000 }
496
497sub PU_RATIO { 0x0000000F }
498
499sub PU_FOOD { 0x00000010 }
500sub PU_DRINK { 0x00000020 }
501sub PU_VALUABLES { 0x00000040 }
502sub PU_BOW { 0x00000080 }
503
504sub PU_ARROW { 0x00000100 }
505sub PU_HELMET { 0x00000200 }
506sub PU_SHIELD { 0x00000400 }
507sub PU_ARMOUR { 0x00000800 }
508
509sub PU_BOOTS { 0x00001000 }
510sub PU_GLOVES { 0x00002000 }
511sub PU_CLOAK { 0x00004000 }
512sub PU_KEY { 0x00008000 }
513
514sub PU_MISSILEWEAPON { 0x00010000 }
515sub PU_ALLWEAPON { 0x00020000 }
516sub PU_MAGICAL { 0x00040000 }
517sub PU_POTION { 0x00080000 }
518
519sub PU_SPELLBOOK { 0x00100000 }
520sub PU_SKILLSCROLL { 0x00200000 }
521sub PU_READABLES { 0x00400000 }
522sub PU_MAGIC_DEVICE { 0x00800000 }
523
524sub PU_NOT_CURSED { 0x01000000 }
525
526sub PU_JEWELS { 0x02000000 }
527
540 528
5411; 5291;
542 530
543=back 531=back
544 532

Diff Legend

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