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.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.64 by root, Sun Jun 18 17:23:35 2006 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient::OpenGL; 8use CFClient::OpenGL;
9 9
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11
12my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 15
12sub new { 16sub new {
13 my $class = shift; 17 my $class = shift;
14 18
15 my $self = $class->SUPER::new ( 19 my $self = $class->SUPER::new (
… …
34 . "To enter a verbatim command to send to the server, just type the command, " 38 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 40 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 41 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 44 ;
41 45
42 $self 46 $self
43} 47}
44 48
… …
58 my ($self) = @_; 62 my ($self) = @_;
59 63
60 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
61} 65}
62 66
63sub button_down { 67sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
65 69
66 return unless $::CONN; 70 return unless $::CONN;
67 71
68 $self->focus_in; 72 $self->grab_focus;
69 73
70 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 75 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 76 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73
74 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76 77
77 $x -= int 0.5 * $::MAP->w; 78 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 79 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 80
83 $::CONN->lookat ($x, $y) 81 $::CONN->lookat ($x, $y)
84 if $::CONN; 82 if $::CONN;
85 83
86 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
… …
100 } 98 }
101 99
102 1 100 1
103} 101}
104 102
105sub button_up { 103sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
107 105
108 delete $self->{motion}; 106 delete $self->{motion};
109 107
110 1 108 1
111} 109}
112 110
113sub mouse_motion { 111sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
115 113
116 if ($self->{motion}) { 114 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 115 $self->{motion}->($ev, $x, $y);
118 } else { 116 } else {
… …
150 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
153); 151);
154 152
155sub key_down { 153sub invoke_key_down {
156 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
157 155
158 return 0 unless $::CONN; 156 return 0 unless $::CONN;
159 157
160 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
… …
197 } 195 }
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [], 197 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub { 198 sub {
201 my ($mod, $sym, $cmds) = @_; 199 my ($mod, $sym, $cmds) = @_;
202 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 200 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
203 }); 201 });
204 $::BIND_EDITOR->start; 202 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show; 203 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop; 205 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit; 206 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide; 207 $::BIND_EDITOR->hide;
210 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 208 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
211 $::CONN->user_send ($_) for @$bind_cmd; 209 $::CONN->user_send ($_) for @$bind_cmd;
212 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 211 $self->{completer}->key_down ($ev);
214 $self->{completer}->show; 212 $self->{completer}->show;
215 } else { 213 } else {
… …
217 } 215 }
218 216
219 1 217 1
220} 218}
221 219
222sub key_up { 220sub invoke_key_up {
223 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
224 222
225 my $res = 0; 223 my $res = 0;
226 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
… …
250 } 248 }
251 249
252 $res 250 $res
253} 251}
254 252
253sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_;
255
256 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
257 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
258
259 $self->{magicmap} = [$x, $y, $w, $h, $data];
260
261 $self->update;
262}
263
255sub draw { 264sub draw {
256 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
257 268
258 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
260 271
261 return 272 return
262 unless $::CONN && ($focused || !$::FAST); 273 unless $focused || !$::FAST;
263 274
264 if (delete $self->{need_update}) { 275 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D,
294 GL_ALPHA,
295 3, 3,
296 GL_ALPHA, GL_FLOAT,
297 (pack "f*", @{ $self->{smooth_matrix} }),
298 );
299 glEnable GL_CONVOLUTION_2D;
300 }
301
265 $self->{fow_texture} ||= glGenTexture; 302 $self->{fow_texture} = new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $data,
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310 } else {
311 delete $self->{fow_texture};
312 }
266 313
267 glNewList $self->{list}; 314 glNewList $self->{list};
268 315
269 if ($::MAP) {
270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272
273 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
274 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
275 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
276 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
277
278 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 319
281 glTranslate $sx0, $sy0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 321
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
284 323
285 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
286 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
287 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
288 glConvolutionFilter2D (
289 GL_CONVOLUTION_2D,
290 GL_ALPHA,
291 3, 3,
292 GL_ALPHA, GL_FLOAT,
293 (pack "f*", @{ $self->{smooth_matrix} }),
294 );
295 glEnable GL_CONVOLUTION_2D;
296 }
297
298 $self->{fow_texture_name} ||= glGenTexture;
299 # try to re-use the texture name: TODO improve texture class instead
300
301 $self->{fow_texture} = new CFClient::Texture
302 w => $w,
303 h => $h,
304 data => $data,
305 name => $self->{fow_texture_name},
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310
311 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 327
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 330
317 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
318 } 332 }
319 333
334 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 }
344
320 glPopMatrix; 345 glPopMatrix;
321 }
322
323 glEndList; 346 glEndList;
324 } 347 }
325 348
326 glPushMatrix;
327 glCallList $self->{list}; 349 glCallList $self->{list};
328 glPopMatrix;
329 350
330 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 352 unless ($focused) {
332 (delete $self->{out_of_focus})->destroy
333 if $self->{out_of_focus};
334 } else {
335 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 354 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 356 glBegin GL_QUADS;
339 glVertex 0, 0; 357 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
343 glEnd; 361 glEnd;
344 glDisable GL_BLEND; 362 glDisable GL_BLEND;
345
346# $self->{out_of_focus} ||= do {
347# my $label = new CFClient::UI::Label
348# x => 0,
349# y => 0,
350# z => 1,
351# ellipsise => 0,
352# text => "map out of focus (click map to play)";
353#
354# $label->show;
355# $label->update;
356#
357# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358# $label->move_abs (
359# ($::WIDTH - $label->{w}) * 0.5,
360# ($::HEIGHT - $label->{h}) * 0.5,
361# );
362# });
363#
364# $label
365# };
366 } 363 }
367} 364}
368 365
369sub DESTROY { 366sub DESTROY {
370 my $self = shift; 367 my $self = shift;
… …
383 380
384sub size_request { 381sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 383}
387 384
388sub size_allocate { 385sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
390 387
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 388 $self->update;
389
390 1
393} 391}
394 392
395sub update { 393sub update {
396 my ($self) = @_; 394 my ($self) = @_;
397 395
… …
482 ]; 480 ];
483 481
484 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
485 on_changed => sub { 483 on_changed => sub {
486 $self->update_labels; 484 $self->update_labels;
485 0
487 }, 486 },
488 on_button_down => sub { 487 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 488 my ($entry, $ev, $x, $y) = @_;
490 489
491 if ($ev->{button} == 3) { 490 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 491 (new CFClient::UI::Menu
493 items => [ 492 items => [
494 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 493 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ], 494 ],
496 )->popup ($ev); 495 )->popup ($ev);
497 return 1; 496 return 1;
498 } 497 }
499 0 498 0
… …
564 563
565 $self->{entry}->set_text ($prefix); 564 $self->{entry}->set_text ($prefix);
566 $self->show; 565 $self->show;
567} 566}
568 567
569sub size_allocate { 568sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 569 my ($self, $w, $h) = @_;
571 570
572 $self->SUPER::size_allocate ($w, $h);
573 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 571 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
572
573 $self->SUPER::invoke_size_allocate ($w, $h)
574} 574}
575 575
576sub show { 576sub show {
577 my ($self) = @_; 577 my ($self) = @_;
578 578
579 $self->SUPER::show; 579 $self->SUPER::show;
580 $self->{entry}->focus_in; 580 $self->{entry}->grab_focus;
581} 581}
582 582
583sub hide { 583sub hide {
584 my ($self) = @_; 584 my ($self) = @_;
585 585
586 $self->SUPER::hide; 586 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 587 $self->{entry}->set_text ("");
588} 588}
589 589
590sub key_down { 590sub invoke_key_down {
591 my ($self, $ev) = @_; 591 my ($self, $ev) = @_;
592 592
593 $self->{entry}->key_down ($ev) 593 $self->{entry}->key_down ($ev)
594} 594}
595 595

Diff Legend

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