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

Diff Legend

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