ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.101 by root, Sun Apr 1 01:19:18 2007 UTC vs.
Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC

10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro; 11use CFPlus::Macro;
12 12
13our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14 14
15sub ::T() { 32 }
16
17my $magicmap_tex = 15my $magicmap_tex =
18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
20 18
21sub new { 19sub new {
22 my $class = shift; 20 my $class = shift;
23 21
24 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
25 z => -1, 23 z => -1,
26 can_focus => 1, 24 can_focus => 1,
27 list => glGenList, 25 tilesize => 32,
28
29 smooth_matrix => [
30 0.05, 0.13, 0.05,
31 0.13, 0.30, 0.13,
32 0.05, 0.13, 0.05,
33 ],
34
35 @_ 26 @_
36 ); 27 );
37 28
38 $self->{completer} = new CFPlus::MapWidget::Command::
39 command => $self->{command},
40 tooltip => "#completer_help",
41 ;
42
43 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
44} 36}
45 37
46sub add_command { 38sub add_command {
47 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
48 40
50 42
51 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
52 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
53 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
54 46
55 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
56} 48}
57 49
58sub clr_commands { 50sub clr_commands {
59 my ($self) = @_; 51 my ($self) = @_;
60 52
61 %{$self->{completer}{command}} = (); 53 %{$::COMPLETER->{command}} = ();
62 54
63 $self->{completer}->hide 55 $::COMPLETER->hide
64 if $self->{completer}; 56 if $::COMPLETER;
65} 57}
66 58
67sub server_login { 59sub server_login {
68 my ($server) = @_; 60 my ($server) = @_;
69 61
179 171
180 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
181 $self->grab_focus; 173 $self->grab_focus;
182 return unless $::CONN; 174 return unless $::CONN;
183 175
184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 176 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 177 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
186 178
187 $x -= CFPlus::floor $::MAP->w * 0.5; 179 $x -= CFPlus::floor $::MAP->w * 0.5;
188 $y -= CFPlus::floor $::MAP->h * 0.5; 180 $y -= CFPlus::floor $::MAP->h * 0.5;
189 181
190 if ($::CONN) { 182 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
194 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
195 }
196 } 184 }
197 185
198 } elsif ($ev->{button} == 2) { 186 } elsif ($ev->{button} == 2) {
199 $self->grab_focus; 187 $self->grab_focus;
200 return unless $::CONN; 188 return unless $::CONN;
287 275
288 1 276 1
289} 277}
290 278
291sub size_request { 279sub size_request {
280 my ($self) = @_;
281
292 ( 282 (
293 ::T * CFPlus::ceil $::WIDTH / ::T, 283 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
294 ::T * CFPlus::ceil $::HEIGHT / ::T, 284 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
295 ) 285 )
296} 286}
297 287
298sub update { 288sub update {
299 my ($self) = @_; 289 my ($self) = @_;
301 $self->{need_update} = 1; 291 $self->{need_update} = 1;
302 $self->SUPER::update; 292 $self->SUPER::update;
303} 293}
304 294
305my %DIR = ( 295my %DIR = (
296 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
306 CFPlus::SDLK_KP8, [1, "north"], 297 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
307 CFPlus::SDLK_KP9, [2, "northeast"], 298 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
308 CFPlus::SDLK_KP6, [3, "east"], 299 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
309 CFPlus::SDLK_KP3, [4, "southeast"], 300 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
310 CFPlus::SDLK_KP2, [5, "south"], 301 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
311 CFPlus::SDLK_KP1, [6, "southwest"], 302 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
312 CFPlus::SDLK_KP4, [7, "west"], 303 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
313 CFPlus::SDLK_KP7, [8, "northwest"], 304 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
314 305
315 CFPlus::SDLK_UP, [1, "north"], 306 ( "," . CFPlus::SDLK_UP ), [1, "north"],
307 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
316 CFPlus::SDLK_RIGHT, [3, "east"], 308 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
309 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
317 CFPlus::SDLK_DOWN, [5, "south"], 310 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
311 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
318 CFPlus::SDLK_LEFT, [7, "west"], 312 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
313 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
319); 314);
320 315
321sub invoke_key_down { 316sub invoke_key_down {
322 my ($self, $ev) = @_; 317 my ($self, $ev) = @_;
323 318
325 my $sym = $ev->{sym}; 320 my $sym = $ev->{sym};
326 my $uni = $ev->{unicode}; 321 my $uni = $ev->{unicode};
327 322
328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 323 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
329 324
330 if ($sym == 9) { 325 if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
333 $::HELP_WINDOW->toggle_visibility;
334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335 ::toggle_player_page ($::STATS_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
337 ::toggle_player_page ($::SKILL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
339 ::toggle_player_page ($::SPELL_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
341 ::toggle_player_page ($::INVENTORY_PAGE);
342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif (!$::CONN) {
345 return 0; # bindings further down need a valid connection
346
347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
348 $::CONN->user_send ("stay fire");
349 } elsif ($uni == ord ",") {
350 $::CONN->user_send ("take");
351 } elsif ($uni == ord " ") {
352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::CONN->user_send ("examine");
355 } elsif ($uni == ord ".") {
356 $::CONN->user_send ($self->{completer}{last_command})
357 if exists $self->{completer}{last_command};
358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
359 $::CONN->macro_send ($_) for @macros;
360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
361 $::CONN->user_send ("rotateshoottype +");
362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
367 } elsif ($uni == ord '"') {
368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
369 $self->{completer}->show;
370 } elsif ($uni == ord "'") {
371 $self->{completer}->set_prefix ("");
372 $self->{completer}->show;
373 } elsif (exists $DIR{$sym}) {
374 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & CFPlus::KMOD_SHIFT) {
375 $self->{shft}++; 327 $self->{shft}++;
376 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
377 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
378 } 330 }
379 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $DIR{$sym}[0];
380 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & CFPlus::KMOD_CTRL) {
381 $self->{ctrl}++; 333 $self->{ctrl}++;
382 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
383 } else { 335 } else {
384 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
385 } 337 }
386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
387 $self->{completer}->inject_key_down ($ev);
388 $self->{completer}->show;
389 } else {
390 return 0; 339 return 1;
391 }
392
393 1 340 }
341
342 0
394} 343}
395 344
396sub invoke_key_up { 345sub invoke_key_up {
397 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
398 347
424 } 373 }
425 374
426 $res 375 $res
427} 376}
428 377
378sub invoke_visibility_change {
379 my ($self) = @_;
380
381 $self->refresh_hook;
382
383 0
384}
385
429sub set_magicmap { 386sub set_magicmap {
430 my ($self, $w, $h, $x, $y, $data) = @_; 387 my ($self, $w, $h, $x, $y, $data) = @_;
431 388
432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 389 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 390 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
435 $self->{magicmap} = [$x, $y, $w, $h, $data]; 392 $self->{magicmap} = [$x, $y, $w, $h, $data];
436 393
437 $self->update; 394 $self->update;
438} 395}
439 396
397sub refresh_hook {
398 my ($self) = @_;
399
400 if ($::MAP && $::CONN) {
401 if (delete $self->{need_update}) {
402 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
403
404 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
405 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
406
407 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
408 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
409
410 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
411 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
412
413 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
414 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
415
416 if ($::CFG->{fow_enable}) {
417 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
418
419 $self->{fow_texture} = new CFPlus::Texture
420 w => $w,
421 h => $h,
422 data => $data,
423 internalformat => GL_ALPHA,
424 format => GL_ALPHA;
425 } else {
426 delete $self->{fow_texture};
427 }
428
429 glNewList ($self->{list} ||= glGenList);
430
431 glPushMatrix;
432 glTranslate $sx0, $sy0;
433 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
434
435 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
436
437 glScale $self->{tilesize}, $self->{tilesize};
438
439 if (my $tex = $self->{fow_texture}) {
440 glPushMatrix;
441 glScale 1/3, 1/3;
442 glEnable GL_TEXTURE_2D;
443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
444
445 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
446 $self->{fow_texture}->draw_quad_alpha (0, 0);
447
448 glDisable GL_TEXTURE_2D;
449 glPopMatrix;
450 }
451
452 if ($self->{magicmap}) {
453 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
454
455 $x += $::MAP->ox + $self->{dx};
456 $y += $::MAP->oy + $self->{dy};
457
458 glTranslate - $x - 1, - $y - 1;
459 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
460 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
461 }
462
463 glPopMatrix;
464 glEndList;
465 }
466 } else {
467 glDeleteList delete $self->{list}
468 if $self->{list};
469 }
470}
471
440sub draw { 472sub draw {
441 my ($self) = @_; 473 my ($self) = @_;
442 474
443 return unless $::MAP; 475 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
476
477 return unless $self->{list};
444 478
445 my $focused = $CFPlus::UI::FOCUS == $self 479 my $focused = $CFPlus::UI::FOCUS == $self
446 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 480 || $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
447 481
448 return 482 return
449 unless $focused || !$::FAST; 483 unless $focused || !$::FAST;
450 484
451 if (delete $self->{need_update}) {
452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
459
460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
462
463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
465
466 if ($::CFG->{fow_enable}) {
467 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
468
469 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
471 glConvolutionFilter2D (
472 GL_CONVOLUTION_2D,
473 GL_ALPHA,
474 3, 3,
475 GL_ALPHA, GL_FLOAT,
476 (pack "f*", @{ $self->{smooth_matrix} }),
477 );
478 glEnable GL_CONVOLUTION_2D;
479 }
480
481 $self->{fow_texture} = new CFPlus::Texture
482 w => $w,
483 h => $h,
484 data => $data,
485 internalformat => GL_ALPHA,
486 format => GL_ALPHA;
487
488 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
489 } else {
490 delete $self->{fow_texture};
491 }
492
493 glNewList $self->{list};
494
495 glPushMatrix;
496 glTranslate $sx0, $sy0;
497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
498
499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
500
501 glScale ::T, ::T;
502
503 if (my $tex = $self->{fow_texture}) {
504 glEnable GL_TEXTURE_2D;
505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
506
507 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
508 $self->{fow_texture}->draw_quad_alpha (0, 0);
509
510 glDisable GL_TEXTURE_2D;
511 }
512
513 if ($self->{magicmap}) {
514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
515
516 $x += $::MAP->ox + $self->{dx};
517 $y += $::MAP->oy + $self->{dy};
518
519 glTranslate - $x - 1, - $y - 1;
520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
522 }
523
524 glPopMatrix;
525 glEndList;
526 }
527
528 glCallList $self->{list}; 485 glCallList $self->{list};
529 486
530 # TNT2 emulates logops in software (or worse :) 487 # TNT2 emulates logops in software (or worse :)
531 unless ($focused) { 488 unless ($focused) {
532 glColor 0.4, 0.2, 0.2, 0.6; 489 glColor_premultiply 0, 0, 1, 0.25;
533 glEnable GL_BLEND; 490 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 492 glBegin GL_QUADS;
536 glVertex 0, 0; 493 glVertex 0, 0;
537 glVertex 0, $::HEIGHT; 494 glVertex 0, $::HEIGHT;
538 glVertex $::WIDTH, $::HEIGHT; 495 glVertex $::WIDTH, $::HEIGHT;
539 glVertex $::WIDTH, 0; 496 glVertex $::WIDTH, 0;
550 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
551} 508}
552 509
553package CFPlus::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
554 511
512use strict;
513use utf8;
514
555our @ISA = CFPlus::UI::Base::; 515our @ISA = CFPlus::UI::Base::;
556 516
557use Time::HiRes qw(time); 517use Time::HiRes qw(time);
558use CFPlus::OpenGL; 518use CFPlus::OpenGL;
559 519
560sub size_request { 520sub size_request {
561 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 521 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
562} 522}
563 523
564sub invoke_size_allocate { 524sub refresh_hook {
565 my ($self, $w, $h) = @_; 525 my ($self) = @_;
566 526
567 $self->update; 527 if ($::MAP && $self->{texture_atime} < time) {
568
569 1
570}
571
572sub update {
573 my ($self) = @_;
574
575 delete $self->{texture_atime};
576 $self->SUPER::update;
577}
578
579sub _draw {
580 my ($self) = @_;
581
582 $::MAP or return;
583
584 my ($w, $h) = @$self{qw(w h)}; 528 my ($w, $h) = @$self{qw(w h)};
585 529
586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; 530 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; 531 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
588 532
589 my $sx = int $::CFG->{map_shift_x} / ::T;
590 my $sy = int $::CFG->{map_shift_y} / ::T;
591
592 my $ox = 0.5 * ($w - $sw); 533 my $ox = 0.5 * ($w - $sw);
593 my $oy = 0.5 * ($h - $sh); 534 my $oy = 0.5 * ($h - $sh);
594 535
595 glEnable GL_BLEND; 536 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
597 glEnable GL_TEXTURE_2D;
598 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
599 538
600 if ($self->{texture_atime} < time) { 539 #TODO: map scale is completely borked
540
541 my $x0 = int $ox - $sx + 0.5;
542 my $y0 = int $oy - $sy + 0.5;
543
544 $self->{sw} = $sw;
545 $self->{sh} = $sh;
546
547 $self->{x0} = $x0;
548 $self->{y0} = $y0;
549
601 $self->{texture_atime} = time + 1/3; 550 $self->{texture_atime} = time + 1/3;
602 551
603 $self->{texture} = 552 $self->{texture} =
604 new CFPlus::Texture 553 new CFPlus::Texture
605 w => $w, 554 w => $w,
606 h => $h, 555 h => $h,
607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 556 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 557 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
609 } 558 }
559}
560
561sub invoke_visibility_change {
562 my ($self) = @_;
563
564 $self->refresh_hook;
565
566 0
567}
568
569sub invoke_size_allocate {
570 my ($self, $w, $h) = @_;
571
572 $self->update;
573
574 1
575}
576
577sub update {
578 my ($self) = @_;
579
580 delete $self->{texture_atime};
581 $self->SUPER::update;
582}
583
584sub _draw {
585 my ($self) = @_;
586
587 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
588
589 $self->{texture} or return;
590
591 glEnable GL_BLEND;
592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
593 glEnable GL_TEXTURE_2D;
594 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
610 595
611 $self->{texture}->draw_quad (0, 0); 596 $self->{texture}->draw_quad (0, 0);
612 597
613 glDisable GL_TEXTURE_2D; 598 glDisable GL_TEXTURE_2D;
614 599
615 glTranslate 0.375, 0.375; 600 glTranslate 0.375, 0.375;
616
617 #TODO: map scale is completely borked
618
619 my $x0 = int $ox - $sx + 0.5;
620 my $y0 = int $oy - $sy + 0.5;
621 601
622 glColor 1, 1, 0, 1; 602 glColor 1, 1, 0, 1;
623 glBegin GL_LINE_LOOP; 603 glBegin GL_LINE_LOOP;
624 glVertex $x0 , $y0 ; 604 glVertex $self->{x0} , $self->{y0} ;
625 glVertex $x0 , $y0 + $sh; 605 glVertex $self->{x0} , $self->{y0} + $self->{sh};
626 glVertex $x0 + $sw, $y0 + $sh; 606 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
627 glVertex $x0 + $sw, $y0 ; 607 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
628 glEnd; 608 glEnd;
629 609
630 glDisable GL_BLEND; 610 glDisable GL_BLEND;
631} 611}
632 612

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines