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

Diff Legend

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