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.3 by root, Wed Apr 19 20:46:44 2006 UTC vs.
Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC

1package CFClient::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use List::Util qw(min max); 6use List::Util qw(min max);
6 7
8use DC;
7use SDL::OpenGL; 9use DC::OpenGL;
10use DC::UI;
11use DC::Macro;
8 12
9our @ISA = CFClient::UI::Base::; 13our @ISA = DC::UI::Base::;
14
15my $magicmap_tex =
16 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
10 18
11sub new { 19sub new {
12 my $class = shift; 20 my $class = shift;
13 21
14 $class->SUPER::new ( 22 my $self = $class->SUPER::new (
15 z => -1, 23 z => -1,
16 can_focus => 1, 24 can_focus => 1,
17 list => (glGenLists 1), 25 tilesize => 32,
18 @_ 26 @_
19 ) 27 );
20}
21 28
22sub key_down { 29 $self
23 print "MAPKEYDOWN\n";
24} 30}
25 31
26sub key_up { 32sub add_command {
27} 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
28 34
35 (my $data = $command) =~ s/\\//g;
36
37 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//;
40
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42}
43
44sub clr_commands {
45 my ($self) = @_;
46
47 %{$::COMPLETER->{command}} = ();
48
49 $::COMPLETER->hide
50 if $::COMPLETER;
51}
52
53sub server_login {
54 my ($server) = @_;
55
56 ::stop_game ();
57 local $::PROFILE->{host} = $server;
58 ::start_game ();
59}
60
61sub editor_invoke {
62 my $editsup = $::CONN && $::CONN->{editor_support}
63 or return;
64
65 DC::background {
66 print "preparing editor startup...\n";
67
68 my $server = $editsup->{gameserver} || "default";
69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
70
71 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
72 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
73
74 print "map directory is $mapdir\n";
75 print "lib directory is $libdir\n";
76
77 my $ua = DC::lwp_useragent;
78
79 for my $file (qw(archetypes crossfire.0)) {
80 my $url = "$editsup->{lib_root}$file";
81 print "mirroring $url...\n";
82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
84 }
85
86 if (1) { # upload a map
87 my $mapname = $::CONN->{map_info}[0];
88
89 my $mappath = "$mapdir/$mapname";
90
91 -e $mappath and die "$mappath already exists\n";
92
93 print "getting map revision for $mapname...\n";
94
95 # try to get the most recent head revision, what a hack,
96 # this should have been returned while downloading *sigh*
97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
98
99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
100 my $rev = $1;
101
102 print "downloading revision $rev...\n";
103
104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
105
106 my $meta = {
107 %$editsup,
108 path => $mapname,
109 revision => $rev,
110 cf_login => $::PROFILE->{user},
111 };
112
113 require File::Basename;
114 require File::Path;
115
116 File::Path::mkpath (File::Basename::dirname ($mappath));
117 open my $fh, ">:raw:perlio", "$mappath.meta"
118 or die "$mappath.meta: $!\n";
119 print $fh DC::encode_json $meta;
120 close $fh;
121 open my $fh, ">:raw:perlio:utf8", $mappath
122 or die "$mappath: $!\n";
123 print $fh $map;
124 close $fh;
125
126 print "saved as $mappath\n";
127
128 print "invoking editor...\n";
129 exec "/root/s2/gce $mappath";#d#
130
131 # now upload it
132# require HTTP::Request::Common;
133#
134# my $res = $ua->post (
135# $ENV{CFPLUS_UPLOAD},
136# Content_Type => 'multipart/form-data',
137# Content => [
138# path => $mapname,
139# mapdir => $ENV{CROSSFIRE_MAPDIR},
140# map => $map,
141# revision => $rev,
142# cf_login => $ENV{CFPLUS_LOGIN},
143# cf_password => $ENV{CFPLUS_PASSWORD},
144# comment => "",
145# ]
146# );
147#
148# if ($res->is_error) {
149# # fatal condition
150# warn $res->status_line;
151# } else {
152# # script replies are marked as {{..}}
153# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
154# warn map "$_\n", @msgs;
155# }
156 } else {
157 die "viewvc parse error, unable to detect revision\n";
158 }
159 }
160 }
161}
162
29sub button_down { 163sub invoke_button_down {
30 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
31 165
32 $self->focus_in;
33
34 if ($ev->button == 2) { 166 if ($ev->{button} == 1) {
167 $self->grab_focus;
168 return unless $::CONN && $self->{ctilesize};
169
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172
173 $x -= DC::floor $::MAP->w * 0.5;
174 $y -= DC::floor $::MAP->h * 0.5;
175
176 if ($::CONN) {
177 $::CONN->lookat ($x, $y)
178 }
179
180 } elsif ($ev->{button} == 2) {
181 $self->grab_focus;
182 return unless $::CONN;
183
35 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 184 my ($ox, $oy) = ($ev->{x}, $ev->{y});
36 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 185 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
37 186
38 $self->{motion} = sub { 187 $self->{motion} = sub {
39 my ($ev, $x, $y) = @_; 188 my ($ev, $x, $y) = @_;
40 189
41 ($x, $y) = ($ev->motion_x, $ev->motion_y); 190 ($x, $y) = ($ev->{x}, $ev->{y});
42 191
43 $::CFG->{map_shift_x} = $bw + $x - $ox; 192 $::CFG->{map_shift_x} = $bw + $x - $ox;
44 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
45 194
46 $self->update; 195 $self->update;
47 }; 196 };
197 } elsif ($ev->{button} == 3) {
198 my @items = (
199 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206 );
207
208 if ($::CONN && $::CONN->{editor_support}) {
209# push @items, [
210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
211# \&editor_invoke,
212# ];
213
214 for my $type (qw(test name)) {
215 $::CONN->{editor_support}{type} ne $type
216 or next;
217 my $server = $::CONN->{editor_support}{"${type}server"}
218 or next;
219
220 push @items, [
221 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
222 sub { server_login $server },
223 ];
224 }
225 }
226
227 push @items,
228 ["Quit",
229 sub {
230 if ($::CONN) {
231 &::open_quit_dialog;
232 } else {
233 exit;
234 }
235 }
236 ],
237 ;
238
239 (new DC::UI::Menu
240 items => \@items,
241 )->popup ($ev);
242 }
243
48 } 244 1
49} 245}
50 246
51sub button_up { 247sub invoke_button_up {
52 my ($self, $ev, $x, $y) = @_; 248 my ($self, $ev, $x, $y) = @_;
53 249
54 delete $self->{motion}; 250 delete $self->{motion};
55}
56 251
252 1
253}
254
57sub mouse_motion { 255sub invoke_mouse_motion {
58 my ($self, $ev, $x, $y) = @_; 256 my ($self, $ev, $x, $y) = @_;
59 257
258 if ($self->{motion}) {
60 $self->{motion}->($ev, $x, $y) if $self->{motion}; 259 $self->{motion}->($ev, $x, $y);
260 } else {
261 return 0;
262 }
263
264 1
61} 265}
62 266
63sub size_request { 267sub size_request {
268 my ($self) = @_;
269
64 ( 270 (
65 1 + 32 * int $::WIDTH / 32, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
66 1 + 32 * int $::HEIGHT / 32, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
67 ) 273 )
68} 274}
69 275
70sub update { 276sub update {
71 my ($self) = @_; 277 my ($self) = @_;
72 278
73 $self->{need_update} = 1; 279 $self->{need_update} = 1;
74 $self->SUPER::update; 280 $self->SUPER::update;
75} 281}
76 282
77sub draw { 283my %DIR = (
284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
285 ( "," . DC::SDLK_KP8 ), [1, "north"],
286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
287 ( "," . DC::SDLK_KP6 ), [3, "east"],
288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
289 ( "," . DC::SDLK_KP2 ), [5, "south"],
290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
291 ( "," . DC::SDLK_KP4 ), [7, "west"],
292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
293
294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
299 ( "," . DC::SDLK_UP ), [1, "north"],
300 ("1," . DC::SDLK_UP ), [2, "northeast"],
301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
303 ( "," . DC::SDLK_DOWN ), [5, "south"],
304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
305 ( "," . DC::SDLK_LEFT ), [7, "west"],
306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
307);
308
309sub invoke_key_down {
78 my ($self) = @_; 310 my ($self, $ev) = @_;
79 311
312 my $mod = $ev->{mod};
313 my $sym = $ev->{sym};
314 my $uni = $ev->{unicode};
315
316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
317
318 # ignore repeated keypresses
319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
320 $self->{last_mod} = $mod;
321 $self->{last_sym} = $sym;
322
323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
324
325 if ($::CONN && $dir) {
326 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]");
330 }
331 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & DC::KMOD_CTRL) {
333 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]");
335 } else {
336 $::CONN->user_send ("$dir->[1]");
337 }
338
339 return 1;
340 }
341
342 0
343}
344
345sub invoke_key_up {
346 my ($self, $ev) = @_;
347
348 my $res = 0;
349 my $mod = $ev->{mod};
350 my $sym = $ev->{sym};
351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
355 if ($::CFG->{shift_fire_stop}) {
356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
357 $::CONN->user_send ("fire_stop");
358 delete $self->{fire_dir};
359 $res = 1;
360 }
361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
364 if ($dir && delete $self->{shft}) {
365 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir};
367 $res = 1;
368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
370 $::CONN->user_send ("fire_stop");
371 delete $self->{fire_dir};
372 $res = 1;
373 }
374 }
375
376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
377 $::CONN->user_send ("run_stop");
378 $res = 1;
379 }
380
381 $res
382}
383
384sub invoke_visibility_change {
385 my ($self) = @_;
386
387 $self->refresh_hook;
388
389 0
390}
391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $::MAP->scroll ($dx, $dy);
402
403 $self->{last_fow_texture} = $self->{fow_texture};
404 $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
405 $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
406
407 $self->movement_update;
408
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize};
411}
412
413sub set_magicmap {
414 my ($self, $w, $h, $x, $y, $data) = @_;
415
416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
418
419 $self->{magicmap} = [$x, $y, $w, $h, $data];
420
421 $self->update;
422}
423
424sub movement_update {
425 my ($self) = @_;
426
427 if ($::CFG->{smooth_movement}) {
428 if ($self->{sdx} || $self->{sdy}) {
429 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
431
432 # the minimum time for a single tile movement
433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $mintime * 2.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452 }
453
454 $self->update;
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
463sub refresh_hook {
464 my ($self) = @_;
465
466 if ($::MAP && $::CONN) {
80 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
81 glNewList $self->{list}, GL_COMPILE; 468 $self->movement_update;
82 469
83 if ($::MAP) { 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
84 my $sw = int $::WIDTH / 32;
85 my $sh = int $::HEIGHT / 32;
86 471
87 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
88 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
89 474
90 glTranslate $sx0 - 32, $sy0 - 32, 0; 475 # width/height of map, in tiles
476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
91 478
92 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 479 # the map displacement, in tiles
480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
482
483 # the upper left "visible" corner, in pixels
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
93 489
94 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
95 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 491 my ($sdx_t, $sdy_t);#d# do not anchor at player
96 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 492
97 glConvolutionFilter2D ( 493 my ($w, $h, $data) = $::MAP->fow_texture (
98 GL_CONVOLUTION_2D, 494 $dx + (min 0, $sdx_t),
99 GL_ALPHA, 495 $dy + (min 0, $sdy_t),
100 3, 3, 496 $sw + abs $sdx_t,
101 GL_ALPHA, GL_FLOAT, 497 $sh + abs $sdy_t
102 pack "f*",
103 0.1, 0.1, 0.1,
104 0.1, 0.2, 0.1,
105 0.1, 0.1, 0.1,
106 ); 498 );
107 glEnable GL_CONVOLUTION_2D;
108 }
109 499
110 $self->{fow_texture} = new CFClient::Texture 500 $self->{fow_texture} = new DC::Texture
111 w => $w, 501 w => $w,
112 h => $h, 502 h => $h,
113 data => $data, 503 data => $data,
114 internalformat => GL_ALPHA, 504 internalformat => GL_ALPHA,
115 format => GL_ALPHA; 505 format => GL_ALPHA;
506 } else {
507 delete $self->{fow_texture};
508 }
116 509
117 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 510 glNewList ($self->{list} ||= glGenList);
118 511
512 glPushMatrix;
513 glTranslate $sx0, $sy0;
514 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
516
517 $::MAP->draw ($dx, $dy, $sw, $sh,
518 $self->{tilesize},
519 $::CONN->{player}{tag},
520 -$self->{sdx}, -$self->{sdy});
521
522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
523 glScale $self->{tilesize}, $self->{tilesize};
524
525 if (my $tex = $self->{fow_texture}) {
526 glEnable GL_TEXTURE_2D;
119 glEnable GL_BLEND; 527 glEnable GL_BLEND;
120 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
121 glEnable GL_TEXTURE_2D;
122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
529 glBlendEquation GL_FUNC_REVERSE_SUBTRACT;
530 glBlendFunc GL_ONE, GL_ZERO;
123 531
532 my $a1 = 0.9;
533
534 if (0 && $self->{last_fow_texture}) {
535 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
536 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
537
538 if ($d1 * $d2) {
539 my $a2 = $d1 / $d2;
540
541 $a1 = 1 - $a2;
542
543 #$a1 *= 0.9;
544 #$a2 *= 0.9;
545
546 printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
547
548 #$a1 = 1 - (1-$a1) * 0.707;
549 #$a2 = 1 - (1-$a2) * 0.707;
550
551 glColor 1,0,0,1;
552 glBegin GL_QUADS;
553 glVertex 10 + $sdx_t, 10;
554 glVertex 11 + $sdx_t, 10;
555 glVertex 11 + $sdx_t, 11;
556 glVertex 10 + $sdx_t, 11;
557 glEnd;
558
559 glColor +($::CFG->{fow_intensity}) x 3, $a2;
560 glPushMatrix;
561 glTranslate $sdx_t, $sdy_t; # anchor at player
562 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
563 glScale 1/3, 1/3;
564 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
565 glPopMatrix;
566 } else {
567 delete $self->{last_fow_texture};
568 }
569 }
570
124 glColor +($::CFG->{fow_intensity}) x 3, 1; 571 glColor +($::CFG->{fow_intensity}) x 3, $a1;
572 glPushMatrix;
573 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
574 glScale 1/3, 1/3;
125 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 575 $self->{fow_texture}->draw_quad_alpha (0, 0);
576 glPopMatrix;
126 577
578 glBlendEquation GL_FUNC_ADD;
127 glDisable GL_TEXTURE_2D; 579 glDisable GL_TEXTURE_2D;
128 glDisable GL_BLEND; 580 glDisable GL_BLEND;
129 } 581 }
130 582
131 # HACK BEGIN 583 if ($self->{magicmap}) {
132 { 584 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
133 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
134 my ($w, $h) = (250, 250);
135 585
136 glEnable GL_BLEND; 586 $x += $::MAP->ox + $self->{dx};
137 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 587 $y += $::MAP->oy + $self->{dy};
138 glEnable GL_TEXTURE_2D;
139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
140 588
141 $self->{mapmap_texture} = 589 glTranslate - $x - 1, - $y - 1;
142 new CFClient::Texture 590 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
143 w => $w, 591 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
144 h => $h,
145 data => $::MAP->mapmap ($w, $h),
146 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
147
148 $self->{mapmap_texture}->draw_quad (100, 100);
149
150 glDisable GL_TEXTURE_2D;
151 glDisable GL_BLEND;
152 } 592 }
153 # HACK END
154 }
155 593
594 glPopMatrix;
156 glEndList; 595 glEndList;
596 }
597 } else {
598 glDeleteList delete $self->{list}
599 if $self->{list};
157 } 600 }
601}
158 602
159 glPushMatrix; 603sub draw {
604 my ($self) = @_;
605
606 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
607
608 return unless $self->{list};
609
610 my $focused = $DC::UI::FOCUS == $self
611 || $DC::UI::FOCUS == $::COMPLETER->{entry};
612
613 return
614 unless $focused || !$::FAST;
615
160 glCallList $self->{list}; 616 glCallList $self->{list};
161 glPopMatrix;
162 617
163 if ($CFClient::UI::FOCUS != $self) { 618 # TNT2 emulates logops in software (or worse :)
164 glColor 64/255, 64/255, 64/255; 619 unless ($focused) {
165 glLogicOp GL_AND; 620 glColor_premultiply 0, 0, 1, 0.25;
166 glEnable GL_COLOR_LOGIC_OP; 621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
167 glBegin GL_QUADS; 623 glBegin GL_QUADS;
168 glVertex 0, 0; 624 glVertex 0, 0;
169 glVertex 0, $::HEIGHT; 625 glVertex 0, $::HEIGHT;
170 glVertex $::WIDTH, $::HEIGHT; 626 glVertex $::WIDTH, $::HEIGHT;
171 glVertex $::WIDTH, 0; 627 glVertex $::WIDTH, 0;
172 glEnd; 628 glEnd;
173 glDisable GL_COLOR_LOGIC_OP; 629 glDisable GL_BLEND;
630 }
631}
632
633sub DESTROY {
634 my $self = shift;
635
636 glDeleteList $self->{list};
637
638 $self->SUPER::DESTROY;
639}
640
641package DC::MapWidget::MapMap;
642
643use strict;
644use utf8;
645
646our @ISA = DC::UI::Base::;
647
648use Time::HiRes qw(time);
649use DC::OpenGL;
650
651sub size_request {
652 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
653}
654
655sub refresh_hook {
656 my ($self) = @_;
657
658 if ($::MAP && $self->{texture_atime} < time) {
659 my ($w, $h) = @$self{qw(w h)};
660
661 return unless $w && $h;
662
663 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
664 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
665
666 my $ox = 0.5 * ($w - $sw);
667 my $oy = 0.5 * ($h - $sh);
668
669 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
670 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
671
672 #TODO: map scale is completely borked
673
674 my $x0 = int $ox - $sx + 0.5;
675 my $y0 = int $oy - $sy + 0.5;
676
677 $self->{sw} = $sw;
678 $self->{sh} = $sh;
679
680 $self->{x0} = $x0;
681 $self->{y0} = $y0;
682
683 $self->{texture_atime} = time + 1/3;
684
685 $self->{texture} =
686 new DC::Texture
687 w => $w,
688 h => $h,
689 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
690 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
691 }
692}
693
694sub invoke_visibility_change {
695 my ($self) = @_;
696
697 $self->refresh_hook;
698
699 0
700}
701
702sub invoke_size_allocate {
703 my ($self, $w, $h) = @_;
704
705 $self->update;
706
707 1
708}
709
710sub update {
711 my ($self) = @_;
712
713 delete $self->{texture_atime};
714 $self->SUPER::update;
715}
716
717sub _draw {
718 my ($self) = @_;
719
720 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
721
722 $self->{texture} or return;
723
724 glEnable GL_BLEND;
725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
726 glEnable GL_TEXTURE_2D;
727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
728
729 $self->{texture}->draw_quad (0, 0);
730
731 glDisable GL_TEXTURE_2D;
732
733 glTranslate 0.375, 0.375;
734
735 glColor 1, 1, 0, 1;
736 glBegin GL_LINE_LOOP;
737 glVertex $self->{x0} , $self->{y0} ;
738 glVertex $self->{x0} , $self->{y0} + $self->{sh};
739 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
740 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
741 glEnd;
174 } 742
743 glDisable GL_BLEND;
175} 744}
176 745
177my %DIR = ( 746package DC::MapWidget::Command;
178 CFClient::SDLK_KP8, [1, "north"],
179 CFClient::SDLK_KP9, [2, "northeast"],
180 CFClient::SDLK_KP6, [3, "east"],
181 CFClient::SDLK_KP3, [4, "southeast"],
182 CFClient::SDLK_KP2, [5, "south"],
183 CFClient::SDLK_KP1, [6, "southwest"],
184 CFClient::SDLK_KP4, [7, "west"],
185 CFClient::SDLK_KP7, [8, "northwest"],
186 747
187 CFClient::SDLK_UP, [1, "north"], 748use strict;
188 CFClient::SDLK_RIGHT, [3, "east"],
189 CFClient::SDLK_DOWN, [5, "south"],
190 CFClient::SDLK_LEFT, [7, "west"],
191);
192 749
750use DC::OpenGL;
751
752our @ISA = DC::UI::Frame::;
753
754sub new {
755 my $class = shift;
756
757 my $self = $class->SUPER::new (
758 bg => [0, 0, 0, 0.8],
759 @_,
760 );
761
762 $self->add ($self->{vbox} = new DC::UI::VBox);
763
764 $self->{label} = [
765 map
766 DC::UI::Label->new (
767 align => 0,
768 can_hover => 1,
769 can_events => 1,
770 tooltip_width => 0.33,
771 fontsize => $_,
772 ), (0.8) x 16
773 ];
774
775 $self->{entry} = new DC::UI::Entry
776 on_changed => sub {
777 $self->update_labels;
778 0
779 },
780 on_button_down => sub {
781 my ($entry, $ev, $x, $y) = @_;
782
783 if ($ev->{button} == 3) {
784 (new DC::UI::Menu
785 items => [
786 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
787 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
788 ],
789 )->popup ($ev);
790 return 1;
791 }
792 0
793 },
794 on_key_down => sub {
795 my ($entry, $ev) = @_;
796
797 my $self = $entry->{parent}{parent};
798
799 if ($ev->{sym} == 13) {
800 if (exists $self->{select}) {
801 $self->{last_command} = $self->{select};
802 $::CONN->user_send ($self->{select});
803
804 unshift @{$self->{history}}, $self->{entry}->get_text;
805 $self->{hist_ptr} = 0;
806
807 $self->hide;
808 }
809 } elsif ($ev->{sym} == 27) {
810 $self->{hist_ptr} = 0;
811 $self->hide;
812 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
813 if ($self->{hist_ptr} > 1) {
814 $self->{hist_ptr}--;
815 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
816 } elsif ($self->{hist_ptr} > 0) {
817 $self->{hist_ptr}--;
818 $self->{entry}->set_text ($self->{hist_saveback});
819 } else {
820 ++$self->{select_offset}
821 if $self->{select_offset} < $#{ $self->{last_match} || [] };
822 }
823 $self->update_labels;
824 } elsif ($ev->{sym} == DC::SDLK_UP) {
825 if ($self->{select_offset}) {
826 --$self->{select_offset}
827 } else {
828 unless ($self->{hist_ptr}) {
829 $self->{hist_saveback} = $self->{entry}->get_text;
830 }
831 if ($self->{hist_ptr} <= $#{$self->{history}}) {
832 $self->{hist_ptr}++;
833 }
834 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
835 if exists $self->{history}->[$self->{hist_ptr} - 1];
836 }
837 $self->update_labels;
838 } else {
839 return 0;
840 }
841
842 1
843 }
844 ;
845
846 $self->{vbox}->add (
847 $self->{entry},
848 @{$self->{label}},
849 );
850
851 $self
852}
853
854sub set_prefix {
855 my ($self, $prefix) = @_;
856
857 $self->{entry}->set_text ($prefix);
858 $self->show;
859}
860
861sub invoke_size_allocate {
862 my ($self, $w, $h) = @_;
863
864 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
867}
868
869sub show {
870 my ($self) = @_;
871
872 $self->SUPER::show;
873 $self->{entry}->grab_focus;
874}
875
876sub hide {
877 my ($self) = @_;
878
879 $self->{hist_ptr} = 0;
880
881 $self->SUPER::hide;
882 $self->{entry}->set_text ("");
883}
884
193sub key_down { 885sub inject_key_down {
194 my ($self, $ev) = @_; 886 my ($self, $ev) = @_;
195 887
196 my $mod = $ev->key_mod; 888 $self->{entry}->grab_focus;
197 my $sym = $ev->key_sym; 889 $self->{entry}->emit (key_down => $ev);
890}
198 891
199 if ($sym == CFClient::SDLK_KP5) { 892sub update_labels {
200 $::CONN->user_send ("stay fire"); 893 my ($self) = @_;
201 } elsif ($sym == ord "a") { 894
202 $::CONN->user_send ("apply"); 895 my $text = $self->{entry}->get_text;
203 } elsif ($sym == ord "'") { 896
204 $self->emit ('activate_console'); 897 length $text
205 } elsif ($sym == ord "/") { 898 or return $self->hide;
206 $self->emit ('activate_console' => '/'); 899
207 } elsif (exists $DIR{$sym}) { 900 if ($text ne $self->{last_search}) {
208 if ($mod & CFClient::KMOD_SHIFT) { 901 my @match;
209 $self->{shft}++; 902
210 $::CONN->user_send ("fire $DIR{$sym}[0]"); 903 if ($text =~ /^(.*?)\s+$/) {
211 } elsif ($mod & CFClient::KMOD_CTRL) { 904 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
212 $self->{ctrl}++; 905 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
213 $::CONN->user_send ("run $DIR{$sym}[0]");
214 } else { 906 } else {
215 $::CONN->user_send ("$DIR{$sym}[1]"); 907 # @match is [command, penalty, command with arguments] until sort
908
909 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
910
911 my $regexp_abbrev = do {
912 my ($beg, @chr) = split //, lc $cmd;
913
914 # the following regex is used to match our "completion entry"
915 # to an actual command - the parentheses match kind of "overhead"
916 # - the more characters the parentheses match, the less attractive
917 # is the match.
918 my $regexp = "^\Q$beg\E"
919 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
920 qr<$regexp>
921 };
922
923 my $regexp_partial = do {
924 my $regexp = "^\Q$text\E(.*)";
925 qr<$regexp>
926 };
927
928 for (keys %{$self->{command}}) {
929 my @scores;
930
931 # 1. Complete command [with args]
932 # command is a prefix of the text
933 # score is length of complete command matched
934 # e.g. "invoke summon pet monster bat"
935 # "invoke" "summon pet monster bat" = 6
936 # "invoke summon pet monster" "bat" = 25
937 if ($text =~ /^\Q$_\E(.*)/) {
938 push @scores, [$_, length $_, $text];
939 }
940
941 # 2. Partial command
942 # text is a prefix of the full command
943 # score is the length of the input text
944 # e.g. "invoke s"
945 # "invoke small fireball" = 8
946 # "invoke summon pet monster" = 8
947
948 if ($_ =~ $regexp_partial) {
949 push @scores, [$_, length $text, $_];
950 }
951
952 # 3. Abbreviation match
953 # attempts to use first word of text as an abbreviated command
954 # score is length of word + 1 - 3 per non-word-initial character
955
956 if (my @penalty = $_ =~ $regexp_abbrev) {
957 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
958 }
959
960 # Pick the best option for this command
961 push @match, (sort {
962 $b->[1] <=> $a->[1]
963 } @scores)[0];
216 } 964 }
217 }
218}
219 965
220sub key_up { 966 # @match is now [command object, command with arguments]
967 @match = map [$self->{command}{$_->[0]}, $_->[2]],
968 sort {
969 $b->[1] <=> $a->[1]
970 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
971 or (length $b->[0]) <=> (length $a->[0])
972 } @match;
973 }
974
975 $self->{last_search} = $text;
976 $self->{last_match} = \@match;
977
978 $self->{select_offset} = 0;
979 }
980
981 my @labels = @{ $self->{label} };
982 my @matches = @{ $self->{last_match} || [] };
983
984 if ($self->{select_offset}) {
985 splice @matches, 0, $self->{select_offset}, ();
986
987 my $label = shift @labels;
988 $label->set_text ("...");
989 $label->set_tooltip ("Use Cursor-Up to view previous matches");
990 }
991
992 for my $label (@labels) {
993 $label->{fg} = [1, 1, 1, 1];
994 $label->{bg} = [0, 0, 0, 0];
995 }
996
997 if (@matches) {
998 $self->{select} = "$matches[0][1]";
999
1000 $labels[0]->{fg} = [0, 0, 0, 1];
1001 $labels[0]->{bg} = [1, 1, 1, 0.8];
1002 } else {
1003 $self->{select} = "$text";
1004 }
1005
1006 for my $match (@matches) {
1007 my $label = shift @labels;
1008
1009 if (@labels) {
1010 $label->set_text ("$match->[1]");
1011 $label->set_tooltip ("$match->[0][1]");
1012 } else {
1013 $label->set_text ("...");
1014 $label->set_tooltip ("Use Cursor-Down to view more matches");
1015 last;
1016 }
1017 }
1018
1019 for my $label (@labels) {
1020 $label->set_text ("");
1021 $label->set_tooltip ("");
1022 }
1023
1024 $self->update;
1025}
1026
1027sub _draw {
221 my ($self, $ev) = @_; 1028 my ($self) = @_;
222 1029
223 my $mod = $ev->key_mod; 1030 # hack
224 my $sym = $ev->key_sym; 1031 local $DC::UI::FOCUS = $self->{entry};
225 1032
226 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 1033 $self->SUPER::_draw;
227 $::CONN->user_send ("fire_stop");
228 }
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop");
231 }
232}
233
234sub add_command {
235 my ($self, $command, $widget, $cb) = @_;
236
237 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
238 warn "$command|$abbrev|$widget\n";#d#
239} 1034}
240 1035
2411 10361
1037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines