… | |
… | |
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 | |
|
|
32 | sub set_tilesize { |
|
|
33 | my ($self, $tilesize) = @_; |
|
|
34 | |
|
|
35 | $self->{tilesize} = $tilesize; |
42 | } |
36 | } |
43 | |
37 | |
44 | sub add_command { |
38 | sub 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 | |
56 | sub clr_commands { |
50 | sub 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 | |
65 | sub server_login { |
59 | sub server_login { |
66 | my ($server) = @_; |
60 | my ($server) = @_; |
67 | |
61 | |
… | |
… | |
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 = CFPlus::lwp_useragent; |
… | |
… | |
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 CFPlus::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} + CFPlus::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} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
184 | |
178 | |
185 | $x -= CFPlus::floor $::MAP->w * 0.5; |
179 | $x -= CFPlus::floor $::MAP->w * 0.5; |
186 | $y -= CFPlus::floor $::MAP->h * 0.5; |
180 | $y -= CFPlus::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; |
… | |
… | |
285 | |
275 | |
286 | 1 |
276 | 1 |
287 | } |
277 | } |
288 | |
278 | |
289 | sub size_request { |
279 | sub size_request { |
|
|
280 | my ($self) = @_; |
|
|
281 | |
290 | ( |
282 | ( |
291 | 32 * CFPlus::ceil $::WIDTH / 32, |
283 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
292 | 32 * CFPlus::ceil $::HEIGHT / 32, |
284 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
293 | ) |
285 | ) |
294 | } |
286 | } |
295 | |
287 | |
296 | sub update { |
288 | sub 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 | |
303 | my %DIR = ( |
295 | my %DIR = ( |
|
|
296 | ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], |
304 | CFPlus::SDLK_KP8, [1, "north"], |
297 | ( "," . CFPlus::SDLK_KP8 ), [1, "north"], |
305 | CFPlus::SDLK_KP9, [2, "northeast"], |
298 | ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], |
306 | CFPlus::SDLK_KP6, [3, "east"], |
299 | ( "," . CFPlus::SDLK_KP6 ), [3, "east"], |
307 | CFPlus::SDLK_KP3, [4, "southeast"], |
300 | ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], |
308 | CFPlus::SDLK_KP2, [5, "south"], |
301 | ( "," . CFPlus::SDLK_KP2 ), [5, "south"], |
309 | CFPlus::SDLK_KP1, [6, "southwest"], |
302 | ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], |
310 | CFPlus::SDLK_KP4, [7, "west"], |
303 | ( "," . CFPlus::SDLK_KP4 ), [7, "west"], |
311 | CFPlus::SDLK_KP7, [8, "northwest"], |
304 | ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], |
312 | |
305 | |
313 | CFPlus::SDLK_UP, [1, "north"], |
306 | ( "," . CFPlus::SDLK_UP ), [1, "north"], |
|
|
307 | ("1," . CFPlus::SDLK_UP ), [2, "northeast"], |
314 | CFPlus::SDLK_RIGHT, [3, "east"], |
308 | ( "," . CFPlus::SDLK_RIGHT), [3, "east"], |
|
|
309 | ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], |
315 | CFPlus::SDLK_DOWN, [5, "south"], |
310 | ( "," . CFPlus::SDLK_DOWN ), [5, "south"], |
|
|
311 | ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], |
316 | CFPlus::SDLK_LEFT, [7, "west"], |
312 | ( "," . CFPlus::SDLK_LEFT ), [7, "west"], |
|
|
313 | ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], |
317 | ); |
314 | ); |
318 | |
315 | |
319 | sub invoke_key_down { |
316 | sub invoke_key_down { |
320 | my ($self, $ev) = @_; |
317 | my ($self, $ev) = @_; |
321 | |
318 | |
… | |
… | |
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 &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
327 | |
324 | |
328 | if ($uni == ord "\t") { |
325 | if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { |
329 | $::PL_WINDOW->toggle_visibility; |
|
|
330 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
|
|
331 | $::HELP_WINDOW->toggle_visibility; |
|
|
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 | |
|
|
345 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
|
|
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) { |
326 | if ($mod & CFPlus::KMOD_SHIFT) { |
371 | $self->{shft}++; |
327 | $self->{shft}++; |
372 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
328 | if ($dir->[0] != $self->{fire_dir}) { |
373 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
329 | $::CONN->user_send ("fire $dir->[0]"); |
374 | } |
330 | } |
375 | $self->{fire_dir} = $DIR{$sym}[0]; |
331 | $self->{fire_dir} = $dir->[0]; |
376 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
332 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
377 | $self->{ctrl}++; |
333 | $self->{ctrl}++; |
378 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
334 | $::CONN->user_send ("run $dir->[0]"); |
379 | } else { |
335 | } else { |
380 | $::CONN->user_send ("$DIR{$sym}[1]"); |
336 | $::CONN->user_send ("$dir->[1]"); |
381 | } |
337 | } |
382 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
338 | |
383 | $self->{completer}->inject_key_down ($ev); |
|
|
384 | $self->{completer}->show; |
|
|
385 | } else { |
|
|
386 | return 0; |
339 | return 1; |
387 | } |
|
|
388 | |
|
|
389 | 1 |
340 | } |
|
|
341 | |
|
|
342 | 0 |
390 | } |
343 | } |
391 | |
344 | |
392 | sub invoke_key_up { |
345 | sub invoke_key_up { |
393 | my ($self, $ev) = @_; |
346 | my ($self, $ev) = @_; |
394 | |
347 | |
… | |
… | |
401 | $::CONN->user_send ("fire_stop"); |
354 | $::CONN->user_send ("fire_stop"); |
402 | delete $self->{fire_dir}; |
355 | delete $self->{fire_dir}; |
403 | $res = 1; |
356 | $res = 1; |
404 | } |
357 | } |
405 | } else { |
358 | } else { |
406 | if (exists $DIR{$sym} && delete $self->{shft}) { |
359 | if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
407 | $::CONN->user_send ("fire_stop"); |
360 | $::CONN->user_send ("fire_stop"); |
408 | delete $self->{fire_dir}; |
361 | delete $self->{fire_dir}; |
409 | $res = 1; |
362 | $res = 1; |
410 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
363 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) |
|
|
364 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
411 | $::CONN->user_send ("fire_stop"); |
365 | $::CONN->user_send ("fire_stop"); |
412 | delete $self->{fire_dir}; |
366 | delete $self->{fire_dir}; |
413 | $res = 1; |
367 | $res = 1; |
414 | } |
368 | } |
415 | } |
369 | } |
… | |
… | |
420 | } |
374 | } |
421 | |
375 | |
422 | $res |
376 | $res |
423 | } |
377 | } |
424 | |
378 | |
|
|
379 | sub invoke_visibility_change { |
|
|
380 | my ($self) = @_; |
|
|
381 | |
|
|
382 | $self->refresh_hook; |
|
|
383 | |
|
|
384 | 0 |
|
|
385 | } |
|
|
386 | |
425 | sub set_magicmap { |
387 | sub set_magicmap { |
426 | my ($self, $w, $h, $x, $y, $data) = @_; |
388 | my ($self, $w, $h, $x, $y, $data) = @_; |
427 | |
389 | |
428 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
390 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
429 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
391 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
… | |
… | |
431 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
393 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
432 | |
394 | |
433 | $self->update; |
395 | $self->update; |
434 | } |
396 | } |
435 | |
397 | |
|
|
398 | sub refresh_hook { |
|
|
399 | my ($self) = @_; |
|
|
400 | |
|
|
401 | if ($::MAP && $::CONN) { |
|
|
402 | if (delete $self->{need_update}) { |
|
|
403 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
404 | |
|
|
405 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
406 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
407 | |
|
|
408 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
409 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
410 | |
|
|
411 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
412 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
413 | |
|
|
414 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
415 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
416 | |
|
|
417 | if ($::CFG->{fow_enable}) { |
|
|
418 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
|
|
419 | |
|
|
420 | $self->{fow_texture} = new CFPlus::Texture |
|
|
421 | w => $w, |
|
|
422 | h => $h, |
|
|
423 | data => $data, |
|
|
424 | internalformat => GL_ALPHA, |
|
|
425 | format => GL_ALPHA; |
|
|
426 | } else { |
|
|
427 | delete $self->{fow_texture}; |
|
|
428 | } |
|
|
429 | |
|
|
430 | glNewList ($self->{list} ||= glGenList); |
|
|
431 | |
|
|
432 | glPushMatrix; |
|
|
433 | glTranslate $sx0, $sy0; |
|
|
434 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
435 | |
|
|
436 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
|
|
437 | |
|
|
438 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
439 | |
|
|
440 | if (my $tex = $self->{fow_texture}) { |
|
|
441 | glPushMatrix; |
|
|
442 | glScale 1/3, 1/3; |
|
|
443 | glEnable GL_TEXTURE_2D; |
|
|
444 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
445 | |
|
|
446 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
447 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
448 | |
|
|
449 | glDisable GL_TEXTURE_2D; |
|
|
450 | glPopMatrix; |
|
|
451 | } |
|
|
452 | |
|
|
453 | if ($self->{magicmap}) { |
|
|
454 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
455 | |
|
|
456 | $x += $::MAP->ox + $self->{dx}; |
|
|
457 | $y += $::MAP->oy + $self->{dy}; |
|
|
458 | |
|
|
459 | glTranslate - $x - 1, - $y - 1; |
|
|
460 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
461 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
462 | } |
|
|
463 | |
|
|
464 | glPopMatrix; |
|
|
465 | glEndList; |
|
|
466 | } |
|
|
467 | } else { |
|
|
468 | glDeleteList delete $self->{list} |
|
|
469 | if $self->{list}; |
|
|
470 | } |
|
|
471 | } |
|
|
472 | |
436 | sub draw { |
473 | sub draw { |
437 | my ($self) = @_; |
474 | my ($self) = @_; |
438 | |
475 | |
439 | return unless $::MAP; |
476 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
|
|
477 | |
|
|
478 | return unless $self->{list}; |
440 | |
479 | |
441 | my $focused = $CFPlus::UI::FOCUS == $self |
480 | my $focused = $CFPlus::UI::FOCUS == $self |
442 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
481 | || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; |
443 | |
482 | |
444 | return |
483 | return |
445 | unless $focused || !$::FAST; |
484 | unless $focused || !$::FAST; |
446 | |
485 | |
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}; |
486 | glCallList $self->{list}; |
525 | |
487 | |
526 | # TNT2 emulates logops in software (or worse :) |
488 | # TNT2 emulates logops in software (or worse :) |
527 | unless ($focused) { |
489 | unless ($focused) { |
528 | glColor 0.4, 0.2, 0.2, 0.6; |
490 | glColor_premultiply 0, 0, 1, 0.25; |
529 | glEnable GL_BLEND; |
491 | glEnable GL_BLEND; |
530 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
492 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
531 | glBegin GL_QUADS; |
493 | glBegin GL_QUADS; |
532 | glVertex 0, 0; |
494 | glVertex 0, 0; |
533 | glVertex 0, $::HEIGHT; |
495 | glVertex 0, $::HEIGHT; |
534 | glVertex $::WIDTH, $::HEIGHT; |
496 | glVertex $::WIDTH, $::HEIGHT; |
535 | glVertex $::WIDTH, 0; |
497 | glVertex $::WIDTH, 0; |
… | |
… | |
546 | $self->SUPER::DESTROY; |
508 | $self->SUPER::DESTROY; |
547 | } |
509 | } |
548 | |
510 | |
549 | package CFPlus::MapWidget::MapMap; |
511 | package CFPlus::MapWidget::MapMap; |
550 | |
512 | |
|
|
513 | use strict; |
|
|
514 | use utf8; |
|
|
515 | |
551 | our @ISA = CFPlus::UI::Base::; |
516 | our @ISA = CFPlus::UI::Base::; |
552 | |
517 | |
553 | use Time::HiRes qw(time); |
518 | use Time::HiRes qw(time); |
554 | use CFPlus::OpenGL; |
519 | use CFPlus::OpenGL; |
555 | |
520 | |
556 | sub size_request { |
521 | sub size_request { |
557 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
522 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
558 | } |
523 | } |
559 | |
524 | |
560 | sub invoke_size_allocate { |
525 | sub refresh_hook { |
561 | my ($self, $w, $h) = @_; |
526 | my ($self) = @_; |
562 | |
527 | |
563 | $self->update; |
528 | if ($::MAP && $self->{texture_atime} < time) { |
564 | |
|
|
565 | 1 |
|
|
566 | } |
|
|
567 | |
|
|
568 | sub update { |
|
|
569 | my ($self) = @_; |
|
|
570 | |
|
|
571 | delete $self->{texture_atime}; |
|
|
572 | $self->SUPER::update; |
|
|
573 | } |
|
|
574 | |
|
|
575 | sub _draw { |
|
|
576 | my ($self) = @_; |
|
|
577 | |
|
|
578 | $::MAP or return; |
|
|
579 | |
|
|
580 | my ($w, $h) = @$self{qw(w h)}; |
529 | my ($w, $h) = @$self{qw(w h)}; |
581 | |
530 | |
582 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
531 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
583 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
532 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
584 | |
533 | |
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); |
534 | my $ox = 0.5 * ($w - $sw); |
589 | my $oy = 0.5 * ($h - $sh); |
535 | my $oy = 0.5 * ($h - $sh); |
590 | |
536 | |
591 | glEnable GL_BLEND; |
537 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
592 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
538 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
593 | glEnable GL_TEXTURE_2D; |
|
|
594 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
595 | |
539 | |
596 | if ($self->{texture_atime} < time) { |
540 | #TODO: map scale is completely borked |
|
|
541 | |
|
|
542 | my $x0 = int $ox - $sx + 0.5; |
|
|
543 | my $y0 = int $oy - $sy + 0.5; |
|
|
544 | |
|
|
545 | $self->{sw} = $sw; |
|
|
546 | $self->{sh} = $sh; |
|
|
547 | |
|
|
548 | $self->{x0} = $x0; |
|
|
549 | $self->{y0} = $y0; |
|
|
550 | |
597 | $self->{texture_atime} = time + 1/3; |
551 | $self->{texture_atime} = time + 1/3; |
598 | |
552 | |
599 | $self->{texture} = |
553 | $self->{texture} = |
600 | new CFPlus::Texture |
554 | new CFPlus::Texture |
601 | w => $w, |
555 | w => $w, |
602 | h => $h, |
556 | h => $h, |
603 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
557 | 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; |
558 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
605 | } |
559 | } |
|
|
560 | } |
|
|
561 | |
|
|
562 | sub invoke_visibility_change { |
|
|
563 | my ($self) = @_; |
|
|
564 | |
|
|
565 | $self->refresh_hook; |
|
|
566 | |
|
|
567 | 0 |
|
|
568 | } |
|
|
569 | |
|
|
570 | sub invoke_size_allocate { |
|
|
571 | my ($self, $w, $h) = @_; |
|
|
572 | |
|
|
573 | $self->update; |
|
|
574 | |
|
|
575 | 1 |
|
|
576 | } |
|
|
577 | |
|
|
578 | sub update { |
|
|
579 | my ($self) = @_; |
|
|
580 | |
|
|
581 | delete $self->{texture_atime}; |
|
|
582 | $self->SUPER::update; |
|
|
583 | } |
|
|
584 | |
|
|
585 | sub _draw { |
|
|
586 | my ($self) = @_; |
|
|
587 | |
|
|
588 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
|
|
589 | |
|
|
590 | $self->{texture} or return; |
|
|
591 | |
|
|
592 | glEnable GL_BLEND; |
|
|
593 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
594 | glEnable GL_TEXTURE_2D; |
|
|
595 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
606 | |
596 | |
607 | $self->{texture}->draw_quad (0, 0); |
597 | $self->{texture}->draw_quad (0, 0); |
608 | |
598 | |
609 | glDisable GL_TEXTURE_2D; |
599 | glDisable GL_TEXTURE_2D; |
610 | |
600 | |
611 | glTranslate 0.375, 0.375; |
601 | 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 | |
602 | |
618 | glColor 1, 1, 0, 1; |
603 | glColor 1, 1, 0, 1; |
619 | glBegin GL_LINE_LOOP; |
604 | glBegin GL_LINE_LOOP; |
620 | glVertex $x0 , $y0 ; |
605 | glVertex $self->{x0} , $self->{y0} ; |
621 | glVertex $x0 , $y0 + $sh; |
606 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
622 | glVertex $x0 + $sw, $y0 + $sh; |
607 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
623 | glVertex $x0 + $sw, $y0 ; |
608 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
624 | glEnd; |
609 | glEnd; |
625 | |
610 | |
626 | glDisable GL_BLEND; |
611 | glDisable GL_BLEND; |
627 | } |
612 | } |
628 | |
613 | |