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.61 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC

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

Diff Legend

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