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.87 by root, Sun Oct 8 21:57:54 2006 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 list => glGenList,
25 26 tilesize => 32,
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 27 @_
33 ); 28 );
34 29
35 $self->{completer} = new CFPlus::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 31 command => $self->{command},
… …
38 ; 33 ;
39 34
40 $self 35 $self
41} 36}
42 37
38sub set_tilesize {
39 my ($self, $tilesize) = @_;
40
41 $self->{tilesize} = $tilesize;
42}
43
43sub add_command { 44sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 46
46 (my $data = $command) =~ s/\\//g; 47 (my $data = $command) =~ s/\\//g;
47 48
… …
67 ::stop_game (); 68 ::stop_game ();
68 local $::PROFILE->{host} = $server; 69 local $::PROFILE->{host} = $server;
69 ::start_game (); 70 ::start_game ();
70} 71}
71 72
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 73sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 74 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 75 or return;
84 76
85 my ($pid, $fh); 77 CFPlus::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 my $msg = $_[0];
89 $msg =~ s/\n+/\n/;
90 warn "FATAL: $msg";
91 CFPlus::_exit 99;
92 };
93
94 open STDERR, ">&STDOUT";
95 binmode STDOUT, ":utf8";
96 binmode STDERR, ":utf8";
97 close $fh;
98
99 $| = 1;
100 print "preparing editor startup...\n"; 78 print "preparing editor startup...\n";
101 CFPlus::set_proxy;
102 79
103 my $server = $editsup->{gameserver} || "default"; 80 my $server = $editsup->{gameserver} || "default";
104 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
105 82
106 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
107 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
108 85
109 print "map directory is $mapdir\n"; 86 print "map directory is $mapdir\n";
110 print "lib directory is $libdir\n"; 87 print "lib directory is $libdir\n";
111 88
112 require LWP::UserAgent; 89 my $ua = CFPlus::lwp_useragent;
113
114 my $ua = LWP::UserAgent->new (
115 agent => "cfplus $CFPlus::VERSION",
116 keep_alive => 1,
117 env_proxy => 1,
118 timeout => 30,
119 );
120 90
121 for my $file (qw(archetypes crossfire.0)) { 91 for my $file (qw(archetypes crossfire.0)) {
122 my $url = "$editsup->{lib_root}$file"; 92 my $url = "$editsup->{lib_root}$file";
123 print "mirroring $url...\n"; 93 print "mirroring $url...\n";
124 check_lwp $ua->mirror ($url, "$libdir/$file"); 94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
125 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
126 } 96 }
127 97
128 if (1) { # upload a map 98 if (1) { # upload a map
129 my $mapname = $::CONN->{map_info}[0]; 99 my $mapname = $::CONN->{map_info}[0];
… …
134 104
135 print "getting map revision for $mapname...\n"; 105 print "getting map revision for $mapname...\n";
136 106
137 # try to get the most recent head revision, what a hack, 107 # try to get the most recent head revision, what a hack,
138 # this should have been returned while downloading *sigh* 108 # this should have been returned while downloading *sigh*
139 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
140 110
141 if ($log =~ /\?rev=(\d+\.\d+)"/) { 111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
142 my $rev = $1; 112 my $rev = $1;
143 113
144 print "downloading revision $rev...\n"; 114 print "downloading revision $rev...\n";
145 115
146 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
147 117
148 my $meta = { 118 my $meta = {
149 %$editsup, 119 %$editsup,
150 path => $mapname, 120 path => $mapname,
151 revision => $rev, 121 revision => $rev,
… …
197# } 167# }
198 } else { 168 } else {
199 die "viewvc parse error, unable to detect revision\n"; 169 die "viewvc parse error, unable to detect revision\n";
200 } 170 }
201 } 171 }
202
203 CFPlus::_exit;
204 }
205
206 my $buffer;
207
208 Event->io (fd => $fh, poll => 'r', cb => sub {
209 unless (sysread $fh, $buffer, 4096, length $buffer) {
210 $_[0]->w->cancel;
211 $buffer .= "done\n";
212 }
213
214 while ($buffer =~ s/^(.*)\n//) {
215 ::message ({
216 markup => "editor($pid): " . CFPlus::asxml $1,
217 });
218 }
219 }); 172 }
220} 173}
221 174
222sub invoke_button_down { 175sub invoke_button_down {
223 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
224 177
225 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
226 $self->grab_focus; 179 $self->grab_focus;
227 return unless $::CONN; 180 return unless $::CONN;
228 181
229 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
230 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
231 184
232 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
233 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
234 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
235 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
236 if $::CONN; 193 }
194 }
237 195
238 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
239 $self->grab_focus; 197 $self->grab_focus;
240 return unless $::CONN; 198 return unless $::CONN;
241 199
… …
327 285
328 1 286 1
329} 287}
330 288
331sub size_request { 289sub size_request {
290 my ($self) = @_;
291
332 ( 292 (
333 32 * CFPlus::ceil $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
334 32 * CFPlus::ceil $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
335 ) 295 )
336} 296}
337 297
338sub update { 298sub update {
339 my ($self) = @_; 299 my ($self) = @_;
… …
341 $self->{need_update} = 1; 301 $self->{need_update} = 1;
342 $self->SUPER::update; 302 $self->SUPER::update;
343} 303}
344 304
345my %DIR = ( 305my %DIR = (
306 CFPlus::SDLK_KP5, [0, "stay fire"],
346 CFPlus::SDLK_KP8, [1, "north"], 307 CFPlus::SDLK_KP8, [1, "north"],
347 CFPlus::SDLK_KP9, [2, "northeast"], 308 CFPlus::SDLK_KP9, [2, "northeast"],
348 CFPlus::SDLK_KP6, [3, "east"], 309 CFPlus::SDLK_KP6, [3, "east"],
349 CFPlus::SDLK_KP3, [4, "southeast"], 310 CFPlus::SDLK_KP3, [4, "southeast"],
350 CFPlus::SDLK_KP2, [5, "south"], 311 CFPlus::SDLK_KP2, [5, "south"],
… …
365 my $sym = $ev->{sym}; 326 my $sym = $ev->{sym};
366 my $uni = $ev->{unicode}; 327 my $uni = $ev->{unicode};
367 328
368 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 329 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
369 330
370 if ($uni == ord "\t") { 331 if ($sym == 9) {
371 $::PL_WINDOW->toggle_visibility; 332 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
372 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 333 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
373 $::HELP_WINDOW->toggle_visibility; 334 $::HELP_WINDOW->toggle_visibility;
374 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 335 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
375 ::toggle_player_page ($::STATS_PAGE); 336 ::toggle_player_page ($::STATS_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 337 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
379 ::toggle_player_page ($::SPELL_PAGE); 340 ::toggle_player_page ($::SPELL_PAGE);
380 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
381 ::toggle_player_page ($::INVENTORY_PAGE); 342 ::toggle_player_page ($::INVENTORY_PAGE);
382 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
383 $::SETUP_DIALOG->toggle_visibility; 344 $::SETUP_DIALOG->toggle_visibility;
384 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
385 $::BIND_EDITOR->set_binding (undef, undef, [],
386 sub {
387 my ($mod, $sym, $cmds) = @_;
388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
389 });
390 $::BIND_EDITOR->start;
391 $::BIND_EDITOR->show;
392#TODO: elmex, what was this supposed to do? it currently crashes the client.
393# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
394# $::BIND_EDITOR->stop;
395# $::BIND_EDITOR->ask_for_bind_and_commit;
396# $::BIND_EDITOR->hide;
397 } elsif (!$::CONN) { 345 } elsif (!$::CONN) {
398 return 0; # bindings further down need a valid connection 346 return 0; # bindings further down need a valid connection
399 347
400 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
401 $::CONN->user_send ("stay fire");
402 } elsif ($uni == ord ",") { 348 } elsif ($uni == ord ",") {
403 $::CONN->user_send ("take"); 349 $::CONN->user_send ("take");
404 } elsif ($uni == ord " ") { 350 } elsif ($uni == ord " ") {
405 $::CONN->user_send ("apply"); 351 $::CONN->user_send ("apply");
406 } elsif ($uni == 13) { 352 } elsif ($uni == 13) {
407 $::CONN->user_send ("examine"); 353 $::CONN->user_send ("examine");
408 } elsif ($uni == ord ".") { 354 } elsif ($uni == ord ".") {
409 $::CONN->user_send ($self->{completer}{last_command}) 355 $::CONN->user_send ($self->{completer}{last_command})
410 if exists $self->{completer}{last_command}; 356 if exists $self->{completer}{last_command};
411 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 357 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
412 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
413 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
414 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
415 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
416 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
363 } elsif ($uni == ord '!') {
364 $self->{completer}->set_prefix ("shout ");
365 $self->{completer}->show;
417 } elsif ($uni == ord '"') { 366 } elsif ($uni == ord '"') {
418 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 367 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
419 $self->{completer}->show; 368 $self->{completer}->show;
420 } elsif ($uni == ord "'") { 369 } elsif ($uni == ord "'") {
421 $self->{completer}->set_prefix (""); 370 $self->{completer}->set_prefix ("");
… …
474 } 423 }
475 424
476 $res 425 $res
477} 426}
478 427
428sub invoke_visibility_change {
429 my ($self) = @_;
430
431 $self->refresh_hook;
432
433 0
434}
435
479sub set_magicmap { 436sub set_magicmap {
480 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
481 438
482 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
483 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
484 441
485 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
486 443
487 $self->update; 444 $self->update;
488} 445}
489 446
490sub draw { 447sub refresh_hook {
491 my ($self) = @_; 448 my ($self) = @_;
492 449
493 return unless $::MAP; 450 return unless $::MAP;
494 451
495 my $focused = $CFPlus::UI::FOCUS == $self
496 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
497
498 return
499 unless $focused || !$::FAST;
500
501 if (delete $self->{need_update}) { 452 if (delete $self->{need_update}) {
502 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
503 454
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
457
504 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
505 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
506 460
507 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
508 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
509 463
510 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
511 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
512 466
513 if ($::CFG->{fow_enable}) { 467 if ($::CFG->{fow_enable}) {
514 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
515
516 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
517 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
518 glConvolutionFilter2D (
519 GL_CONVOLUTION_2D,
520 GL_ALPHA,
521 3, 3,
522 GL_ALPHA, GL_FLOAT,
523 (pack "f*", @{ $self->{smooth_matrix} }),
524 );
525 glEnable GL_CONVOLUTION_2D;
526 }
527 469
528 $self->{fow_texture} = new CFPlus::Texture 470 $self->{fow_texture} = new CFPlus::Texture
529 w => $w, 471 w => $w,
530 h => $h, 472 h => $h,
531 data => $data, 473 data => $data,
532 internalformat => GL_ALPHA, 474 internalformat => GL_ALPHA,
533 format => GL_ALPHA; 475 format => GL_ALPHA;
534
535 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
536 } else { 476 } else {
537 delete $self->{fow_texture}; 477 delete $self->{fow_texture};
538 } 478 }
539 479
540 glNewList $self->{list}; 480 glNewList $self->{list};
541 481
542 glPushMatrix; 482 glPushMatrix;
543 glTranslate $sx0, $sy0; 483 glTranslate $sx0, $sy0;
544 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
545 485
546 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
547 487
548 glScale 32, 32; 488 glScale $self->{tilesize}, $self->{tilesize};
549 489
550 if (my $tex = $self->{fow_texture}) { 490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix;
492 glScale 1/3, 1/3;
551 glEnable GL_TEXTURE_2D; 493 glEnable GL_TEXTURE_2D;
552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
553 495
554 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 496 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
555 $self->{fow_texture}->draw_quad_alpha (0, 0); 497 $self->{fow_texture}->draw_quad_alpha (0, 0);
556 498
557 glDisable GL_TEXTURE_2D; 499 glDisable GL_TEXTURE_2D;
500 glPopMatrix;
558 } 501 }
559 502
560 if ($self->{magicmap}) { 503 if ($self->{magicmap}) {
561 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
562 505
563 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 506 $x += $::MAP->ox + $self->{dx};
564 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 507 $y += $::MAP->oy + $self->{dy};
565 508
566 glTranslate - $x - 1, - $y - 1; 509 glTranslate - $x - 1, - $y - 1;
567 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 510 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
568 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 511 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
569 } 512 }
570 513
571 glPopMatrix; 514 glPopMatrix;
572 glEndList; 515 glEndList;
573 } 516 }
517
518}
519
520sub draw {
521 my ($self) = @_;
522
523 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
524
525 return unless $self->{list};
526
527 my $focused = $CFPlus::UI::FOCUS == $self
528 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
529
530 return
531 unless $focused || !$::FAST;
574 532
575 glCallList $self->{list}; 533 glCallList $self->{list};
576 534
577 # TNT2 emulates logops in software (or worse :) 535 # TNT2 emulates logops in software (or worse :)
578 unless ($focused) { 536 unless ($focused) {
… …
597 $self->SUPER::DESTROY; 555 $self->SUPER::DESTROY;
598} 556}
599 557
600package CFPlus::MapWidget::MapMap; 558package CFPlus::MapWidget::MapMap;
601 559
560use strict;
561use utf8;
562
602our @ISA = CFPlus::UI::Base::; 563our @ISA = CFPlus::UI::Base::;
603 564
604use Time::HiRes qw(time); 565use Time::HiRes qw(time);
605use CFPlus::OpenGL; 566use CFPlus::OpenGL;
606 567
607sub size_request { 568sub size_request {
608 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 569 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
609} 570}
610 571
611sub invoke_size_allocate { 572sub refresh_hook {
612 my ($self, $w, $h) = @_; 573 my ($self) = @_;
613 574
614 $self->update; 575 if ($::MAP && $self->{texture_atime} < time) {
615
616 1
617}
618
619sub update {
620 my ($self) = @_;
621
622 delete $self->{texture_atime};
623 $self->SUPER::update;
624}
625
626sub _draw {
627 my ($self) = @_;
628
629 $::MAP or return;
630
631 my ($w, $h) = @$self{qw(w h)}; 576 my ($w, $h) = @$self{qw(w h)};
632 577
633 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 578 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
634 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 579 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
635 580
636 my $sx = int $::CFG->{map_shift_x} / 32;
637 my $sy = int $::CFG->{map_shift_y} / 32;
638
639 my $ox = 0.5 * ($w - $sw); 581 my $ox = 0.5 * ($w - $sw);
640 my $oy = 0.5 * ($h - $sh); 582 my $oy = 0.5 * ($h - $sh);
641 583
642 glEnable GL_BLEND; 584 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
644 glEnable GL_TEXTURE_2D;
645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
646 586
647 if ($self->{texture_atime} < time) { 587 #TODO: map scale is completely borked
588
589 my $x0 = int $ox - $sx + 0.5;
590 my $y0 = int $oy - $sy + 0.5;
591
592 $self->{sw} = $sw;
593 $self->{sh} = $sh;
594
595 $self->{x0} = $x0;
596 $self->{y0} = $y0;
597
648 $self->{texture_atime} = time + 1/3; 598 $self->{texture_atime} = time + 1/3;
649 599
650 $self->{texture} = 600 $self->{texture} =
651 new CFPlus::Texture 601 new CFPlus::Texture
652 w => $w, 602 w => $w,
653 h => $h, 603 h => $h,
654 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 604 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
655 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 605 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
656 } 606 }
607}
608
609sub invoke_visibility_change {
610 my ($self) = @_;
611
612 $self->refresh_hook;
613
614 0
615}
616
617sub invoke_size_allocate {
618 my ($self, $w, $h) = @_;
619
620 $self->update;
621
622 1
623}
624
625sub update {
626 my ($self) = @_;
627
628 delete $self->{texture_atime};
629 $self->SUPER::update;
630}
631
632sub _draw {
633 my ($self) = @_;
634
635 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
636
637 $self->{texture} or return;
638
639 glEnable GL_BLEND;
640 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
641 glEnable GL_TEXTURE_2D;
642 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
657 643
658 $self->{texture}->draw_quad (0, 0); 644 $self->{texture}->draw_quad (0, 0);
659 645
660 glDisable GL_TEXTURE_2D; 646 glDisable GL_TEXTURE_2D;
661 647
662 glTranslate 0.375, 0.375; 648 glTranslate 0.375, 0.375;
663
664 #TODO: map scale is completely borked
665
666 my $x0 = int $ox - $sx + 0.5;
667 my $y0 = int $oy - $sy + 0.5;
668 649
669 glColor 1, 1, 0, 1; 650 glColor 1, 1, 0, 1;
670 glBegin GL_LINE_LOOP; 651 glBegin GL_LINE_LOOP;
671 glVertex $x0 , $y0 ; 652 glVertex $self->{x0} , $self->{y0} ;
672 glVertex $x0 , $y0 + $sh; 653 glVertex $self->{x0} , $self->{y0} + $self->{sh};
673 glVertex $x0 + $sw, $y0 + $sh; 654 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
674 glVertex $x0 + $sw, $y0 ; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
675 glEnd; 656 glEnd;
676 657
677 glDisable GL_BLEND; 658 glDisable GL_BLEND;
678} 659}
679 660
… …
715 696
716 if ($ev->{button} == 3) { 697 if ($ev->{button} == 3) {
717 (new CFPlus::UI::Menu 698 (new CFPlus::UI::Menu
718 items => [ 699 items => [
719 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 700 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
720 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 701 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
721 ], 702 ],
722 )->popup ($ev); 703 )->popup ($ev);
723 return 1; 704 return 1;
724 } 705 }
725 0 706 0

Diff Legend

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