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

Diff Legend

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