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

Diff Legend

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