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

Diff Legend

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