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

Diff Legend

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