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.102 by root, Sun Apr 1 15:08:14 2007 UTC vs.
Revision 1.116 by root, Mon Aug 6 05:06:33 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() { 64 }
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:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
39 command => $self->{command}, 30 command => $self->{command},
40 tooltip => "#completer_help", 31 tooltip => "#completer_help",
41 ; 32 ;
42 33
43 $self 34 $self
35}
36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
44} 41}
45 42
46sub add_command { 43sub add_command {
47 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
48 45
… …
179 176
180 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
181 $self->grab_focus; 178 $self->grab_focus;
182 return unless $::CONN; 179 return unless $::CONN;
183 180
184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 181 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}; 182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
186 183
187 $x -= CFPlus::floor $::MAP->w * 0.5; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
188 $y -= CFPlus::floor $::MAP->h * 0.5; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
189 186
190 if ($::CONN) { 187 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
194 $::CONN->lookat ($x, $y) 188 $::CONN->lookat ($x, $y)
195 }
196 } 189 }
197 190
198 } elsif ($ev->{button} == 2) { 191 } elsif ($ev->{button} == 2) {
199 $self->grab_focus; 192 $self->grab_focus;
200 return unless $::CONN; 193 return unless $::CONN;
… …
287 280
288 1 281 1
289} 282}
290 283
291sub size_request { 284sub size_request {
285 my ($self) = @_;
286
292 ( 287 (
293 ::T * CFPlus::ceil $::WIDTH / ::T, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
294 ::T * CFPlus::ceil $::HEIGHT / ::T, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
295 ) 290 )
296} 291}
297 292
298sub update { 293sub update {
299 my ($self) = @_; 294 my ($self) = @_;
… …
301 $self->{need_update} = 1; 296 $self->{need_update} = 1;
302 $self->SUPER::update; 297 $self->SUPER::update;
303} 298}
304 299
305my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
306 CFPlus::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
307 CFPlus::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
308 CFPlus::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
309 CFPlus::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
310 CFPlus::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
311 CFPlus::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
312 CFPlus::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
313 CFPlus::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
314 310
315 CFPlus::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
316 CFPlus::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
317 CFPlus::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
318 CFPlus::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
319); 319);
320 320
321sub invoke_key_down { 321sub invoke_key_down {
322 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
323 323
… …
326 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
327 327
328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
329 329
330 if ($sym == 9) { 330 if ($sym == 9) {
331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
333 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif (!$::CONN) { 344 } elsif (!$::CONN) {
345 return 0; # bindings further down need a valid connection 345 return 0; # bindings further down need a valid connection
346 346
347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
348 $::CONN->user_send ("stay fire");
349 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
350 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
351 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
352 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
… …
368 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
369 $self->{completer}->show; 367 $self->{completer}->show;
370 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
371 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
372 $self->{completer}->show; 370 $self->{completer}->show;
373 } elsif (exists $DIR{$sym}) { 371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
374 if ($mod & CFPlus::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
375 $self->{shft}++; 373 $self->{shft}++;
376 if ($DIR{$sym}[0] != $self->{fire_dir}) { 374 if ($dir->[0] != $self->{fire_dir}) {
377 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $dir->[0]");
378 } 376 }
379 $self->{fire_dir} = $DIR{$sym}[0]; 377 $self->{fire_dir} = $DIR{$sym}[0];
380 } elsif ($mod & CFPlus::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
381 $self->{ctrl}++; 379 $self->{ctrl}++;
382 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $dir->[0]");
383 } else { 381 } else {
384 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$dir->[1]");
385 } 383 }
386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
387 $self->{completer}->inject_key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
388 $self->{completer}->show; 386 $self->{completer}->show;
389 } else { 387 } else {
… …
424 } 422 }
425 423
426 $res 424 $res
427} 425}
428 426
427sub invoke_visibility_change {
428 my ($self) = @_;
429
430 $self->refresh_hook;
431
432 0
433}
434
429sub set_magicmap { 435sub set_magicmap {
430 my ($self, $w, $h, $x, $y, $data) = @_; 436 my ($self, $w, $h, $x, $y, $data) = @_;
431 437
432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
435 $self->{magicmap} = [$x, $y, $w, $h, $data]; 441 $self->{magicmap} = [$x, $y, $w, $h, $data];
436 442
437 $self->update; 443 $self->update;
438} 444}
439 445
446sub refresh_hook {
447 my ($self) = @_;
448
449 if ($::MAP && $::CONN) {
450 if (delete $self->{need_update}) {
451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
452
453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
455
456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
458
459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
461
462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
464
465 if ($::CFG->{fow_enable}) {
466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
467
468 $self->{fow_texture} = new CFPlus::Texture
469 w => $w,
470 h => $h,
471 data => $data,
472 internalformat => GL_ALPHA,
473 format => GL_ALPHA;
474 } else {
475 delete $self->{fow_texture};
476 }
477
478 glNewList ($self->{list} ||= glGenList);
479
480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 my $missing = $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485
486 glScale $self->{tilesize}, $self->{tilesize};
487
488 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix;
490 glScale 1/3, 1/3;
491 glEnable GL_TEXTURE_2D;
492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
493
494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
495 $self->{fow_texture}->draw_quad_alpha (0, 0);
496
497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
499 }
500
501 if ($self->{magicmap}) {
502 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
503
504 $x += $::MAP->ox + $self->{dx};
505 $y += $::MAP->oy + $self->{dy};
506
507 glTranslate - $x - 1, - $y - 1;
508 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
509 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510 }
511
512 glPopMatrix;
513 glEndList;
514
515 for my $tile (@$missing) {
516 $tile = $::CONN->{texture}[$tile]
517 or next;
518 next if $tile->{loading};
519 $tile->upload;
520 }
521 }
522 } else {
523 glDeleteList delete $self->{list}
524 if $self->{list};
525 }
526}
527
440sub draw { 528sub draw {
441 my ($self) = @_; 529 my ($self) = @_;
442 530
443 return unless $::MAP; 531 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
532
533 return unless $self->{list};
444 534
445 my $focused = $CFPlus::UI::FOCUS == $self 535 my $focused = $CFPlus::UI::FOCUS == $self
446 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 536 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
447 537
448 return 538 return
449 unless $focused || !$::FAST; 539 unless $focused || !$::FAST;
450
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 540
528 glCallList $self->{list}; 541 glCallList $self->{list};
529 542
530 # TNT2 emulates logops in software (or worse :) 543 # TNT2 emulates logops in software (or worse :)
531 unless ($focused) { 544 unless ($focused) {
… …
550 $self->SUPER::DESTROY; 563 $self->SUPER::DESTROY;
551} 564}
552 565
553package CFPlus::MapWidget::MapMap; 566package CFPlus::MapWidget::MapMap;
554 567
568use strict;
569use utf8;
570
555our @ISA = CFPlus::UI::Base::; 571our @ISA = CFPlus::UI::Base::;
556 572
557use Time::HiRes qw(time); 573use Time::HiRes qw(time);
558use CFPlus::OpenGL; 574use CFPlus::OpenGL;
559 575
560sub size_request { 576sub size_request {
561 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 577 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
562} 578}
563 579
564sub invoke_size_allocate { 580sub refresh_hook {
565 my ($self, $w, $h) = @_; 581 my ($self) = @_;
566 582
567 $self->update; 583 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)}; 584 my ($w, $h) = @$self{qw(w h)};
585 585
586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
588 588
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); 589 my $ox = 0.5 * ($w - $sw);
593 my $oy = 0.5 * ($h - $sh); 590 my $oy = 0.5 * ($h - $sh);
594 591
595 glEnable GL_BLEND; 592 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 593 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 594
600 if ($self->{texture_atime} < time) { 595 #TODO: map scale is completely borked
596
597 my $x0 = int $ox - $sx + 0.5;
598 my $y0 = int $oy - $sy + 0.5;
599
600 $self->{sw} = $sw;
601 $self->{sh} = $sh;
602
603 $self->{x0} = $x0;
604 $self->{y0} = $y0;
605
601 $self->{texture_atime} = time + 1/3; 606 $self->{texture_atime} = time + 1/3;
602 607
603 $self->{texture} = 608 $self->{texture} =
604 new CFPlus::Texture 609 new CFPlus::Texture
605 w => $w, 610 w => $w,
606 h => $h, 611 h => $h,
607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 612 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; 613 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
609 } 614 }
615}
616
617sub invoke_visibility_change {
618 my ($self) = @_;
619
620 $self->refresh_hook;
621
622 0
623}
624
625sub invoke_size_allocate {
626 my ($self, $w, $h) = @_;
627
628 $self->update;
629
630 1
631}
632
633sub update {
634 my ($self) = @_;
635
636 delete $self->{texture_atime};
637 $self->SUPER::update;
638}
639
640sub _draw {
641 my ($self) = @_;
642
643 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
644
645 $self->{texture} or return;
646
647 glEnable GL_BLEND;
648 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
649 glEnable GL_TEXTURE_2D;
650 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
610 651
611 $self->{texture}->draw_quad (0, 0); 652 $self->{texture}->draw_quad (0, 0);
612 653
613 glDisable GL_TEXTURE_2D; 654 glDisable GL_TEXTURE_2D;
614 655
615 glTranslate 0.375, 0.375; 656 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 657
622 glColor 1, 1, 0, 1; 658 glColor 1, 1, 0, 1;
623 glBegin GL_LINE_LOOP; 659 glBegin GL_LINE_LOOP;
624 glVertex $x0 , $y0 ; 660 glVertex $self->{x0} , $self->{y0} ;
625 glVertex $x0 , $y0 + $sh; 661 glVertex $self->{x0} , $self->{y0} + $self->{sh};
626 glVertex $x0 + $sw, $y0 + $sh; 662 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
627 glVertex $x0 + $sw, $y0 ; 663 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
628 glEnd; 664 glEnd;
629 665
630 glDisable GL_BLEND; 666 glDisable GL_BLEND;
631} 667}
632 668

Diff Legend

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