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.66 by root, Thu May 25 21:18:47 2006 UTC vs.
Revision 1.78 by root, Mon May 29 22:02:06 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;
223 208
224sub desc_string { 209sub desc_string {
225 my ($self) = @_; 210 my ($self) = @_;
226 211
227 my $desc = 212 my $desc =
228 $self->{nrof} < 2 213 $self->{nrof} < 2
229 ? $self->{name} 214 ? $self->{name}
230 : "$self->{nrof} × $self->{name_pl}"; 215 : "$self->{nrof} × $self->{name_pl}";
231 216
232 $self->{flags} & Crossfire::Protocol::F_OPEN 217 $self->{flags} & F_OPEN
233 and $desc .= " (open)"; 218 and $desc .= " (open)";
234 $self->{flags} & Crossfire::Protocol::F_APPLIED 219 $self->{flags} & F_APPLIED
235 and $desc .= " (applied)"; 220 and $desc .= " (applied)";
236 $self->{flags} & Crossfire::Protocol::F_UNPAID 221 $self->{flags} & F_UNPAID
237 and $desc .= " (unpaid)"; 222 and $desc .= " (unpaid)";
238 $self->{flags} & Crossfire::Protocol::F_MAGIC 223 $self->{flags} & F_MAGIC
239 and $desc .= " (magic)"; 224 and $desc .= " (magic)";
240 $self->{flags} & Crossfire::Protocol::F_CURSED 225 $self->{flags} & F_CURSED
241 and $desc .= " (cursed)"; 226 and $desc .= " (cursed)";
242 $self->{flags} & Crossfire::Protocol::F_DAMNED 227 $self->{flags} & F_DAMNED
243 and $desc .= " (damned)"; 228 and $desc .= " (damned)";
244 $self->{flags} & Crossfire::Protocol::F_LOCKED 229 $self->{flags} & F_LOCKED
245 and $desc .= " *"; 230 and $desc .= " *";
246 231
247 $desc 232 $desc
248} 233}
249 234
… …
277 my @menu_items = ( 262 my @menu_items = (
278 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 263 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
279 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 264 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
280 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 265 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
281 ( 266 (
282 $self->{flags} & Crossfire::Protocol::F_LOCKED 267 $self->{flags} & F_LOCKED
283 ? ( 268 ? (
284 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 269 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
285 ) 270 )
286 : ( 271 : (
287 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 272 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
… …
304 . "</small>\n"; 289 . "</small>\n";
305 290
306 $self->{face_widget} ||= new CFClient::UI::Face 291 $self->{face_widget} ||= new CFClient::UI::Face
307 can_events => 1, 292 can_events => 1,
308 can_hover => 1, 293 can_hover => 1,
294 anim => $self->{anim},
309 animspeed => $self->{animspeed}, # TODO# must be set at creation time 295 animspeed => $self->{animspeed}, # TODO# must be set at creation time
310 connect_button_down => $button_cb, 296 on_button_down => $button_cb,
311 ; 297 ;
312 $self->{face_widget}{face} = $self->{face}; 298 $self->{face_widget}{face} = $self->{face};
313 $self->{face_widget}{anim} = $self->{anim}; 299 $self->{face_widget}{anim} = $self->{anim};
314 $self->{face_widget}{animspeed} = $self->{animspeed}; 300 $self->{face_widget}{animspeed} = $self->{animspeed};
315 $self->{face_widget}->set_tooltip ( 301 $self->{face_widget}->set_tooltip (
… …
321 307
322 $self->{desc_widget} ||= new CFClient::UI::Label 308 $self->{desc_widget} ||= new CFClient::UI::Label
323 can_events => 1, 309 can_events => 1,
324 can_hover => 1, 310 can_hover => 1,
325 ellipsise => 2, 311 ellipsise => 2,
326 xalign => 0, 312 align => -1,
327 connect_button_down => $button_cb, 313 on_button_down => $button_cb,
328 ; 314 ;
329 my $desc = CFClient::Item::desc_string $self; 315 my $desc = CFClient::Item::desc_string $self;
330 $self->{desc_widget}->set_text ($desc); 316 $self->{desc_widget}->set_text ($desc);
331 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 317 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
332 318
333 $self->{weight_widget} ||= new CFClient::UI::Label 319 $self->{weight_widget} ||= new CFClient::UI::Label
334 can_events => 1, 320 can_events => 1,
335 can_hover => 1, 321 can_hover => 1,
336 ellipsise => 0, 322 ellipsise => 0,
337 xalign => 0.5, 323 align => 0,
338 connect_button_down => $button_cb, 324 on_button_down => $button_cb,
339 ; 325 ;
340 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 326 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
341 327
342 $self->{weight_widget}->set_tooltip ( 328 $self->{weight_widget}->set_tooltip (
343 "<b>Weight</b>.\n" 329 "<b>Weight</b>.\n"
… …
345 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 331 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
346 . "\n\n$tooltip_std" 332 . "\n\n$tooltip_std"
347 ); 333 );
348} 334}
349 335
350package CFClient::Texture; 336package CFClient::Recorder;
351 337
352use strict; 338our $RECORD_WINDOW;
353 339
354use Scalar::Util; 340my $CMDBOX;
341my $CURRENT_CMDS;
342my $REC_BTN;
355 343
356use CFClient::OpenGL; 344my @ALLOWED_MODIFIER_KEYS = (
345 (CFClient::SDLK_LSHIFT) => "LSHIFT",
346 (CFClient::SDLK_LCTRL ) => "LCTRL",
347 (CFClient::SDLK_LALT ) => "LALT",
348 (CFClient::SDLK_LMETA ) => "LMETA",
357 349
358my %TEXTURES; 350 (CFClient::SDLK_RSHIFT) => "RSHIFT",
351 (CFClient::SDLK_RCTRL ) => "RCTRL",
352 (CFClient::SDLK_RALT ) => "RALT",
353 (CFClient::SDLK_RMETA ) => "RMETA",
354);
359 355
360sub new { 356my %ALLOWED_MODIFIERS = (
357 (CFClient::KMOD_LSHIFT) => "LSHIFT",
358 (CFClient::KMOD_LCTRL ) => "LCTRL",
359 (CFClient::KMOD_LALT ) => "LALT",
360 (CFClient::KMOD_LMETA ) => "LMETA",
361
362 (CFClient::KMOD_RSHIFT) => "RSHIFT",
363 (CFClient::KMOD_RCTRL ) => "RCTRL",
364 (CFClient::KMOD_RALT ) => "RALT",
365 (CFClient::KMOD_RMETA ) => "RMETA",
366);
367
368my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
369my @DIRECT_BIND_KEYS = (
370 CFClient::SDLK_F1,
371 CFClient::SDLK_F2,
372 CFClient::SDLK_F3,
373 CFClient::SDLK_F4,
374 CFClient::SDLK_F5,
375 CFClient::SDLK_F6,
376 CFClient::SDLK_F7,
377 CFClient::SDLK_F8,
378 CFClient::SDLK_F9,
379 CFClient::SDLK_F10,
380 CFClient::SDLK_F11,
381 CFClient::SDLK_F12,
382 CFClient::SDLK_F13,
383 CFClient::SDLK_F14,
384 CFClient::SDLK_F15,
385);
386
387# this binding dialog asks for a key-combo to be pressed
388# and if successful it binds the modifier+symbol to the
389# supplied actions in $cmd.
390# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
391sub open_binding_dialog {
361 my ($class, %data) = @_; 392 my ($cmd) = @_;
362 393
363 my $self = bless { 394 my $w = new CFClient::UI::FancyFrame
364 internalformat => GL_RGBA, 395 title => "Bind Action";
365 format => GL_RGBA,
366 type => GL_UNSIGNED_BYTE,
367 %data,
368 }, $class;
369 396
370 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 397 $w->add (my $vb = new CFClient::UI::VBox);
371 398 $vb->add (new CFClient::UI::Label
372 $self->upload; 399 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
373 400 ."You can only bind 0-9 and F1-F15 without modifiers."
374 $self
375}
376
377sub new_from_image {
378 my ($class, $image, %arg) = @_;
379
380 $class->new (image => $image, %arg)
381}
382
383sub new_from_file {
384 my ($class, $path, %arg) = @_;
385
386 open my $fh, "<:raw", $path
387 or die "$path: $!";
388
389 local $/;
390 $class->new_from_image (<$fh>, %arg)
391}
392
393#sub new_from_surface {
394# my ($class, $surface) = @_;
395#
396# $surface->rgba;
397#
398# $class->new (
399# data => $surface->pixels,
400# w => $surface->width,
401# h => $surface->height,
402# )
403#}
404
405sub new_from_layout {
406 my ($class, $layout, %arg) = @_;
407
408 my ($w, $h, $data, $format, $internalformat) = $layout->render;
409
410 $class->new (
411 w => $w,
412 h => $h,
413 data => $data,
414 format => $format,
415 internalformat => $format,
416 type => GL_UNSIGNED_BYTE,
417 %arg,
418 ) 401 );
419} 402 $vb->add (my $entry = new CFClient::UI::Entry
403 text => "",
404 on_key_down => sub {
405 my ($entry, $ev) = @_;
420 406
421sub new_from_opengl { 407 my $mod = $ev->{mod};
422 my ($class, $w, $h, $cb) = @_; 408 my $sym = $ev->{sym};
423 409
424 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 410 # XXX: This seems a little bit hackisch to me, but i have to ignore them
425} 411 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
412 return;
413 }
426 414
427sub topot { 415 if ($mod == CFClient::KMOD_NONE
428 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 416 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
429} 417 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
418 {
419 $::STATUSBOX->add (
420 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
421 ." directly without modifier! It would damage the completer handling."
422 );
423 return;
424 }
430 425
431sub upload { 426 $entry->focus_out;
427
428 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
429 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
430
431 $w->destroy
432 });
433
434 $entry->focus_in;
435 $w->center;
436 $w->show;
437}
438
439sub keycombo_to_name {
440 my ($mod, $sym) = @_;
441
442 my $mods = join '+',
443 map { $ALLOWED_MODIFIERS{$_} }
444 grep { $_ & $mod }
445 keys %ALLOWED_MODIFIERS;
446 $mods .= "+" if $mods ne '';
447
448 return $mods . CFClient::SDL_GetKeyName ($sym);
449}
450
451sub clear_command_list {
452 $CMDBOX->clear () if $CMDBOX;
453}
454
455sub set_command_list {
432 my ($self) = @_; 456 my ($list) = @_;
433 457
434 return unless $GL_VERSION; 458 return unless $CMDBOX;
435 459
436 my $data; 460 $CMDBOX->clear ();
461 $CURRENT_CMDS = $list;
437 462
438 if (exists $self->{data}) { 463 my $idx = 0;
439 $data = $self->{data};
440 464
441 } elsif (exists $self->{render_cb}) { 465 for (@$list) {
442 glViewport 0, 0, $self->{w}, $self->{h}; 466 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
443 glMatrixMode GL_PROJECTION;
444 glLoadIdentity;
445 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
446 glMatrixMode GL_MODELVIEW;
447 glLoadIdentity;
448 $self->{render_cb}->($self, $self->{w}, $self->{h});
449 467
450 } else { 468 my $i = $idx;
451 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 469 $hb->add (new CFClient::UI::Button
452 = CFClient::load_image_inline $self->{image}; 470 text => "delete",
471 tooltip => "Deletes the action from the record",
472 on_activate => sub {
473 $CMDBOX->remove ($hb);
474 $list->[$i] = undef;
475 });
476
477 $hb->add (new CFClient::UI::Label text => $_);
478
479 $idx++
453 } 480 }
481}
454 482
455 my ($tw, $th) = @$self{qw(w h)}; 483# if $show is 1 the recorder will be shown
484sub start {
485 my ($show) = @_;
456 486
457 unless ($tw > 0 && $th > 0) { 487 $RECORD_WINDOW->show if $show;
458 $tw = $th = 1; 488
459 $data = "\x00" x 64; 489 $REC_BTN->set_text ("stop recording");
490 $REC_BTN->{recording} = 1;
491 clear_command_list;
492 $::CONN->start_record;
493}
494
495# if $autobind is 1 the recorder will be automatically
496# jump into the binding query and hide the recorder window
497sub stop {
498 my ($autobind) = @_;
499
500 $REC_BTN->set_text ("start recording");
501 $REC_BTN->{recording} = 0;
502
503 my $rec = $::CONN->stop_record;
504 return unless ref $rec eq 'ARRAY';
505 set_command_list ($rec);
506
507 if ($autobind) {
508 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
509 $RECORD_WINDOW->hide;
460 } 510 }
511}
461 512
462 $self->{minified} = [CFClient::average $tw, $th, $data] 513sub make_window {
463 if $self->{minify}; 514 $RECORD_WINDOW = new CFClient::UI::FancyFrame
515 req_y => 1,
516 req_x => -1,
517 title => "Action Recorder";
464 518
465 unless ($GL_NPOT) { 519 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
466 # TODO: does not work for zero-sized textures 520 $vb->add ($REC_BTN = new CFClient::UI::Button
467 $tw = topot $tw; 521 text => "start recording",
468 $th = topot $th; 522 tooltip => "Start/Stops recording of actions."
523 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
524 ."All subsequent actions after the recording started will be captured."
525 ."The actions are displayed after the record was stopped."
526 ."To bind the action you have to click on the 'Bind' button",
527 on_activate => sub {
528 my ($btn) = @_;
469 529
470 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 530 unless ($btn->{recording}) {
471 my $bpp = (length $data) / ($self->{w} * $self->{h}); 531 start;
472 $data = pack "(a" . ($tw * $bpp) . ")*", 532 } else {
473 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 533 stop;
474 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 534 }
475 } 535 });
476 } 536 $vb->add ($CMDBOX = new CFClient::UI::VBox);
537 $vb->add (new CFClient::UI::Button
538 text => "bind",
539 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
540 on_activate => sub {
541 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
542 });
477 543
478 $self->{s} = $self->{w} / $tw; 544 $RECORD_WINDOW
479 $self->{t} = $self->{h} / $th;
480
481 $self->{name} ||= glGenTexture;
482
483 glBindTexture GL_TEXTURE_2D, $self->{name};
484
485 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
486 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
487
488 if ($::FAST) {
489 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
490 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
491 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
492 # alternatively check for 0x8191
493 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
494 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
495 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
496 } else {
497 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
498 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
499 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
500 }
501
502 glGetError;
503
504 if (defined $data) {
505 glTexImage2D GL_TEXTURE_2D, 0,
506 $self->{internalformat},
507 $tw, $th,
508 0,
509 $self->{format},
510 $self->{type},
511 $data;
512 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
513 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
514 } else {
515 glCopyTexImage2D GL_TEXTURE_2D, 0,
516 $self->{internalformat},
517 0, 0,
518 $tw, $th,
519 0;
520 CFClient::gl_check "copying to texture %dx%d if=%x",
521 $tw, $th, $self->{internalformat};
522 }
523
524 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
525}
526
527sub DESTROY {
528 my ($self) = @_;
529
530 delete $TEXTURES{$self+0};
531
532 glDeleteTexture delete $self->{name}
533 if $self->{name};
534}
535
536sub restore_state {
537 $_->upload
538 for values %TEXTURES;
539} 545}
540 546
5411; 5471;
542 548
543=back 549=back

Diff Legend

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