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.64 by elmex, Thu May 25 18:48:45 2006 UTC vs.
Revision 1.76 by root, Mon May 29 21:20:15 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
75{
76 use strict;
77
109our $DB_ENV = new BerkeleyDB::Env 78 our $DB_ENV = new BerkeleyDB::Env
110 -Home => "$Crossfire::VARDIR/pclient", 79 -Home => "$Crossfire::VARDIR/cfplus",
111 -Cachesize => 1_000_000, 80 -Cachesize => 1_000_000,
112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 81 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113# -ErrPrefix => "DATABASE", 82# -ErrPrefix => "DATABASE",
114 -Verbose => 1, 83 -Verbose => 1,
115 -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,
116 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}
117 88
118sub db_table($) { 89sub db_table($) {
119 my ($table) = @_; 90 my ($table) = @_;
120 91
121 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 92 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122 93
123 new CFClient::Database 94 new CFClient::Database
124 -Env => $DB_ENV, 95 -Env => $DB_ENV,
125 -Filename => $table, 96 -Filename => $table,
126# -Filename => "database", 97# -Filename => "database",
127# -Subname => $table, 98# -Subname => $table,
128 -Property => DB_CHKSUM, 99 -Property => DB_CHKSUM,
129 -Flags => DB_CREATE | DB_UPGRADE, 100 -Flags => DB_CREATE | DB_UPGRADE,
130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 101 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131} 102}
132 103
133sub pod_to_pango($) { 104sub pod_to_pango($) {
134 my ($pom) = @_; 105 my ($pom) = @_;
135 106
… …
171 . $_[1]->content->present ($_[0]) 142 . $_[1]->content->present ($_[0])
172} 143}
173 144
174sub view_verbatim { 145sub view_verbatim {
175 (join "", 146 (join "",
176 map +("\t" x ($indent / 2)) . "$_\n", 147 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1])) 148 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n" 149 . "\n"
179} 150}
180 151
181sub view_textblock { 152sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n" 153 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183} 154}
184 155
185sub view_head1 { 156sub view_head1 {
186 "<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"
187 . $_[1]->content->present ($_[0]) 158 . $_[1]->content->present ($_[0])
188}; 159};
189 160
190sub view_head2 { 161sub view_head2 {
191 "<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"
192 . $_[1]->content->present ($_[0]) 168 . $_[1]->content->present ($_[0])
193}; 169};
194 170
195sub view_over { 171sub view_over {
196 local $indent = $indent + $_[1]->indent; 172 local $indent = $indent + $_[1]->indent;
… …
218 194
219 $db->db_put ($key => $data) 195 $db->db_put ($key => $data)
220} 196}
221 197
222package CFClient::Item; 198package CFClient::Item;
199
200use strict;
201use Crossfire::Protocol::Constants;
223 202
224sub desc_string { 203sub desc_string {
225 my ($self) = @_; 204 my ($self) = @_;
226 205
227 my $desc = 206 my $desc =
228 $self->{nrof} < 2 207 $self->{nrof} < 2
229 ? $self->{name} 208 ? $self->{name}
230 : "$self->{nrof} × $self->{name_pl}"; 209 : "$self->{nrof} × $self->{name_pl}";
231 210
232 $self->{flags} & Crossfire::Protocol::F_OPEN 211 $self->{flags} & F_OPEN
233 and $desc .= " (open)"; 212 and $desc .= " (open)";
234 $self->{flags} & Crossfire::Protocol::F_APPLIED 213 $self->{flags} & F_APPLIED
235 and $desc .= " (applied)"; 214 and $desc .= " (applied)";
236 $self->{flags} & Crossfire::Protocol::F_UNPAID 215 $self->{flags} & F_UNPAID
237 and $desc .= " (unpaid)"; 216 and $desc .= " (unpaid)";
238 $self->{flags} & Crossfire::Protocol::F_MAGIC 217 $self->{flags} & F_MAGIC
239 and $desc .= " (magic)"; 218 and $desc .= " (magic)";
240 $self->{flags} & Crossfire::Protocol::F_CURSED 219 $self->{flags} & F_CURSED
241 and $desc .= " (cursed)"; 220 and $desc .= " (cursed)";
242 $self->{flags} & Crossfire::Protocol::F_DAMNED 221 $self->{flags} & F_DAMNED
243 and $desc .= " (damned)"; 222 and $desc .= " (damned)";
244 $self->{flags} & Crossfire::Protocol::F_LOCKED 223 $self->{flags} & F_LOCKED
245 and $desc .= " *"; 224 and $desc .= " *";
246 225
247 $desc 226 $desc
248} 227}
249 228
… …
277 my @menu_items = ( 256 my @menu_items = (
278 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 257 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
279 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 258 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
280 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 259 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
281 ( 260 (
282 $self->{flags} & Crossfire::Protocol::F_LOCKED 261 $self->{flags} & F_LOCKED
283 ? ( 262 ? (
284 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 263 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
285 ) 264 )
286 : ( 265 : (
287 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 266 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
… …
304 . "</small>\n"; 283 . "</small>\n";
305 284
306 $self->{face_widget} ||= new CFClient::UI::Face 285 $self->{face_widget} ||= new CFClient::UI::Face
307 can_events => 1, 286 can_events => 1,
308 can_hover => 1, 287 can_hover => 1,
288 anim => $self->{anim},
289 animspeed => $self->{animspeed}, # TODO# must be set at creation time
309 connect_button_down => $button_cb, 290 on_button_down => $button_cb,
310 ; 291 ;
311 $self->{face_widget}{face} = $self->{face}; 292 $self->{face_widget}{face} = $self->{face};
312 $self->{face_widget}{anim} = $self->{anim}; 293 $self->{face_widget}{anim} = $self->{anim};
313 $self->{face_widget}{animspeed} = $self->{animespeed}; 294 $self->{face_widget}{animspeed} = $self->{animspeed};
314 $self->{face_widget}->set_tooltip ( 295 $self->{face_widget}->set_tooltip (
315 "<b>Face/Animation.</b>\n" 296 "<b>Face/Animation.</b>\n"
316 . "Item uses face #$self->{face}. " 297 . "Item uses face #$self->{face}. "
317 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 298 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
318 . "\n\n$tooltip_std" 299 . "\n\n$tooltip_std"
… …
320 301
321 $self->{desc_widget} ||= new CFClient::UI::Label 302 $self->{desc_widget} ||= new CFClient::UI::Label
322 can_events => 1, 303 can_events => 1,
323 can_hover => 1, 304 can_hover => 1,
324 ellipsise => 2, 305 ellipsise => 2,
325 xalign => 0, 306 align => -1,
326 connect_button_down => $button_cb, 307 on_button_down => $button_cb,
327 ; 308 ;
328 my $desc = CFClient::Item::desc_string $self; 309 my $desc = CFClient::Item::desc_string $self;
329 $self->{desc_widget}->set_text ($desc); 310 $self->{desc_widget}->set_text ($desc);
330 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 311 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
331 312
332 $self->{weight_widget} ||= new CFClient::UI::Label 313 $self->{weight_widget} ||= new CFClient::UI::Label
333 can_events => 1, 314 can_events => 1,
334 can_hover => 1, 315 can_hover => 1,
335 ellipsise => 0, 316 ellipsise => 0,
336 xalign => 0.5, 317 align => 0,
337 connect_button_down => $button_cb, 318 on_button_down => $button_cb,
338 ; 319 ;
339 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 320 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
340 321
341 $self->{weight_widget}->set_tooltip ( 322 $self->{weight_widget}->set_tooltip (
342 "<b>Weight</b>.\n" 323 "<b>Weight</b>.\n"
… …
344 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 325 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
345 . "\n\n$tooltip_std" 326 . "\n\n$tooltip_std"
346 ); 327 );
347} 328}
348 329
349package CFClient::Texture; 330package CFClient::Recorder;
350 331
351use strict; 332our $RECORD_WINDOW;
352 333
353use Scalar::Util; 334my $CMDBOX;
335my $CURRENT_CMDS;
336my $REC_BTN;
354 337
355use CFClient::OpenGL; 338my @ALLOWED_MODIFIER_KEYS = (
339 (CFClient::SDLK_LSHIFT) => "LSHIFT",
340 (CFClient::SDLK_LCTRL ) => "LCTRL",
341 (CFClient::SDLK_LALT ) => "LALT",
342 (CFClient::SDLK_LMETA ) => "LMETA",
356 343
357my %TEXTURES; 344 (CFClient::SDLK_RSHIFT) => "RSHIFT",
345 (CFClient::SDLK_RCTRL ) => "RCTRL",
346 (CFClient::SDLK_RALT ) => "RALT",
347 (CFClient::SDLK_RMETA ) => "RMETA",
348);
358 349
359sub new { 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 {
360 my ($class, %data) = @_; 386 my ($cmd) = @_;
361 387
362 my $self = bless { 388 my $w = new CFClient::UI::FancyFrame
363 internalformat => GL_RGBA, 389 title => "Bind Action";
364 format => GL_RGBA,
365 type => GL_UNSIGNED_BYTE,
366 %data,
367 }, $class;
368 390
369 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 391 $w->add (my $vb = new CFClient::UI::VBox);
370 392 $vb->add (new CFClient::UI::Label
371 $self->upload; 393 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
372 394 ."You can only bind 0-9 and F1-F15 without modifiers."
373 $self
374}
375
376sub new_from_image {
377 my ($class, $image, %arg) = @_;
378
379 $class->new (image => $image, %arg)
380}
381
382sub new_from_file {
383 my ($class, $path, %arg) = @_;
384
385 open my $fh, "<:raw", $path
386 or die "$path: $!";
387
388 local $/;
389 $class->new_from_image (<$fh>, %arg)
390}
391
392#sub new_from_surface {
393# my ($class, $surface) = @_;
394#
395# $surface->rgba;
396#
397# $class->new (
398# data => $surface->pixels,
399# w => $surface->width,
400# h => $surface->height,
401# )
402#}
403
404sub new_from_layout {
405 my ($class, $layout, %arg) = @_;
406
407 my ($w, $h, $data, $format, $internalformat) = $layout->render;
408
409 $class->new (
410 w => $w,
411 h => $h,
412 data => $data,
413 format => $format,
414 internalformat => $format,
415 type => GL_UNSIGNED_BYTE,
416 %arg,
417 ) 395 );
418} 396 $vb->add (my $entry = new CFClient::UI::Entry
397 text => "",
398 on_key_down => sub {
399 my ($entry, $ev) = @_;
419 400
420sub new_from_opengl { 401 my $mod = $ev->{mod};
421 my ($class, $w, $h, $cb) = @_; 402 my $sym = $ev->{sym};
422 403
423 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 404 # XXX: This seems a little bit hackisch to me, but i have to ignore them
424} 405 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
406 return;
407 }
425 408
426sub topot { 409 if ($mod == CFClient::KMOD_NONE
427 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 410 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
428} 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 }
429 419
430sub upload { 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 {
431 my ($self) = @_; 450 my ($list) = @_;
432 451
433 return unless $GL_VERSION; 452 return unless $CMDBOX;
434 453
435 my $data; 454 $CMDBOX->clear ();
455 $CURRENT_CMDS = $list;
436 456
437 if (exists $self->{data}) { 457 my $idx = 0;
438 $data = $self->{data};
439 458
440 } elsif (exists $self->{render_cb}) { 459 for (@$list) {
441 glViewport 0, 0, $self->{w}, $self->{h}; 460 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
442 glMatrixMode GL_PROJECTION;
443 glLoadIdentity;
444 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
445 glMatrixMode GL_MODELVIEW;
446 glLoadIdentity;
447 $self->{render_cb}->($self, $self->{w}, $self->{h});
448 461
449 } else { 462 my $i = $idx;
450 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 463 $hb->add (new CFClient::UI::Button
451 = CFClient::load_image_inline $self->{image}; 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++
452 } 474 }
475}
453 476
454 my ($tw, $th) = @$self{qw(w h)}; 477# if $show is 1 the recorder will be shown
478sub start {
479 my ($show) = @_;
455 480
456 unless ($tw > 0 && $th > 0) { 481 $RECORD_WINDOW->show if $show;
457 $tw = $th = 1; 482
458 $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;
459 } 504 }
505}
460 506
461 $self->{minified} = [CFClient::average $tw, $th, $data] 507sub make_window {
462 if $self->{minify}; 508 $RECORD_WINDOW = new CFClient::UI::FancyFrame
509 req_y => 1,
510 req_x => -1,
511 title => "Action Recorder";
463 512
464 unless ($GL_NPOT) { 513 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
465 # TODO: does not work for zero-sized textures 514 $vb->add ($REC_BTN = new CFClient::UI::Button
466 $tw = topot $tw; 515 text => "start recording",
467 $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) = @_;
468 523
469 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 524 unless ($btn->{recording}) {
470 my $bpp = (length $data) / ($self->{w} * $self->{h}); 525 start;
471 $data = pack "(a" . ($tw * $bpp) . ")*", 526 } else {
472 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 527 stop;
473 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 528 }
474 } 529 });
475 } 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 });
476 537
477 $self->{s} = $self->{w} / $tw; 538 $RECORD_WINDOW
478 $self->{t} = $self->{h} / $th;
479
480 $self->{name} ||= glGenTexture;
481
482 glBindTexture GL_TEXTURE_2D, $self->{name};
483
484 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
485 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
486
487 if ($::FAST) {
488 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
489 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
490 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
491 # alternatively check for 0x8191
492 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
494 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
495 } else {
496 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
497 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
498 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
499 }
500
501 glGetError;
502
503 if (defined $data) {
504 glTexImage2D GL_TEXTURE_2D, 0,
505 $self->{internalformat},
506 $tw, $th,
507 0,
508 $self->{format},
509 $self->{type},
510 $data;
511 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
512 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
513 } else {
514 glCopyTexImage2D GL_TEXTURE_2D, 0,
515 $self->{internalformat},
516 0, 0,
517 $tw, $th,
518 0;
519 CFClient::gl_check "copying to texture %dx%d if=%x",
520 $tw, $th, $self->{internalformat};
521 }
522
523 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
524}
525
526sub DESTROY {
527 my ($self) = @_;
528
529 delete $TEXTURES{$self+0};
530
531 glDeleteTexture delete $self->{name}
532 if $self->{name};
533}
534
535sub restore_state {
536 $_->upload
537 for values %TEXTURES;
538} 539}
539 540
5401; 5411;
541 542
542=back 543=back

Diff Legend

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