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

Diff Legend

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