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.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC

1package CFPlus::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use DC;
9use CFPlus::OpenGL; 9use DC::OpenGL;
10use CFPlus::UI; 10use DC::UI;
11use DC::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::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 DC::Texture DC::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub new {
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::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39
40 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
41} 36}
42 37
43sub add_command { 38sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 40
… …
47 42
48 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
51 46
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 48}
54 49
55sub clr_commands { 50sub clr_commands {
56 my ($self) = @_; 51 my ($self) = @_;
57 52
58 %{$self->{completer}{command}} = (); 53 %{$::COMPLETER->{command}} = ();
59 54
60 $self->{completer}->hide 55 $::COMPLETER->hide
61 if $self->{completer}; 56 if $::COMPLETER;
62} 57}
63 58
64sub server_login { 59sub server_login {
65 my ($server) = @_; 60 my ($server) = @_;
66 61
… …
71 66
72sub editor_invoke { 67sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support} 68 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return; 69 or return;
75 70
76 CFPlus::background { 71 DC::background {
77 print "preparing editor startup...\n"; 72 print "preparing editor startup...\n";
78 73
79 my $server = $editsup->{gameserver} || "default"; 74 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81 76
82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 77 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
84 79
85 print "map directory is $mapdir\n"; 80 print "map directory is $mapdir\n";
86 print "lib directory is $libdir\n"; 81 print "lib directory is $libdir\n";
87 82
88 my $ua = CFPlus::lwp_useragent; 83 my $ua = DC::lwp_useragent;
89 84
90 for my $file (qw(archetypes crossfire.0)) { 85 for my $file (qw(archetypes crossfire.0)) {
91 my $url = "$editsup->{lib_root}$file"; 86 my $url = "$editsup->{lib_root}$file";
92 print "mirroring $url...\n"; 87 print "mirroring $url...\n";
93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 88 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
94 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
95 } 90 }
96 91
97 if (1) { # upload a map 92 if (1) { # upload a map
98 my $mapname = $::CONN->{map_info}[0]; 93 my $mapname = $::CONN->{map_info}[0];
… …
103 98
104 print "getting map revision for $mapname...\n"; 99 print "getting map revision for $mapname...\n";
105 100
106 # try to get the most recent head revision, what a hack, 101 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh* 102 # this should have been returned while downloading *sigh*
108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 103 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
109 104
110 if ($log =~ /\?rev=(\d+\.\d+)"/) { 105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
111 my $rev = $1; 106 my $rev = $1;
112 107
113 print "downloading revision $rev...\n"; 108 print "downloading revision $rev...\n";
114 109
115 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 110 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
116 111
117 my $meta = { 112 my $meta = {
118 %$editsup, 113 %$editsup,
119 path => $mapname, 114 path => $mapname,
120 revision => $rev, 115 revision => $rev,
… …
125 require File::Path; 120 require File::Path;
126 121
127 File::Path::mkpath (File::Basename::dirname ($mappath)); 122 File::Path::mkpath (File::Basename::dirname ($mappath));
128 open my $fh, ">:raw:perlio", "$mappath.meta" 123 open my $fh, ">:raw:perlio", "$mappath.meta"
129 or die "$mappath.meta: $!\n"; 124 or die "$mappath.meta: $!\n";
130 print $fh CFPlus::to_json $meta; 125 print $fh DC::encode_json $meta;
131 close $fh; 126 close $fh;
132 open my $fh, ">:raw:perlio:utf8", $mappath 127 open my $fh, ">:raw:perlio:utf8", $mappath
133 or die "$mappath: $!\n"; 128 or die "$mappath: $!\n";
134 print $fh $map; 129 print $fh $map;
135 close $fh; 130 close $fh;
… …
176 171
177 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
178 $self->grab_focus; 173 $self->grab_focus;
179 return unless $::CONN; 174 return unless $::CONN;
180 175
181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 176 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183 178
184 $x -= CFPlus::floor $::MAP->w * 0.5; 179 $x -= DC::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5; 180 $y -= DC::floor $::MAP->h * 0.5;
186 181
187 if ($::CONN) { 182 if ($::CONN) {
188 if ($::IN_BUILD_MODE) {
189 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190 } else {
191 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
192 }
193 } 184 }
194 185
195 } elsif ($ev->{button} == 2) { 186 } elsif ($ev->{button} == 2) {
196 $self->grab_focus; 187 $self->grab_focus;
197 return unless $::CONN; 188 return unless $::CONN;
… …
226 ], 217 ],
227 ); 218 );
228 219
229 if ($::CONN && $::CONN->{editor_support}) { 220 if ($::CONN && $::CONN->{editor_support}) {
230 push @items, [ 221 push @items, [
231 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 222 "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
232 \&editor_invoke, 223 \&editor_invoke,
233 ]; 224 ];
234 225
235 for my $type (qw(test name)) { 226 for my $type (qw(test name)) {
236 $::CONN->{editor_support}{type} ne $type 227 $::CONN->{editor_support}{type} ne $type
237 or next; 228 or next;
238 my $server = $::CONN->{editor_support}{"${type}server"} 229 my $server = $::CONN->{editor_support}{"${type}server"}
239 or next; 230 or next;
240 231
241 push @items, [ 232 push @items, [
242 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 233 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
243 sub { server_login $server }, 234 sub { server_login $server },
244 ]; 235 ];
245 } 236 }
246 } 237 }
247 238
… …
255 } 246 }
256 } 247 }
257 ], 248 ],
258 ; 249 ;
259 250
260 (new CFPlus::UI::Menu 251 (new DC::UI::Menu
261 items => \@items, 252 items => \@items,
262 )->popup ($ev); 253 )->popup ($ev);
263 } 254 }
264 255
265 1 256 1
… …
284 275
285 1 276 1
286} 277}
287 278
288sub size_request { 279sub size_request {
280 my ($self) = @_;
281
289 ( 282 (
290 32 * CFPlus::ceil $::WIDTH / 32, 283 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
291 32 * CFPlus::ceil $::HEIGHT / 32, 284 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
292 ) 285 )
293} 286}
294 287
295sub update { 288sub update {
296 my ($self) = @_; 289 my ($self) = @_;
… …
298 $self->{need_update} = 1; 291 $self->{need_update} = 1;
299 $self->SUPER::update; 292 $self->SUPER::update;
300} 293}
301 294
302my %DIR = ( 295my %DIR = (
296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
303 CFPlus::SDLK_KP8, [1, "north"], 297 ( "," . DC::SDLK_KP8 ), [1, "north"],
304 CFPlus::SDLK_KP9, [2, "northeast"], 298 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
305 CFPlus::SDLK_KP6, [3, "east"], 299 ( "," . DC::SDLK_KP6 ), [3, "east"],
306 CFPlus::SDLK_KP3, [4, "southeast"], 300 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
307 CFPlus::SDLK_KP2, [5, "south"], 301 ( "," . DC::SDLK_KP2 ), [5, "south"],
308 CFPlus::SDLK_KP1, [6, "southwest"], 302 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
309 CFPlus::SDLK_KP4, [7, "west"], 303 ( "," . DC::SDLK_KP4 ), [7, "west"],
310 CFPlus::SDLK_KP7, [8, "northwest"], 304 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
311 305
312 CFPlus::SDLK_UP, [1, "north"], 306 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . DC::SDLK_UP ), [2, "northeast"],
313 CFPlus::SDLK_RIGHT, [3, "east"], 308 ( "," . DC::SDLK_RIGHT), [3, "east"],
309 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
314 CFPlus::SDLK_DOWN, [5, "south"], 310 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
315 CFPlus::SDLK_LEFT, [7, "west"], 312 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
316); 314);
317 315
318sub invoke_key_down { 316sub invoke_key_down {
319 my ($self, $ev) = @_; 317 my ($self, $ev) = @_;
320 318
321 my $mod = $ev->{mod}; 319 my $mod = $ev->{mod};
322 my $sym = $ev->{sym}; 320 my $sym = $ev->{sym};
323 my $uni = $ev->{unicode}; 321 my $uni = $ev->{unicode};
324 322
325 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
326 324
327 if ($uni == ord "\t") { 325 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
328 $::PL_WINDOW->toggle_visibility;
329 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
330 $::HELP_WINDOW->toggle_visibility;
331 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
332 ::toggle_player_page ($::STATS_PAGE);
333 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
334 ::toggle_player_page ($::SKILL_PAGE);
335 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
336 ::toggle_player_page ($::SPELL_PAGE);
337 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
338 ::toggle_player_page ($::INVENTORY_PAGE);
339 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
340 $::SETUP_DIALOG->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
342 $::BIND_EDITOR->set_binding (undef, undef, [],
343 sub {
344 my ($mod, $sym, $cmds) = @_;
345 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
346 });
347 $::BIND_EDITOR->start;
348 $::BIND_EDITOR->show;
349#TODO: elmex, what was this supposed to do? it currently crashes the client.
350# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
351# $::BIND_EDITOR->stop;
352# $::BIND_EDITOR->ask_for_bind_and_commit;
353# $::BIND_EDITOR->hide;
354 } elsif (!$::CONN) {
355 return 0; # bindings further down need a valid connection
356
357 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
358 $::CONN->user_send ("stay fire");
359 } elsif ($uni == ord ",") {
360 $::CONN->user_send ("take");
361 } elsif ($uni == ord " ") {
362 $::CONN->user_send ("apply");
363 } elsif ($uni == 13) {
364 $::CONN->user_send ("examine");
365 } elsif ($uni == ord ".") {
366 $::CONN->user_send ($self->{completer}{last_command})
367 if exists $self->{completer}{last_command};
368 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
369 $::CONN->user_send ($_) for @$bind_cmd;
370 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
371 $::CONN->user_send ("rotateshoottype +");
372 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
373 $::CONN->user_send ("rotateshoottype -");
374 } elsif ($uni == ord '"') {
375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
376 $self->{completer}->show;
377 } elsif ($uni == ord "'") {
378 $self->{completer}->set_prefix ("");
379 $self->{completer}->show;
380 } elsif (exists $DIR{$sym}) {
381 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
382 $self->{shft}++; 327 $self->{shft}++;
383 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
384 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
385 } 330 }
386 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
387 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
388 $self->{ctrl}++; 333 $self->{ctrl}++;
389 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
390 } else { 335 } else {
391 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
392 } 337 }
393 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
394 $self->{completer}->inject_key_down ($ev);
395 $self->{completer}->show;
396 } else {
397 return 0; 339 return 1;
398 }
399
400 1 340 }
341
342 0
401} 343}
402 344
403sub invoke_key_up { 345sub invoke_key_up {
404 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
405 347
406 my $res = 0; 348 my $res = 0;
407 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
408 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
409 351
410 if ($::CFG->{shift_fire_stop}) { 352 if ($::CFG->{shift_fire_stop}) {
411 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 353 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
412 $::CONN->user_send ("fire_stop"); 354 $::CONN->user_send ("fire_stop");
413 delete $self->{fire_dir}; 355 delete $self->{fire_dir};
414 $res = 1; 356 $res = 1;
415 } 357 }
416 } else { 358 } else {
417 if (exists $DIR{$sym} && delete $self->{shft}) { 359 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
418 $::CONN->user_send ("fire_stop"); 360 $::CONN->user_send ("fire_stop");
419 delete $self->{fire_dir}; 361 delete $self->{fire_dir};
420 $res = 1; 362 $res = 1;
421 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 363 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
364 && delete $self->{shft}) { # XXX: is RSHIFT ok?
422 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
423 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
424 $res = 1; 367 $res = 1;
425 } 368 }
426 } 369 }
427 370
428 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 371 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
429 $::CONN->user_send ("run_stop"); 372 $::CONN->user_send ("run_stop");
430 $res = 1; 373 $res = 1;
431 } 374 }
432 375
433 $res 376 $res
434} 377}
435 378
379sub invoke_visibility_change {
380 my ($self) = @_;
381
382 $self->refresh_hook;
383
384 0
385}
386
436sub set_magicmap { 387sub set_magicmap {
437 my ($self, $w, $h, $x, $y, $data) = @_; 388 my ($self, $w, $h, $x, $y, $data) = @_;
438 389
439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 390 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 391 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
442 $self->{magicmap} = [$x, $y, $w, $h, $data]; 393 $self->{magicmap} = [$x, $y, $w, $h, $data];
443 394
444 $self->update; 395 $self->update;
445} 396}
446 397
398sub refresh_hook {
399 my ($self) = @_;
400
401 if ($::MAP && $::CONN) {
402 if (delete $self->{need_update}) {
403 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
404
405 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
406 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
407
408 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
409 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
410
411 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413
414 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
415 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
416
417 if ($::CFG->{fow_enable}) {
418 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
419
420 $self->{fow_texture} = new DC::Texture
421 w => $w,
422 h => $h,
423 data => $data,
424 internalformat => GL_ALPHA,
425 format => GL_ALPHA;
426 } else {
427 delete $self->{fow_texture};
428 }
429
430 glNewList ($self->{list} ||= glGenList);
431
432 glPushMatrix;
433 glTranslate $sx0, $sy0;
434 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
435
436 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
437
438 glScale $self->{tilesize}, $self->{tilesize};
439
440 if (my $tex = $self->{fow_texture}) {
441 glPushMatrix;
442 glScale 1/3, 1/3;
443 glEnable GL_TEXTURE_2D;
444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
445
446 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
447 $self->{fow_texture}->draw_quad_alpha (0, 0);
448
449 glDisable GL_TEXTURE_2D;
450 glPopMatrix;
451 }
452
453 if ($self->{magicmap}) {
454 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
455
456 $x += $::MAP->ox + $self->{dx};
457 $y += $::MAP->oy + $self->{dy};
458
459 glTranslate - $x - 1, - $y - 1;
460 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
461 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
462 }
463
464 glPopMatrix;
465 glEndList;
466 }
467 } else {
468 glDeleteList delete $self->{list}
469 if $self->{list};
470 }
471}
472
447sub draw { 473sub draw {
448 my ($self) = @_; 474 my ($self) = @_;
449 475
450 return unless $::MAP; 476 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
451 477
478 return unless $self->{list};
479
452 my $focused = $CFPlus::UI::FOCUS == $self 480 my $focused = $DC::UI::FOCUS == $self
453 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 481 || $DC::UI::FOCUS == $::COMPLETER->{entry};
454 482
455 return 483 return
456 unless $focused || !$::FAST; 484 unless $focused || !$::FAST;
457 485
458 if (delete $self->{need_update}) {
459 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
466
467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
469
470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
472
473 if ($::CFG->{fow_enable}) {
474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
475
476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
478 glConvolutionFilter2D (
479 GL_CONVOLUTION_2D,
480 GL_ALPHA,
481 3, 3,
482 GL_ALPHA, GL_FLOAT,
483 (pack "f*", @{ $self->{smooth_matrix} }),
484 );
485 glEnable GL_CONVOLUTION_2D;
486 }
487
488 $self->{fow_texture} = new CFPlus::Texture
489 w => $w,
490 h => $h,
491 data => $data,
492 internalformat => GL_ALPHA,
493 format => GL_ALPHA;
494
495 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496 } else {
497 delete $self->{fow_texture};
498 }
499
500 glNewList $self->{list};
501
502 glPushMatrix;
503 glTranslate $sx0, $sy0;
504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505
506 $::MAP->draw ($dx, $dy, $sw, $sh);
507
508 glScale 32, 32;
509
510 if (my $tex = $self->{fow_texture}) {
511 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513
514 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515 $self->{fow_texture}->draw_quad_alpha (0, 0);
516
517 glDisable GL_TEXTURE_2D;
518 }
519
520 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522
523 $x += $::MAP->ox + $self->{dx};
524 $y += $::MAP->oy + $self->{dy};
525
526 glTranslate - $x - 1, - $y - 1;
527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
529 }
530
531 glPopMatrix;
532 glEndList;
533 }
534
535 glCallList $self->{list}; 486 glCallList $self->{list};
536 487
537 # TNT2 emulates logops in software (or worse :) 488 # TNT2 emulates logops in software (or worse :)
538 unless ($focused) { 489 unless ($focused) {
539 glColor 0.4, 0.2, 0.2, 0.6; 490 glColor_premultiply 0, 0, 1, 0.25;
540 glEnable GL_BLEND; 491 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 492 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 493 glBegin GL_QUADS;
543 glVertex 0, 0; 494 glVertex 0, 0;
544 glVertex 0, $::HEIGHT; 495 glVertex 0, $::HEIGHT;
545 glVertex $::WIDTH, $::HEIGHT; 496 glVertex $::WIDTH, $::HEIGHT;
546 glVertex $::WIDTH, 0; 497 glVertex $::WIDTH, 0;
… …
555 glDeleteList $self->{list}; 506 glDeleteList $self->{list};
556 507
557 $self->SUPER::DESTROY; 508 $self->SUPER::DESTROY;
558} 509}
559 510
560package CFPlus::MapWidget::MapMap; 511package DC::MapWidget::MapMap;
561 512
513use strict;
514use utf8;
515
562our @ISA = CFPlus::UI::Base::; 516our @ISA = DC::UI::Base::;
563 517
564use Time::HiRes qw(time); 518use Time::HiRes qw(time);
565use CFPlus::OpenGL; 519use DC::OpenGL;
566 520
567sub size_request { 521sub size_request {
568 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 522 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
523}
524
525sub refresh_hook {
526 my ($self) = @_;
527
528 if ($::MAP && $self->{texture_atime} < time) {
529 my ($w, $h) = @$self{qw(w h)};
530
531 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
532 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
533
534 my $ox = 0.5 * ($w - $sw);
535 my $oy = 0.5 * ($h - $sh);
536
537 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
538 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
539
540 #TODO: map scale is completely borked
541
542 my $x0 = int $ox - $sx + 0.5;
543 my $y0 = int $oy - $sy + 0.5;
544
545 $self->{sw} = $sw;
546 $self->{sh} = $sh;
547
548 $self->{x0} = $x0;
549 $self->{y0} = $y0;
550
551 $self->{texture_atime} = time + 1/3;
552
553 $self->{texture} =
554 new DC::Texture
555 w => $w,
556 h => $h,
557 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
558 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
559 }
560}
561
562sub invoke_visibility_change {
563 my ($self) = @_;
564
565 $self->refresh_hook;
566
567 0
569} 568}
570 569
571sub invoke_size_allocate { 570sub invoke_size_allocate {
572 my ($self, $w, $h) = @_; 571 my ($self, $w, $h) = @_;
573 572
… …
584} 583}
585 584
586sub _draw { 585sub _draw {
587 my ($self) = @_; 586 my ($self) = @_;
588 587
589 $::MAP or return; 588 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
590 589
591 my ($w, $h) = @$self{qw(w h)}; 590 $self->{texture} or return;
592
593 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
594 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
595
596 my $sx = int $::CFG->{map_shift_x} / 32;
597 my $sy = int $::CFG->{map_shift_y} / 32;
598
599 my $ox = 0.5 * ($w - $sw);
600 my $oy = 0.5 * ($h - $sh);
601 591
602 glEnable GL_BLEND; 592 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 593 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
604 glEnable GL_TEXTURE_2D; 594 glEnable GL_TEXTURE_2D;
605 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 595 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
606 596
607 if ($self->{texture_atime} < time) {
608 $self->{texture_atime} = time + 1/3;
609
610 $self->{texture} =
611 new CFPlus::Texture
612 w => $w,
613 h => $h,
614 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
615 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
616 }
617
618 $self->{texture}->draw_quad (0, 0); 597 $self->{texture}->draw_quad (0, 0);
619 598
620 glDisable GL_TEXTURE_2D; 599 glDisable GL_TEXTURE_2D;
621 600
622 glTranslate 0.375, 0.375; 601 glTranslate 0.375, 0.375;
623
624 #TODO: map scale is completely borked
625
626 my $x0 = int $ox - $sx + 0.5;
627 my $y0 = int $oy - $sy + 0.5;
628 602
629 glColor 1, 1, 0, 1; 603 glColor 1, 1, 0, 1;
630 glBegin GL_LINE_LOOP; 604 glBegin GL_LINE_LOOP;
631 glVertex $x0 , $y0 ; 605 glVertex $self->{x0} , $self->{y0} ;
632 glVertex $x0 , $y0 + $sh; 606 glVertex $self->{x0} , $self->{y0} + $self->{sh};
633 glVertex $x0 + $sw, $y0 + $sh; 607 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
634 glVertex $x0 + $sw, $y0 ; 608 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
635 glEnd; 609 glEnd;
636 610
637 glDisable GL_BLEND; 611 glDisable GL_BLEND;
638} 612}
639 613
640package CFPlus::MapWidget::Command; 614package DC::MapWidget::Command;
641 615
642use strict; 616use strict;
643 617
644use CFPlus::OpenGL; 618use DC::OpenGL;
645 619
646our @ISA = CFPlus::UI::Frame::; 620our @ISA = DC::UI::Frame::;
647 621
648sub new { 622sub new {
649 my $class = shift; 623 my $class = shift;
650 624
651 my $self = $class->SUPER::new ( 625 my $self = $class->SUPER::new (
652 bg => [0, 0, 0, 0.8], 626 bg => [0, 0, 0, 0.8],
653 @_, 627 @_,
654 ); 628 );
655 629
656 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 630 $self->add ($self->{vbox} = new DC::UI::VBox);
657 631
658 $self->{label} = [ 632 $self->{label} = [
659 map 633 map
660 CFPlus::UI::Label->new ( 634 DC::UI::Label->new (
661 can_hover => 1, 635 can_hover => 1,
662 can_events => 1, 636 can_events => 1,
663 tooltip_width => 0.33, 637 tooltip_width => 0.33,
664 fontsize => $_, 638 fontsize => $_,
665 ), (0.8) x 16 639 ), (0.8) x 16
666 ]; 640 ];
667 641
668 $self->{entry} = new CFPlus::UI::Entry 642 $self->{entry} = new DC::UI::Entry
669 on_changed => sub { 643 on_changed => sub {
670 $self->update_labels; 644 $self->update_labels;
671 0 645 0
672 }, 646 },
673 on_button_down => sub { 647 on_button_down => sub {
674 my ($entry, $ev, $x, $y) = @_; 648 my ($entry, $ev, $x, $y) = @_;
675 649
676 if ($ev->{button} == 3) { 650 if ($ev->{button} == 3) {
677 (new CFPlus::UI::Menu 651 (new DC::UI::Menu
678 items => [ 652 items => [
679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 653 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
680 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 654 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681 ], 655 ],
682 )->popup ($ev); 656 )->popup ($ev);
683 return 1; 657 return 1;
684 } 658 }
685 0 659 0
… …
700 $self->hide; 674 $self->hide;
701 } 675 }
702 } elsif ($ev->{sym} == 27) { 676 } elsif ($ev->{sym} == 27) {
703 $self->{hist_ptr} = 0; 677 $self->{hist_ptr} = 0;
704 $self->hide; 678 $self->hide;
705 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 679 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
706 if ($self->{hist_ptr} > 1) { 680 if ($self->{hist_ptr} > 1) {
707 $self->{hist_ptr}--; 681 $self->{hist_ptr}--;
708 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 682 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
709 } elsif ($self->{hist_ptr} > 0) { 683 } elsif ($self->{hist_ptr} > 0) {
710 $self->{hist_ptr}--; 684 $self->{hist_ptr}--;
… …
712 } else { 686 } else {
713 ++$self->{select_offset} 687 ++$self->{select_offset}
714 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 688 if $self->{select_offset} < $#{ $self->{last_match} || [] };
715 } 689 }
716 $self->update_labels; 690 $self->update_labels;
717 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 691 } elsif ($ev->{sym} == DC::SDLK_UP) {
718 if ($self->{select_offset}) { 692 if ($self->{select_offset}) {
719 --$self->{select_offset} 693 --$self->{select_offset}
720 } else { 694 } else {
721 unless ($self->{hist_ptr}) { 695 unless ($self->{hist_ptr}) {
722 $self->{hist_saveback} = $self->{entry}->get_text; 696 $self->{hist_saveback} = $self->{entry}->get_text;
… …
880 854
881sub _draw { 855sub _draw {
882 my ($self) = @_; 856 my ($self) = @_;
883 857
884 # hack 858 # hack
885 local $CFPlus::UI::FOCUS = $self->{entry}; 859 local $DC::UI::FOCUS = $self->{entry};
886 860
887 $self->SUPER::_draw; 861 $self->SUPER::_draw;
888} 862}
889 863
8901 8641

Diff Legend

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