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.112 by root, Fri Jul 20 18:42:45 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 # putting the password into the env is somewhat tasteless 77 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"; 78 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105 79
106 my $server = $editsup->{gameserver} || "default"; 80 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108 82
109 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;
110 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;
111 85
112 print "map directory is $mapdir\n"; 86 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n"; 87 print "lib directory is $libdir\n";
114 88
115 require LWP::UserAgent; 89 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 90
124 for my $file (qw(archetypes crossfire.0)) { 91 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file"; 92 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n"; 93 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file"); 94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 } 96 }
130 97
131 if (1) { # upload a map 98 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0]; 99 my $mapname = $::CONN->{map_info}[0];
133 100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
134 print "getting map revision for $mapname...\n"; 105 print "getting map revision for $mapname...\n";
135 106
136 # try to get the most recent head revision, what a hack, 107 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh* 108 # 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; 109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139 110
140 if ($log =~ /\?rev=(\d+\.\d+)"/) { 111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1; 112 my $rev = $1;
142 113
143 print "downloading revision $rev...\n"; 114 print "downloading revision $rev...\n";
144 115
145 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;
117
118 my $meta = {
119 %$editsup,
120 path => $mapname,
121 revision => $rev,
122 cf_login => $::PROFILE->{user},
123 };
124
125 require File::Basename;
126 require File::Path;
127
128 File::Path::mkpath (File::Basename::dirname ($mappath));
129 open my $fh, ">:raw:perlio", "$mappath.meta"
130 or die "$mappath.meta: $!\n";
131 print $fh CFPlus::to_json $meta;
132 close $fh;
133 open my $fh, ">:raw:perlio:utf8", $mappath
134 or die "$mappath: $!\n";
135 print $fh $map;
136 close $fh;
137
138 print "saved as $mappath\n";
139
140 print "invoking editor...\n";
141 exec "/root/s2/gce $mappath";#d#
146 142
147 # now upload it 143 # now upload it
148# require HTTP::Request::Common; 144# require HTTP::Request::Common;
149# 145#
150# my $res = $ua->post ( 146# my $res = $ua->post (
… …
171# } 167# }
172 } else { 168 } else {
173 die "viewvc parse error, unable to detect revision\n"; 169 die "viewvc parse error, unable to detect revision\n";
174 } 170 }
175 } 171 }
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 }); 172 }
197} 173}
198 174
199sub invoke_button_down { 175sub invoke_button_down {
200 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
201 177
202 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
203 $self->grab_focus; 179 $self->grab_focus;
204 return unless $::CONN; 180 return unless $::CONN;
205 181
206 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};
207 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};
208 184
209 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
210 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
211 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
212 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
213 if $::CONN; 193 }
194 }
214 195
215 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
216 $self->grab_focus; 197 $self->grab_focus;
217 return unless $::CONN; 198 return unless $::CONN;
218 199
… …
304 285
305 1 286 1
306} 287}
307 288
308sub size_request { 289sub size_request {
290 my ($self) = @_;
291
309 ( 292 (
310 32 * CFPlus::ceil $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
311 32 * CFPlus::ceil $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
312 ) 295 )
313} 296}
314 297
315sub update { 298sub update {
316 my ($self) = @_; 299 my ($self) = @_;
… …
318 $self->{need_update} = 1; 301 $self->{need_update} = 1;
319 $self->SUPER::update; 302 $self->SUPER::update;
320} 303}
321 304
322my %DIR = ( 305my %DIR = (
306 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
323 CFPlus::SDLK_KP8, [1, "north"], 307 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
324 CFPlus::SDLK_KP9, [2, "northeast"], 308 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
325 CFPlus::SDLK_KP6, [3, "east"], 309 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
326 CFPlus::SDLK_KP3, [4, "southeast"], 310 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
327 CFPlus::SDLK_KP2, [5, "south"], 311 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
328 CFPlus::SDLK_KP1, [6, "southwest"], 312 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
329 CFPlus::SDLK_KP4, [7, "west"], 313 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
330 CFPlus::SDLK_KP7, [8, "northwest"], 314 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
331 315
332 CFPlus::SDLK_UP, [1, "north"], 316 ( "," . CFPlus::SDLK_UP ), [1, "north"],
317 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
333 CFPlus::SDLK_RIGHT, [3, "east"], 318 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
319 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
334 CFPlus::SDLK_DOWN, [5, "south"], 320 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
321 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
335 CFPlus::SDLK_LEFT, [7, "west"], 322 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
323 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
336); 324);
337 325
338sub invoke_key_down { 326sub invoke_key_down {
339 my ($self, $ev) = @_; 327 my ($self, $ev) = @_;
340 328
… …
342 my $sym = $ev->{sym}; 330 my $sym = $ev->{sym};
343 my $uni = $ev->{unicode}; 331 my $uni = $ev->{unicode};
344 332
345 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 333 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
346 334
347 if ($uni == ord "\t") { 335 if ($sym == 9) {
348 $::PL_WINDOW->toggle_visibility; 336 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
349 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 337 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
350 $::HELP_WINDOW->toggle_visibility; 338 $::HELP_WINDOW->toggle_visibility;
351 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352 ::toggle_player_page ($::STATS_PAGE); 340 ::toggle_player_page ($::STATS_PAGE);
353 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
356 ::toggle_player_page ($::SPELL_PAGE); 344 ::toggle_player_page ($::SPELL_PAGE);
357 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358 ::toggle_player_page ($::INVENTORY_PAGE); 346 ::toggle_player_page ($::INVENTORY_PAGE);
359 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360 $::SETUP_DIALOG->toggle_visibility; 348 $::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) { 349 } elsif (!$::CONN) {
375 return 0; # bindings further down need a valid connection 350 return 0; # bindings further down need a valid connection
376 351
377 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
378 $::CONN->user_send ("stay fire");
379 } elsif ($uni == ord ",") { 352 } elsif ($uni == ord ",") {
380 $::CONN->user_send ("take"); 353 $::CONN->user_send ("take");
381 } elsif ($uni == ord " ") { 354 } elsif ($uni == ord " ") {
382 $::CONN->user_send ("apply"); 355 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) { 356 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine"); 357 $::CONN->user_send ("examine");
385 } elsif ($uni == ord ".") { 358 } elsif ($uni == ord ".") {
386 $::CONN->user_send ($self->{completer}{last_command}) 359 $::CONN->user_send ($self->{completer}{last_command})
387 if exists $self->{completer}{last_command}; 360 if exists $self->{completer}{last_command};
388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 361 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
389 $::CONN->user_send ($_) for @$bind_cmd; 362 $::CONN->macro_send ($_) for @macros;
390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 363 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
391 $::CONN->user_send ("rotateshoottype +"); 364 $::CONN->user_send ("rotateshoottype +");
392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 365 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
393 $::CONN->user_send ("rotateshoottype -"); 366 $::CONN->user_send ("rotateshoottype -");
367 } elsif ($uni == ord '!') {
368 $self->{completer}->set_prefix ("shout ");
369 $self->{completer}->show;
394 } elsif ($uni == ord '"') { 370 } elsif ($uni == ord '"') {
395 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 371 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
396 $self->{completer}->show; 372 $self->{completer}->show;
397 } elsif ($uni == ord "'") { 373 } elsif ($uni == ord "'") {
398 $self->{completer}->set_prefix (""); 374 $self->{completer}->set_prefix ("");
399 $self->{completer}->show; 375 $self->{completer}->show;
400 } elsif (exists $DIR{$sym}) { 376 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
401 if ($mod & CFPlus::KMOD_SHIFT) { 377 if ($mod & CFPlus::KMOD_SHIFT) {
402 $self->{shft}++; 378 $self->{shft}++;
403 if ($DIR{$sym}[0] != $self->{fire_dir}) { 379 if ($dir->[0] != $self->{fire_dir}) {
404 $::CONN->user_send ("fire $DIR{$sym}[0]"); 380 $::CONN->user_send ("fire $dir->[0]");
405 } 381 }
406 $self->{fire_dir} = $DIR{$sym}[0]; 382 $self->{fire_dir} = $DIR{$sym}[0];
407 } elsif ($mod & CFPlus::KMOD_CTRL) { 383 } elsif ($mod & CFPlus::KMOD_CTRL) {
408 $self->{ctrl}++; 384 $self->{ctrl}++;
409 $::CONN->user_send ("run $DIR{$sym}[0]"); 385 $::CONN->user_send ("run $dir->[0]");
410 } else { 386 } else {
411 $::CONN->user_send ("$DIR{$sym}[1]"); 387 $::CONN->user_send ("$dir->[1]");
412 } 388 }
413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 389 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
414 $self->{completer}->inject_key_down ($ev); 390 $self->{completer}->inject_key_down ($ev);
415 $self->{completer}->show; 391 $self->{completer}->show;
416 } else { 392 } else {
… …
451 } 427 }
452 428
453 $res 429 $res
454} 430}
455 431
432sub invoke_visibility_change {
433 my ($self) = @_;
434
435 $self->refresh_hook;
436
437 0
438}
439
456sub set_magicmap { 440sub set_magicmap {
457 my ($self, $w, $h, $x, $y, $data) = @_; 441 my ($self, $w, $h, $x, $y, $data) = @_;
458 442
459 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 443 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 444 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461 445
462 $self->{magicmap} = [$x, $y, $w, $h, $data]; 446 $self->{magicmap} = [$x, $y, $w, $h, $data];
463 447
464 $self->update; 448 $self->update;
465} 449}
466 450
467sub draw { 451sub refresh_hook {
468 my ($self) = @_; 452 my ($self) = @_;
469 453
470 return unless $::MAP; 454 return unless $::MAP;
471 455
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}) { 456 if (delete $self->{need_update}) {
479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
480 458
459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
460 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
461
481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 462 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 463 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483 464
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 465 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 466 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486 467
487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 468 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 469 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489 470
490 if ($::CFG->{fow_enable}) { 471 if ($::CFG->{fow_enable}) {
491 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
492
493 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
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} }),
501 );
502 glEnable GL_CONVOLUTION_2D;
503 }
504 473
505 $self->{fow_texture} = new CFPlus::Texture 474 $self->{fow_texture} = new CFPlus::Texture
506 w => $w, 475 w => $w,
507 h => $h, 476 h => $h,
508 data => $data, 477 data => $data,
509 internalformat => GL_ALPHA, 478 internalformat => GL_ALPHA,
510 format => GL_ALPHA; 479 format => GL_ALPHA;
511
512 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513 } else { 480 } else {
514 delete $self->{fow_texture}; 481 delete $self->{fow_texture};
515 } 482 }
516 483
517 glNewList $self->{list}; 484 glNewList $self->{list};
518 485
519 glPushMatrix; 486 glPushMatrix;
520 glTranslate $sx0, $sy0; 487 glTranslate $sx0, $sy0;
521 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 488 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522 489
523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
524 491
525 glScale 32, 32; 492 glScale $self->{tilesize}, $self->{tilesize};
526 493
527 if (my $tex = $self->{fow_texture}) { 494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix;
496 glScale 1/3, 1/3;
528 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530 499
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 500 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0); 501 $self->{fow_texture}->draw_quad_alpha (0, 0);
533 502
534 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
504 glPopMatrix;
535 } 505 }
536 506
537 if ($self->{magicmap}) { 507 if ($self->{magicmap}) {
538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539 509
540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 510 $x += $::MAP->ox + $self->{dx};
541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 511 $y += $::MAP->oy + $self->{dy};
542 512
543 glTranslate - $x - 1, - $y - 1; 513 glTranslate - $x - 1, - $y - 1;
544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 514 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 515 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546 } 516 }
547 517
548 glPopMatrix; 518 glPopMatrix;
549 glEndList; 519 glEndList;
550 } 520 }
521
522}
523
524sub draw {
525 my ($self) = @_;
526
527 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
528
529 return unless $self->{list};
530
531 my $focused = $CFPlus::UI::FOCUS == $self
532 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
533
534 return
535 unless $focused || !$::FAST;
551 536
552 glCallList $self->{list}; 537 glCallList $self->{list};
553 538
554 # TNT2 emulates logops in software (or worse :) 539 # TNT2 emulates logops in software (or worse :)
555 unless ($focused) { 540 unless ($focused) {
… …
574 $self->SUPER::DESTROY; 559 $self->SUPER::DESTROY;
575} 560}
576 561
577package CFPlus::MapWidget::MapMap; 562package CFPlus::MapWidget::MapMap;
578 563
564use strict;
565use utf8;
566
579our @ISA = CFPlus::UI::Base::; 567our @ISA = CFPlus::UI::Base::;
580 568
581use Time::HiRes qw(time); 569use Time::HiRes qw(time);
582use CFPlus::OpenGL; 570use CFPlus::OpenGL;
583 571
584sub size_request { 572sub size_request {
585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 573 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
586} 574}
587 575
588sub invoke_size_allocate { 576sub refresh_hook {
589 my ($self, $w, $h) = @_; 577 my ($self) = @_;
590 578
591 $self->update; 579 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)}; 580 my ($w, $h) = @$self{qw(w h)};
609 581
610 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 582 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
611 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 583 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
612 584
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); 585 my $ox = 0.5 * ($w - $sw);
617 my $oy = 0.5 * ($h - $sh); 586 my $oy = 0.5 * ($h - $sh);
618 587
619 glEnable GL_BLEND; 588 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 589 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 590
624 if ($self->{texture_atime} < time) { 591 #TODO: map scale is completely borked
592
593 my $x0 = int $ox - $sx + 0.5;
594 my $y0 = int $oy - $sy + 0.5;
595
596 $self->{sw} = $sw;
597 $self->{sh} = $sh;
598
599 $self->{x0} = $x0;
600 $self->{y0} = $y0;
601
625 $self->{texture_atime} = time + 1/3; 602 $self->{texture_atime} = time + 1/3;
626 603
627 $self->{texture} = 604 $self->{texture} =
628 new CFPlus::Texture 605 new CFPlus::Texture
629 w => $w, 606 w => $w,
630 h => $h, 607 h => $h,
631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 608 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; 609 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
633 } 610 }
611}
612
613sub invoke_visibility_change {
614 my ($self) = @_;
615
616 $self->refresh_hook;
617
618 0
619}
620
621sub invoke_size_allocate {
622 my ($self, $w, $h) = @_;
623
624 $self->update;
625
626 1
627}
628
629sub update {
630 my ($self) = @_;
631
632 delete $self->{texture_atime};
633 $self->SUPER::update;
634}
635
636sub _draw {
637 my ($self) = @_;
638
639 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
640
641 $self->{texture} or return;
642
643 glEnable GL_BLEND;
644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
645 glEnable GL_TEXTURE_2D;
646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 647
635 $self->{texture}->draw_quad (0, 0); 648 $self->{texture}->draw_quad (0, 0);
636 649
637 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
638 651
639 glTranslate 0.375, 0.375; 652 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 653
646 glColor 1, 1, 0, 1; 654 glColor 1, 1, 0, 1;
647 glBegin GL_LINE_LOOP; 655 glBegin GL_LINE_LOOP;
648 glVertex $x0 , $y0 ; 656 glVertex $self->{x0} , $self->{y0} ;
649 glVertex $x0 , $y0 + $sh; 657 glVertex $self->{x0} , $self->{y0} + $self->{sh};
650 glVertex $x0 + $sw, $y0 + $sh; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
651 glVertex $x0 + $sw, $y0 ; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
652 glEnd; 660 glEnd;
653 661
654 glDisable GL_BLEND; 662 glDisable GL_BLEND;
655} 663}
656 664
… …
692 700
693 if ($ev->{button} == 3) { 701 if ($ev->{button} == 3) {
694 (new CFPlus::UI::Menu 702 (new CFPlus::UI::Menu
695 items => [ 703 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 704 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 705 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698 ], 706 ],
699 )->popup ($ev); 707 )->popup ($ev);
700 return 1; 708 return 1;
701 } 709 }
702 0 710 0

Diff Legend

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