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.18 by root, Tue Apr 25 12:56:34 2006 UTC

1package CFClient::MapWidget; 1package CFClient::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
7use SDL::OpenGL; 8use CFClient::OpenGL;
8 9
9our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
10 11
11sub new { 12sub new {
12 my $class = shift; 13 my $class = shift;
13 14
14 $class->SUPER::new ( 15 $class->SUPER::new (
15 z => -1, 16 z => -1,
16 can_focus => 1, 17 can_focus => 1,
17 list => (glGenLists 1), 18 list => glGenList,
18 @_ 19 @_
19 ) 20 )
20} 21}
21 22
22sub key_down { 23sub DESTROY {
23 print "MAPKEYDOWN\n"; 24 my $self = shift;
24}
25 25
26sub key_up { 26 glDeleteList $self->{list};
27
28 $self->SUPER::DESTROY;
27} 29}
28 30
29sub button_down { 31sub button_down {
30 my ($self, $ev, $x, $y) = @_; 32 my ($self, $ev, $x, $y) = @_;
31 33
32 $self->focus_in; 34 $self->focus_in;
33 35
34 if ($ev->button == 2) { 36 if ($ev->{button} == 2) {
35 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 37 my ($ox, $oy) = ($ev->{x}, $ev->{y});
36 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
37 39
38 $self->{motion} = sub { 40 $self->{motion} = sub {
39 my ($ev, $x, $y) = @_; 41 my ($ev, $x, $y) = @_;
40 42
41 ($x, $y) = ($ev->motion_x, $ev->motion_y); 43 ($x, $y) = ($ev->{x}, $ev->{y});
42 44
43 $::CFG->{map_shift_x} = $bw + $x - $ox; 45 $::CFG->{map_shift_x} = $bw + $x - $ox;
44 $::CFG->{map_shift_y} = $bh + $y - $oy; 46 $::CFG->{map_shift_y} = $bh + $y - $oy;
45 47
46 $self->update; 48 $self->update;
… …
76 78
77sub draw { 79sub draw {
78 my ($self) = @_; 80 my ($self) = @_;
79 81
80 if (delete $self->{need_update}) { 82 if (delete $self->{need_update}) {
81 glNewList $self->{list}, GL_COMPILE; 83 glNewList $self->{list};
82 84
83 if ($::MAP) { 85 if ($::MAP) {
84 my $sw = int $::WIDTH / 32; 86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
85 my $sh = int $::HEIGHT / 32; 87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
86 88
87 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 89 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
88 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 90 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
91
92 glPushMatrix;
93 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
89 94
90 glTranslate $sx0 - 32, $sy0 - 32, 0; 95 glTranslate $sx0 - 32, $sy0 - 32, 0;
91 96
92 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
93 98
… …
98 GL_CONVOLUTION_2D, 103 GL_CONVOLUTION_2D,
99 GL_ALPHA, 104 GL_ALPHA,
100 3, 3, 105 3, 3,
101 GL_ALPHA, GL_FLOAT, 106 GL_ALPHA, GL_FLOAT,
102 pack "f*", 107 pack "f*",
103 0.1, 0.1, 0.1, 108 0.05, 0.13, 0.05,
104 0.1, 0.2, 0.1, 109 0.13, 0.30, 0.13,
105 0.1, 0.1, 0.1, 110 0.05, 0.13, 0.05,
106 ); 111 );
107 glEnable GL_CONVOLUTION_2D; 112 glEnable GL_CONVOLUTION_2D;
108 } 113 }
109 114
110 $self->{fow_texture} = new CFClient::Texture 115 $self->{fow_texture} = new CFClient::Texture
… …
119 glEnable GL_BLEND; 124 glEnable GL_BLEND;
120 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
121 glEnable GL_TEXTURE_2D; 126 glEnable GL_TEXTURE_2D;
122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
123 128
124 glColor +($::CFG->{fow_intensity}) x 3, 1; 129 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
125 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
126 131
127 glDisable GL_TEXTURE_2D; 132 glDisable GL_TEXTURE_2D;
128 glDisable GL_BLEND; 133 glDisable GL_BLEND;
129 } 134 }
130 135
131 # HACK BEGIN 136 glPopMatrix;
132 {
133 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
134 my ($w, $h) = (250, 250);
135
136 glEnable GL_BLEND;
137 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
138 glEnable GL_TEXTURE_2D;
139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
140
141 $self->{mapmap_texture} =
142 new CFClient::Texture
143 w => $w,
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 }
153 # HACK END
154 } 137 }
155 138
156 glEndList; 139 glEndList;
157 } 140 }
158 141
… …
191); 174);
192 175
193sub key_down { 176sub key_down {
194 my ($self, $ev) = @_; 177 my ($self, $ev) = @_;
195 178
196 my $mod = $ev->key_mod; 179 my $mod = $ev->{mod};
197 my $sym = $ev->key_sym; 180 my $sym = $ev->{sym};
198 181
199 if ($sym == CFClient::SDLK_KP5) { 182 if ($sym == CFClient::SDLK_KP5) {
200 $::CONN->user_send ("stay fire"); 183 $::CONN->user_send ("stay fire");
184 } elsif ($sym == ord ",") {
185 $::CONN->user_send ("take");
201 } elsif ($sym == ord "a") { 186 } elsif ($sym == ord "a") {
202 $::CONN->user_send ("apply"); 187 $::CONN->user_send ("apply");
203 } elsif ($sym == ord "'") { 188 } elsif ($sym == ord "'") {
204 $self->emit ('activate_console'); 189 $self->emit ('activate_console');
205 } elsif ($sym == ord "/") { 190 } elsif ($sym == ord "/") {
206 $self->emit ('activate_console' => '/'); 191 $self->emit (activate_console => '/');
207 } elsif (exists $DIR{$sym}) { 192 } elsif (exists $DIR{$sym}) {
208 if ($mod & CFClient::KMOD_SHIFT) { 193 if ($mod & CFClient::KMOD_SHIFT) {
209 $self->{shft}++; 194 $self->{shft}++;
210 $::CONN->user_send ("fire $DIR{$sym}[0]"); 195 $::CONN->user_send ("fire $DIR{$sym}[0]");
211 } elsif ($mod & CFClient::KMOD_CTRL) { 196 } elsif ($mod & CFClient::KMOD_CTRL) {
212 $self->{ctrl}++; 197 $self->{ctrl}++;
213 $::CONN->user_send ("run $DIR{$sym}[0]"); 198 $::CONN->user_send ("run $DIR{$sym}[0]");
214 } else { 199 } else {
215 $::CONN->user_send ("$DIR{$sym}[1]"); 200 $::CONN->user_send ("$DIR{$sym}[1]");
216 } 201 }
202 } elsif ($ev->{unicode}) {
203 $self->{command_widget} ||=
204 new CFClient::MapWidget::Command::
205 command => $self->{command},
206 can_focus => 1,
207 connect_execute => sub {
208 # todo: support callback instead of user_send
209 $::CONN->user_send ($_[1][1]);
210 },
211 connect_close => sub {
212 (delete $self->{command_widget})->hide;
213 $self->focus_in;
214 },
215 ;
216 $self->{command_widget}->key_down ($ev);
217 return unless $self->{command_widget};
218 $self->{command_widget}->show;
219 $self->{command_widget}->focus_in;
217 } 220 }
218} 221}
219 222
220sub key_up { 223sub key_up {
221 my ($self, $ev) = @_; 224 my ($self, $ev) = @_;
222 225
223 my $mod = $ev->key_mod; 226 my $mod = $ev->{mod};
224 my $sym = $ev->key_sym; 227 my $sym = $ev->{sym};
225 228
226 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
227 $::CONN->user_send ("fire_stop"); 230 $::CONN->user_send ("fire_stop");
228 } 231 }
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 232 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop"); 233 $::CONN->user_send ("run_stop");
231 } 234 }
232} 235}
233 236
234sub add_command { 237sub add_command {
235 my ($self, $command, $widget, $cb) = @_; 238 my ($self, $command, $tooltip, $widget, $cb) = @_;
236 239
237 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 240 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
238 warn "$command|$abbrev|$widget\n";#d# 241
242 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
243}
244
245package CFClient::MapWidget::MapMap;
246
247use base CFClient::UI::Base::;
248
249use Time::HiRes qw(time);
250use CFClient::OpenGL;
251
252sub size_request {
253 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
254}
255
256sub size_allocate {
257 my ($self, $w, $h) = @_;
258
259 $self->SUPER::size_allocate ($w, $h);
260 $self->update;
261}
262
263sub update {
264 my ($self) = @_;
265
266 delete $self->{texture_atime};
267 $self->SUPER::update;
268}
269
270sub _draw {
271 my ($self) = @_;
272
273 $::MAP or return;
274
275 my ($w, $h) = @$self{qw(w h)};
276
277 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
278 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
279
280 my $sx = int $::CFG->{map_shift_x} / 32;
281 my $sy = int $::CFG->{map_shift_y} / 32;
282
283 my $ox = 0.5 * ($w - $sw);
284 my $oy = 0.5 * ($h - $sh);
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glEnable GL_TEXTURE_2D;
289 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
290
291 if ($self->{texture_atime} < time) {
292 $self->{texture_atime} = time + 1/3;
293
294 $self->{texture} =
295 new CFClient::Texture
296 w => $w,
297 h => $h,
298 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
299 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
300 }
301
302 $self->{texture}->draw_quad (0, 0);
303
304 glDisable GL_TEXTURE_2D;
305
306 glTranslate 0.375, 0.375;
307
308 #TODO: map scale is completely borked
309
310 my $x0 = int $ox - $sx + 0.5;
311 my $y0 = int $oy - $sy + 0.5;
312
313 glColor 1, 1, 0, 1;
314 glBegin GL_LINE_LOOP;
315 glVertex $x0 , $y0 ;
316 glVertex $x0 , $y0 + $sh;
317 glVertex $x0 + $sw, $y0 + $sh;
318 glVertex $x0 + $sw, $y0 ;
319 glEnd;
320
321 glDisable GL_BLEND;
322}
323
324package CFClient::MapWidget::Command;
325
326use strict;
327
328use CFClient::OpenGL;
329
330our @ISA = CFClient::UI::VBox::;
331
332sub new {
333 my $class = shift;
334
335 my $self = $class->SUPER::new (
336 @_,
337 children => [map
338 CFClient::UI::Label->new (
339 can_hover => 1,
340 can_events => 1,
341 fontsize => $_,
342 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
343 ],
344 );
345
346 $self
347}
348
349sub size_allocate {
350 my ($self, $w, $h) = @_;
351
352 $self->SUPER::size_allocate ($w, $h);
353 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
354}
355
356sub update_labels {
357 my ($self) = @_;
358
359 my $command = $self->{command};
360 my $search_abbrev = qr/^\Q$self->{search}/;
361 my $search_full = qr/\Q$self->{search}/;
362
363 my @found;
364
365 for (@$command) {
366 if ($_->[0] =~ $search_abbrev) {
367 push @found, [$_->[0], $_];
368 } elsif ($_->[1] =~ $search_full) {
369 push @found, [$_->[1], $_];
370 }
371 }
372
373 @found = sort { $a->[0] cmp $b->[0] } @found;
374
375 $self->{children}[0]->set_text ("$self->{search}_");
376
377 for (0..5) {
378 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
379 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
380 }
381
382 $self->{select} = $found[0][1]
383 if @found;
384
385 if (@found > 6) {
386 $self->{children}[6]->set_text ("...");
387 }
388
389 $self->check_size;
390}
391
392sub key_down {
393 my ($self, $ev) = @_;
394
395 if ($ev->{sym} == 8) {
396 substr $self->{search}, -1, 1, "";
397 $self->update_labels;
398 } elsif ($ev->{sym} == 13) {
399 if (exists $self->{select}) {
400 $self->emit (execute => $self->{select});
401 $self->emit ("close");
402 }
403 } elsif ($ev->{sym} == 27) {
404 $self->emit ("close");
405 return;
406 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
407 $self->{search} .= chr $ev->{unicode};
408 $self->update_labels;
409 }
410
411 length $self->{search}
412 or $self->emit ("close");
239} 413}
240 414
2411 4151

Diff Legend

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