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.68 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC

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

Diff Legend

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