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.74 by elmex, Mon May 29 19:49:33 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) {
… …
171 . $_[1]->content->present ($_[0]) 137 . $_[1]->content->present ($_[0])
172} 138}
173 139
174sub view_verbatim { 140sub view_verbatim {
175 (join "", 141 (join "",
176 map +("\t" x ($indent / 2)) . "$_\n", 142 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1])) 143 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n" 144 . "\n"
179} 145}
180 146
181sub view_textblock { 147sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n" 148 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183} 149}
184 150
185sub view_head1 { 151sub view_head1 {
186 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 152 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0]) 153 . $_[1]->content->present ($_[0])
188}; 154};
189 155
190sub view_head2 { 156sub view_head2 {
191 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 157 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158 . $_[1]->content->present ($_[0])
159};
160
161sub view_head3 {
162 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0]) 163 . $_[1]->content->present ($_[0])
193}; 164};
194 165
195sub view_over { 166sub view_over {
196 local $indent = $indent + $_[1]->indent; 167 local $indent = $indent + $_[1]->indent;
… …
218 189
219 $db->db_put ($key => $data) 190 $db->db_put ($key => $data)
220} 191}
221 192
222package CFClient::Item; 193package CFClient::Item;
194
195use strict;
196use Crossfire::Protocol::Constants;
223 197
224sub desc_string { 198sub desc_string {
225 my ($self) = @_; 199 my ($self) = @_;
226 200
227 my $desc = 201 my $desc =
228 $self->{nrof} < 2 202 $self->{nrof} < 2
229 ? $self->{name} 203 ? $self->{name}
230 : "$self->{nrof} × $self->{name_pl}"; 204 : "$self->{nrof} × $self->{name_pl}";
231 205
232 $self->{flags} & Crossfire::Protocol::F_OPEN 206 $self->{flags} & F_OPEN
233 and $desc .= " (open)"; 207 and $desc .= " (open)";
234 $self->{flags} & Crossfire::Protocol::F_APPLIED 208 $self->{flags} & F_APPLIED
235 and $desc .= " (applied)"; 209 and $desc .= " (applied)";
236 $self->{flags} & Crossfire::Protocol::F_UNPAID 210 $self->{flags} & F_UNPAID
237 and $desc .= " (unpaid)"; 211 and $desc .= " (unpaid)";
238 $self->{flags} & Crossfire::Protocol::F_MAGIC 212 $self->{flags} & F_MAGIC
239 and $desc .= " (magic)"; 213 and $desc .= " (magic)";
240 $self->{flags} & Crossfire::Protocol::F_CURSED 214 $self->{flags} & F_CURSED
241 and $desc .= " (cursed)"; 215 and $desc .= " (cursed)";
242 $self->{flags} & Crossfire::Protocol::F_DAMNED 216 $self->{flags} & F_DAMNED
243 and $desc .= " (damned)"; 217 and $desc .= " (damned)";
244 $self->{flags} & Crossfire::Protocol::F_LOCKED 218 $self->{flags} & F_LOCKED
245 and $desc .= " *"; 219 and $desc .= " *";
246 220
247 $desc 221 $desc
248} 222}
249 223
… …
255 $weight < 0 ? "?" : $weight * 0.001 229 $weight < 0 ? "?" : $weight * 0.001
256} 230}
257 231
258sub update_widgets { 232sub update_widgets {
259 my ($self) = @_; 233 my ($self) = @_;
234
235 my $button_cb = sub {
236 my (undef, $ev, $x, $y) = @_;
237
238 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
239 my $targ = $::CONN->{player}{tag};
240
241 if ($self->{container} == $::CONN->{player}{tag}) {
242 $targ = $::CONN->{open_container};
243 }
244
245 $::CONN->send ("move $targ $self->{tag} 0");
246 } elsif ($ev->{button} == 1) {
247 $::CONN->send ("examine $self->{tag}");
248 } elsif ($ev->{button} == 2) {
249 $::CONN->send ("apply $self->{tag}");
250 } elsif ($ev->{button} == 3) {
251 my @menu_items = (
252 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
253 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
254 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
255 (
256 $self->{flags} & F_LOCKED
257 ? (
258 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
259 )
260 : (
261 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
262 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
263 )
264 ),
265 );
266
267 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
268 }
269
270 1
271 };
260 272
261 my $tooltip_std = "<small>" 273 my $tooltip_std = "<small>"
262 . "Left click - examine item\n" 274 . "Left click - examine item\n"
263 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 275 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
264 . "Middle click - apply\n" 276 . "Middle click - apply\n"
265 . "Right click - further options" 277 . "Right click - further options"
266 . "</small>\n"; 278 . "</small>\n";
267 279
268 $self->{face_widget} ||= new CFClient::UI::Face can_events => 1, can_hover => 1; 280 $self->{face_widget} ||= new CFClient::UI::Face
281 can_events => 1,
282 can_hover => 1,
283 anim => $self->{anim},
284 animspeed => $self->{animspeed}, # TODO# must be set at creation time
285 on_button_down => $button_cb,
286 ;
269 $self->{face_widget}{face} = $self->{face}; 287 $self->{face_widget}{face} = $self->{face};
270 $self->{face_widget}{anim} = $self->{anim}; 288 $self->{face_widget}{anim} = $self->{anim};
271 $self->{face_widget}{animspeed} = $self->{animespeed}; 289 $self->{face_widget}{animspeed} = $self->{animspeed};
272 $self->{face_widget}->set_tooltip ( 290 $self->{face_widget}->set_tooltip (
273 "<b>Face/Animation.</b>\n" 291 "<b>Face/Animation.</b>\n"
274 . "Item uses face #$self->{face}. " 292 . "Item uses face #$self->{face}. "
275 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 293 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
276 . "\n\n$tooltip_std" 294 . "\n\n$tooltip_std"
277 ); 295 );
278 296
279 $self->{desc_widget} ||= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1; 297 $self->{desc_widget} ||= new CFClient::UI::Label
280 $self->{desc_widget}->set_text (CFClient::Item::desc_string $self); 298 can_events => 1,
299 can_hover => 1,
300 ellipsise => 2,
301 align => -1,
302 on_button_down => $button_cb,
303 ;
304 my $desc = CFClient::Item::desc_string $self;
305 $self->{desc_widget}->set_text ($desc);
306 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
281 307
282 $self->{weight_widget} ||= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5; 308 $self->{weight_widget} ||= new CFClient::UI::Label
309 can_events => 1,
310 can_hover => 1,
311 ellipsise => 0,
312 align => 0,
313 on_button_down => $button_cb,
314 ;
283 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 315 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
284 316
285 $self->{weight_widget}->set_tooltip ( 317 $self->{weight_widget}->set_tooltip (
286 "<b>Weight</b>.\n" 318 "<b>Weight</b>.\n"
287 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 319 . ($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. ") 320 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
289 . "\n\n$tooltip_std" 321 . "\n\n$tooltip_std"
290 ); 322 );
291} 323}
292 324
293package CFClient::Texture; 325package CFClient::Recorder;
294 326
295use strict; 327our $RECORD_WINDOW;
296 328
297use Scalar::Util; 329my $CMDBOX;
330my $CURRENT_CMDS;
331my $REC_BTN;
298 332
299use CFClient::OpenGL; 333my @ALLOWED_MODIFIER_KEYS = (
334 (CFClient::SDLK_LSHIFT) => "LSHIFT",
335 (CFClient::SDLK_LCTRL ) => "LCTRL",
336 (CFClient::SDLK_LALT ) => "LALT",
337 (CFClient::SDLK_LMETA ) => "LMETA",
300 338
301my %TEXTURES; 339 (CFClient::SDLK_RSHIFT) => "RSHIFT",
340 (CFClient::SDLK_RCTRL ) => "RCTRL",
341 (CFClient::SDLK_RALT ) => "RALT",
342 (CFClient::SDLK_RMETA ) => "RMETA",
343);
302 344
303sub new { 345my %ALLOWED_MODIFIERS = (
346 (CFClient::KMOD_LSHIFT) => "LSHIFT",
347 (CFClient::KMOD_LCTRL ) => "LCTRL",
348 (CFClient::KMOD_LALT ) => "LALT",
349 (CFClient::KMOD_LMETA ) => "LMETA",
350
351 (CFClient::KMOD_RSHIFT) => "RSHIFT",
352 (CFClient::KMOD_RCTRL ) => "RCTRL",
353 (CFClient::KMOD_RALT ) => "RALT",
354 (CFClient::KMOD_RMETA ) => "RMETA",
355);
356
357my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
358my @DIRECT_BIND_KEYS = (
359 CFClient::SDLK_F1,
360 CFClient::SDLK_F2,
361 CFClient::SDLK_F3,
362 CFClient::SDLK_F4,
363 CFClient::SDLK_F5,
364 CFClient::SDLK_F6,
365 CFClient::SDLK_F7,
366 CFClient::SDLK_F8,
367 CFClient::SDLK_F9,
368 CFClient::SDLK_F10,
369 CFClient::SDLK_F11,
370 CFClient::SDLK_F12,
371 CFClient::SDLK_F13,
372 CFClient::SDLK_F14,
373 CFClient::SDLK_F15,
374);
375
376# this binding dialog asks for a key-combo to be pressed
377# and if successful it binds the modifier+symbol to the
378# supplied actions in $cmd.
379# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
380sub open_binding_dialog {
304 my ($class, %data) = @_; 381 my ($cmd) = @_;
305 382
306 my $self = bless { 383 my $w = new CFClient::UI::FancyFrame
307 internalformat => GL_RGBA, 384 title => "Bind Action";
308 format => GL_RGBA,
309 type => GL_UNSIGNED_BYTE,
310 %data,
311 }, $class;
312 385
313 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 386 $w->add (my $vb = new CFClient::UI::VBox);
314 387 $vb->add (new CFClient::UI::Label
315 $self->upload; 388 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
316 389 ."You can only bind 0-9 and F1-F15 without modifiers."
317 $self
318}
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 ) 390 );
362} 391 $vb->add (my $entry = new CFClient::UI::Entry
392 text => "",
393 on_key_down => sub {
394 my ($entry, $ev) = @_;
363 395
364sub new_from_opengl { 396 my $mod = $ev->{mod};
365 my ($class, $w, $h, $cb) = @_; 397 my $sym = $ev->{sym};
366 398
367 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 399 # XXX: This seems a little bit hackisch to me, but i have to ignore them
368} 400 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
401 return;
402 }
369 403
370sub topot { 404 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] 405 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
372} 406 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
407 {
408 $::STATUSBOX->add (
409 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
410 ." directly without modifier! It would damage the completer handling."
411 );
412 return;
413 }
373 414
374sub upload { 415 $entry->focus_out;
416
417 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
418 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
419
420 $w->destroy
421 });
422
423 $entry->focus_in;
424 $w->center;
425 $w->show;
426}
427
428sub keycombo_to_name {
429 my ($mod, $sym) = @_;
430
431 my $mods = join '+',
432 map { $ALLOWED_MODIFIERS{$_} }
433 grep { $_ & $mod }
434 keys %ALLOWED_MODIFIERS;
435 $mods .= "+" if $mods ne '';
436
437 return $mods . CFClient::SDL_GetKeyName ($sym);
438}
439
440sub clear_command_list {
441 $CMDBOX->clear () if $CMDBOX;
442}
443
444sub set_command_list {
375 my ($self) = @_; 445 my ($list) = @_;
376 446
377 return unless $GL_VERSION; 447 return unless $CMDBOX;
378 448
379 my $data; 449 $CMDBOX->clear ();
450 $CURRENT_CMDS = $list;
380 451
381 if (exists $self->{data}) { 452 my $idx = 0;
382 $data = $self->{data};
383 453
384 } elsif (exists $self->{render_cb}) { 454 for (@$list) {
385 glViewport 0, 0, $self->{w}, $self->{h}; 455 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
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 456
393 } else { 457 my $i = $idx;
394 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 458 $hb->add (new CFClient::UI::Button
395 = CFClient::load_image_inline $self->{image}; 459 text => "delete",
460 tooltip => "Deletes the action from the record",
461 on_activate => sub {
462 $CMDBOX->remove ($hb);
463 $list->[$i] = undef;
464 });
465
466 $hb->add (new CFClient::UI::Label text => $_);
467
468 $idx++
396 } 469 }
470}
397 471
398 my ($tw, $th) = @$self{qw(w h)}; 472# if $show is 1 the recorder will be shown
473sub start {
474 my ($show) = @_;
399 475
400 unless ($tw > 0 && $th > 0) { 476 $RECORD_WINDOW->show if $show;
401 $tw = $th = 1; 477
402 $data = "\x00" x 64; 478 $REC_BTN->set_text ("stop recording");
479 $REC_BTN->{recording} = 1;
480 clear_command_list;
481 $::CONN->start_record;
482}
483
484# if $autobind is 1 the recorder will be automatically
485# jump into the binding query and hide the recorder window
486sub stop {
487 my ($autobind) = @_;
488
489 $REC_BTN->set_text ("start recording");
490 $REC_BTN->{recording} = 0;
491
492 my $rec = $::CONN->stop_record;
493 return unless ref $rec eq 'ARRAY';
494 set_command_list ($rec);
495
496 if ($autobind) {
497 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
498 $RECORD_WINDOW->hide;
403 } 499 }
500}
404 501
405 $self->{minified} = [CFClient::average $tw, $th, $data] 502sub make_window {
406 if $self->{minify}; 503 $RECORD_WINDOW = new CFClient::UI::FancyFrame
504 req_y => 1,
505 req_x => -1,
506 title => "Action Recorder";
407 507
408 unless ($GL_NPOT) { 508 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
409 # TODO: does not work for zero-sized textures 509 $vb->add ($REC_BTN = new CFClient::UI::Button
410 $tw = topot $tw; 510 text => "start recording",
411 $th = topot $th; 511 tooltip => "Start/Stops recording of actions."
512 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
513 ."All subsequent actions after the recording started will be captured."
514 ."The actions are displayed after the record was stopped."
515 ."To bind the action you have to click on the 'Bind' button",
516 on_activate => sub {
517 my ($btn) = @_;
412 518
413 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 519 unless ($btn->{recording}) {
414 my $bpp = (length $data) / ($self->{w} * $self->{h}); 520 start;
415 $data = pack "(a" . ($tw * $bpp) . ")*", 521 } else {
416 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 522 stop;
417 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 523 }
418 } 524 });
419 } 525 $vb->add ($CMDBOX = new CFClient::UI::VBox);
526 $vb->add (new CFClient::UI::Button
527 text => "bind",
528 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
529 on_activate => sub {
530 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
531 });
420 532
421 $self->{s} = $self->{w} / $tw; 533 $RECORD_WINDOW
422 $self->{t} = $self->{h} / $th;
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}
469
470sub DESTROY {
471 my ($self) = @_;
472
473 delete $TEXTURES{$self+0};
474
475 glDeleteTexture delete $self->{name}
476 if $self->{name};
477}
478
479sub restore_state {
480 $_->upload
481 for values %TEXTURES;
482} 534}
483 535
4841; 5361;
485 537
486=back 538=back

Diff Legend

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