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.45 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.62 by root, Thu Jun 15 16:44:20 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 (
16 z => -1, 20 z => -1,
17 can_focus => 1, 21 can_focus => 1,
18 list => glGenList, 22 list => glGenList,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
19 @_ 30 @_
20 ); 31 );
21 32
22 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 34 command => $self->{command},
… …
54} 65}
55 66
56sub button_down { 67sub button_down {
57 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
58 69
70 return unless $::CONN;
71
59 $self->focus_in; 72 $self->focus_in;
60 73
61 if ($ev->{button} == 2) { 74 if ($ev->{button} == 1) {
75 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77
78 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh};
80
81 $::CONN->lookat ($x, $y)
82 if $::CONN;
83
84 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 87
65 $self->{motion} = sub { 88 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 95
73 $self->update; 96 $self->update;
74 }; 97 };
75 } 98 }
99
100 1
76} 101}
77 102
78sub button_up { 103sub button_up {
79 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
80 105
81 delete $self->{motion}; 106 delete $self->{motion};
107
108 1
82} 109}
83 110
84sub mouse_motion { 111sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
86 113
114 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
88} 121}
89 122
90sub size_request { 123sub size_request {
91 ( 124 (
92 1 + 32 * int $::WIDTH / 32, 125 1 + 32 * int $::WIDTH / 32,
… …
118); 151);
119 152
120sub key_down { 153sub key_down {
121 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
122 155
123 return unless $::CONN; 156 return 0 unless $::CONN;
124 157
125 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
128 161
… …
148 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 182 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++; 191 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 193 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
… …
165 }); 201 });
166 $::BIND_EDITOR->start; 202 $::BIND_EDITOR->start;
167 $::BIND_EDITOR->show; 203 $::BIND_EDITOR->show;
168 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
169 $::BIND_EDITOR->stop; 205 $::BIND_EDITOR->stop;
170 $::BIND_EDITOR->ask_for_bind (1); 206 $::BIND_EDITOR->ask_for_bind_and_commit;
171 $::BIND_EDITOR->hide; 207 $::BIND_EDITOR->hide;
172 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 208 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
173 $::CONN->user_send ($_) for @$bind_cmd; 209 $::CONN->user_send ($_) for @$bind_cmd;
174 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
175 $self->{completer}->key_down ($ev); 211 $self->{completer}->key_down ($ev);
176 $self->{completer}->show; 212 $self->{completer}->show;
213 } else {
214 return 0;
215 }
216
177 } 217 1
178} 218}
179 219
180sub key_up { 220sub key_up {
181 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
182 222
223 my $res = 0;
183 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
184 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
185 226
227 if ($::CFG->{shift_fire_stop}) {
186 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
187 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
231 $res = 1;
232 }
233 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir};
241 $res = 1;
242 }
188 } 243 }
244
189 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
190 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
247 $res = 1;
191 } 248 }
249
250 $res
251}
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;
192} 262}
193 263
194sub draw { 264sub draw {
195 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
196 268
197 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
198 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
199 271
200 return 272 return
201 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
202 274
203 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
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 }
313
204 glNewList $self->{list}; 314 glNewList $self->{list};
205 315
206 if ($::MAP) {
207 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
208 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
209
210 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
211 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
212
213 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
214 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
215 319
216 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
217 321
218 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
219 323
220 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
221 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
222 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
223 glConvolutionFilter2D (
224 GL_CONVOLUTION_2D,
225 GL_ALPHA,
226 3, 3,
227 GL_ALPHA, GL_FLOAT,
228 pack "f*",
229 0.05, 0.13, 0.05,
230 0.13, 0.30, 0.13,
231 0.05, 0.13, 0.05,
232 );
233 glEnable GL_CONVOLUTION_2D;
234 }
235
236 $self->{fow_texture_name} ||= glGenTexture;
237 # try to re-use the texture name: TODO improve texture class instead
238
239 $self->{fow_texture} = new CFClient::Texture
240 w => $w,
241 h => $h,
242 data => $data,
243 name => $self->{fow_texture_name},
244 internalformat => GL_ALPHA,
245 format => GL_ALPHA;
246
247 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
248
249 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
251 327
252 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
253 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
254 330
255 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
256 } 332 }
257 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
258 glPopMatrix; 345 glPopMatrix;
259 }
260
261 glEndList; 346 glEndList;
262 } 347 }
263 348
264 glPushMatrix;
265 glCallList $self->{list}; 349 glCallList $self->{list};
266 glPopMatrix;
267 350
268 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
269 if ($focused) { 352 unless ($focused) {
270 (delete $self->{out_of_focus})->destroy
271 if $self->{out_of_focus};
272 } else {
273 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
274 glEnable GL_BLEND; 354 glEnable GL_BLEND;
275 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
276 glBegin GL_QUADS; 356 glBegin GL_QUADS;
277 glVertex 0, 0; 357 glVertex 0, 0;
278 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
279 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
280 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
281 glEnd; 361 glEnd;
282 glDisable GL_BLEND; 362 glDisable GL_BLEND;
283
284# $self->{out_of_focus} ||= do {
285# my $label = new CFClient::UI::Label
286# x => 0,
287# y => 0,
288# z => 1,
289# ellipsise => 0,
290# text => "map out of focus (click map to play)";
291#
292# $label->show;
293# $label->update;
294#
295# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
296# $label->move_abs (
297# ($::WIDTH - $label->{w}) * 0.5,
298# ($::HEIGHT - $label->{h}) * 0.5,
299# );
300# });
301#
302# $label
303# };
304 } 363 }
305} 364}
306 365
307sub DESTROY { 366sub DESTROY {
308 my $self = shift; 367 my $self = shift;
… …
421 480
422 $self->{entry} = new CFClient::UI::Entry 481 $self->{entry} = new CFClient::UI::Entry
423 on_changed => sub { 482 on_changed => sub {
424 $self->update_labels; 483 $self->update_labels;
425 }, 484 },
485 on_button_down => sub {
486 my ($entry, $ev, $x, $y) = @_;
487
488 if ($ev->{button} == 3) {
489 (new CFClient::UI::Menu
490 items => [
491 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
492 ],
493 )->popup ($ev);
494 return 1;
495 }
496 0
497 },
426 on_key_down => sub { 498 on_key_down => sub {
427 my ($entry, $ev) = @_; 499 my ($entry, $ev) = @_;
428 500
429 my $self = $entry->{parent}{parent}; 501 my $self = $entry->{parent}{parent};
430 502
431 if ($ev->{sym} == 13) { 503 if ($ev->{sym} == 13) {
432 if (exists $self->{select}) { 504 if (exists $self->{select}) {
433 $self->{last_command} = $self->{select}; 505 $self->{last_command} = $self->{select};
434 $::CONN->user_send ($self->{select}); 506 $::CONN->user_send ($self->{select});
507
508 unshift @{$self->{history}}, $self->{select};
509 $self->{hist_ptr} = 0;
510
435 $self->hide; 511 $self->hide;
436 } 512 }
437 } elsif ($ev->{sym} == 27) { 513 } elsif ($ev->{sym} == 27) {
514 $self->{hist_ptr} = 0;
438 $self->hide; 515 $self->hide;
439 return; 516 return;
440 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 517 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
518 if ($self->{hist_ptr} > 1) {
519 $self->{hist_ptr}--;
520 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
521 } elsif ($self->{hist_ptr} > 0) {
522 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{hist_saveback});
524 } else {
441 ++$self->{select_offset} 525 ++$self->{select_offset}
442 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 526 if $self->{select_offset} < $#{ $self->{last_match} || [] };
527 }
443 $self->update_labels; 528 $self->update_labels;
444 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 529 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
530 if ($self->{select_offset}) {
445 --$self->{select_offset} 531 --$self->{select_offset}
532 } else {
533 unless ($self->{hist_ptr}) {
534 $self->{hist_saveback} = $self->{entry}->get_text;
535 }
536 if ($self->{hist_ptr} <= $#{$self->{history}}) {
446 if $self->{select_offset}; 537 $self->{hist_ptr}++;
538 }
539 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
540 if exists $self->{history}->[$self->{hist_ptr} - 1];
541 }
447 $self->update_labels; 542 $self->update_labels;
448 } else { 543 } else {
449 return 0; 544 return 0;
450 } 545 }
451 546
… …
490} 585}
491 586
492sub key_down { 587sub key_down {
493 my ($self, $ev) = @_; 588 my ($self, $ev) = @_;
494 589
495 $self->{entry}->key_down ($ev); 590 $self->{entry}->key_down ($ev)
496} 591}
497 592
498sub update_labels { 593sub update_labels {
499 my ($self) = @_; 594 my ($self) = @_;
500 595

Diff Legend

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